-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Conversation
02abbc2
to
a1291a6
Compare
Docs to go along with this: #1679 |
Note that the travis error is due to jasminewd2 not yet being published. |
@@ -236,7 +236,7 @@ exports.config = { | |||
// ----- The test framework -------------------------------------------------- | |||
// --------------------------------------------------------------------------- | |||
|
|||
// Test framework to use. This may be jasmine, cucumber, or mocha. | |||
// Test framework to use. This may be jasmine, jasmine2, cucumber, or mocha. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's change the value listed below to 'jasmine2' as well
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As in "Jasmine2 is fully supported as a test and assertion framework."?
Change the default value in configParser to jasmine2 |
@@ -12,10 +12,16 @@ describe('locators', function() { | |||
|
|||
it('should allow custom expectations to expect an element', function() { | |||
this.addMatchers({ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It might be helpful to show an example more like this in the documentation PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
replaced the example in the documentation PR with this.
LGTM once Travis passes. |
committed with 1e60a95 |
This PR enables protractor to work with jasmine2.0 (see #362)
Pending angular/jasminewd#13 for the release of jasminewd2
Note, passing timeout as part of
it
,fit
, etc does not work yet. Pending jasmine/jasmine@a4faa80Also, stacktrace is messed up when calling
done.fail('xyz')
because jasmine2 does not allow custom stacktrace. Filed an issue at jasmine/jasmine#734