Skip to content
This repository was archived by the owner on Jul 29, 2024. It is now read-only.

Upgrade to jasmine 3.1.0 #4789

Closed
wants to merge 9 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
- ([02746dd](https://github.com/angular/protractor/commit/02746dd37726b2647f8f8dbeb1152cd7f902acb0))
fix(browser): Add space after full stop in error message. (#4594)
Linkifiers interpret the ".If" at the end of the URL as part of the URL.
)

- ([7f968e0](https://github.com/angular/protractor/commit/7f968e022a7f7ebcda8955651f2907c1a25ecc22))
fix(direct): Use config's geckoDriver when specified (#4554)
Expand All @@ -77,7 +76,7 @@
3. add lock file

# 5.2.2
## Fixes
## Fixes
- ([b3c7404](https://github.com/angular/protractor/commit/b3c7404258db55a71e7bc4520973c0665cb0ff06))
Revert "fix(jasmine): Update Jasmine to support Node8 async/await (#4608)"
This reverts commit 5d13b00bca651227eb55616363f7d7eb8a91f8e8.
Expand Down Expand Up @@ -107,6 +106,7 @@
Update to the latest blocking proxy (#4546)

## Breaking Changes

- ([5d13b00](https://github.com/angular/protractor/commit/5d13b00bca651227eb55616363f7d7eb8a91f8e8))
fix(jasmine): Update Jasmine to support Node8 async/await (#4608)

Expand Down Expand Up @@ -185,6 +185,9 @@
- ([dd2ccbb](https://github.com/angular/protractor/commit/dd2ccbb1b73b7c90647837cd1c4f6b16b3f6b0ac))
feat(saucelabs): Add Sauce Labs protocol customization support

New option `sauceSeleniumUseHttp` available in `protractor.conf.js`
If true, uses 'http' instead of 'https' to connect to Sauce Labs defined by `sauceSeleniumAddress`

## Fixes

- ([1a47076](https://github.com/angular/protractor/commit/1a47076875395648038a39fcd258a77bfcabe05c))
Expand Down Expand Up @@ -255,6 +258,12 @@
- changed element.ts to not use keyof
- remove gulp task tsc:spec

## Breaking Changes

- The protocol for a Sauce Labs selenium relay (sauceSeleniumAddress in protractor.conf.js)
is 'https' (previously used 'http'). The protocol is not configurable in this version.


# 5.1.0

#### Blocking proxy
Expand Down
16 changes: 15 additions & 1 deletion lib/debugger/debuggerCommons.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
var baseDebugger = require('_debugger');
var baseDebugger;
try {
baseDebugger = require('_debugger');
} catch (e) {
if (e.code == 'MODULE_NOT_FOUND') {
console.log('***********************************************************');
console.log('* WARNING: _debugger module not available on Node.js 8 *');
console.log('* and higher. *');
console.log('* *');
console.log('* Use \'debugger\' keyword instead: *');
console.log('* https://goo.gl/MvWqFh *');
console.log('***********************************************************');
}
throw e;
}
var path = require('path');

/**
Expand Down
10 changes: 4 additions & 6 deletions lib/frameworks/jasmine.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,11 @@ exports.run = function(runner, specs) {
};

// Run specs in semi-random order
if (jasmineNodeOpts.random) {
jasmine.getEnv().randomizeTests(true);
jasmine.getEnv().randomizeTests(jasmineNodeOpts.random);

// Sets the randomization seed if randomization is turned on
if (jasmineNodeOpts.seed) {
jasmine.getEnv().seed(jasmineNodeOpts.seed);
}
// Sets the randomization seed if randomization is turned on
if (jasmineNodeOpts.seed) {
jasmine.getEnv().seed(jasmineNodeOpts.seed);
}

return runner.runTestPreparer().then(function() {
Expand Down
6 changes: 3 additions & 3 deletions lib/plugins.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ export interface ProtractorPlugin {

/**
* This is called before the test have been run but after the test framework has
* been set up. Analogous to a config file's `onPreare`.
* been set up. Analogous to a config file's `onPrepare`.
*
* Very similar to using `setup`, but allows you to access framework-specific
* variables/funtions (e.g. `jasmine.getEnv().addReporter()`).
* variables/functions (e.g. `jasmine.getEnv().addReporter()`).
*
* @this {Object} bound to module.exports.
*
Expand Down Expand Up @@ -100,7 +100,7 @@ export interface ProtractorPlugin {
*
* @return {Promise=} Can return a promise, in which case protractor will wait
* for the promise to resolve before outputting test results. Protractor
* will *not* wait before executing the next test, however. If the promise
* will *not* wait before executing the next test; however, if the promise
* is rejected, a failed assertion is added to the test results.
*/
postTest?(passed: boolean, testInfo: any): void|Promise<void>;
Expand Down
Loading