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

Commit 0ff487b

Browse files
committed
chore(jasmine): Upgrade to jasmine 3.1.0
Update @types/jasmine to 2.8.8 as well
1 parent 1c6a1a8 commit 0ff487b

File tree

5 files changed

+20
-23
lines changed

5 files changed

+20
-23
lines changed

lib/frameworks/jasmine.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,11 @@ exports.run = function(runner, specs) {
9191
};
9292

9393
// Run specs in semi-random order
94-
if (jasmineNodeOpts.random) {
95-
jasmine.getEnv().randomizeTests(true);
94+
jasmine.getEnv().randomizeTests(jasmineNodeOpts.random);
9695

97-
// Sets the randomization seed if randomization is turned on
98-
if (jasmineNodeOpts.seed) {
99-
jasmine.getEnv().seed(jasmineNodeOpts.seed);
100-
}
96+
// Sets the randomization seed if randomization is turned on
97+
if (jasmineNodeOpts.seed) {
98+
jasmine.getEnv().seed(jasmineNodeOpts.seed);
10199
}
102100

103101
return runner.runTestPreparer().then(function() {

package-lock.json

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"blocking-proxy": "^1.0.0",
1919
"chalk": "^1.1.3",
2020
"glob": "^7.0.3",
21-
"jasmine": "2.8.0",
21+
"jasmine": "^3.1.0",
2222
"jasminewd2": "^2.1.0",
2323
"optimist": "~0.6.0",
2424
"q": "1.4.1",
@@ -31,7 +31,7 @@
3131
"devDependencies": {
3232
"@types/chalk": "^0.4.28",
3333
"@types/glob": "^5.0.29",
34-
"@types/jasmine": "^2.5.47",
34+
"@types/jasmine": "^2.8.8",
3535
"@types/jasminewd2": "^2.0.0",
3636
"@types/minimatch": "^2.0.28",
3737
"@types/minimist": "^1.1.28",

spec/unit/driverProviders/local_test.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ describe('local connect', function() {
3838
});
3939

4040
describe('with the selenium standalone jar', function() {
41-
it('should throw an error if the jar file does not work', function() {
41+
describe('should throw an error if the jar file does not work', function() {
4242
var jarFile = '';
4343
beforeEach(function() {
4444
// add files to selenium folder
@@ -65,7 +65,6 @@ describe('local connect', function() {
6565
webdriver.getNewDriver();
6666
} catch(e) {
6767
errorFound = true;
68-
expect(e.code).toBe(BrowserError.CODE);
6968
}
7069
expect(errorFound).toBe(true);
7170
});

spec/unit/runner_test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,6 @@ describe('the Protractor runner', function() {
6565
var runner = new Runner(config);
6666
runner.run().then(function() {
6767
done.fail('expected error when no custom framework is defined');
68-
}, done);
68+
}, function() { return done(); });
6969
});
7070
});

0 commit comments

Comments
 (0)