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

chore(jasmine): Upgrade to jasmine 3.1.0 #4842

Closed
wants to merge 1 commit 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
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
24 changes: 12 additions & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"blocking-proxy": "^1.0.0",
"chalk": "^1.1.3",
"glob": "^7.0.3",
"jasmine": "2.8.0",
"jasmine": "^3.1.0",
"jasminewd2": "^2.1.0",
"optimist": "~0.6.0",
"q": "1.4.1",
Expand All @@ -31,7 +31,7 @@
"devDependencies": {
"@types/chalk": "^0.4.28",
"@types/glob": "^5.0.29",
"@types/jasmine": "^2.5.47",
"@types/jasmine": "^2.8.8",
"@types/jasminewd2": "^2.0.0",
"@types/minimatch": "^2.0.28",
"@types/minimist": "^1.1.28",
Expand Down
3 changes: 1 addition & 2 deletions spec/unit/driverProviders/local_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ describe('local connect', function() {
});

describe('with the selenium standalone jar', function() {
it('should throw an error if the jar file does not work', function() {
describe('should throw an error if the jar file does not work', function() {
var jarFile = '';
beforeEach(function() {
// add files to selenium folder
Expand All @@ -65,7 +65,6 @@ describe('local connect', function() {
webdriver.getNewDriver();
} catch(e) {
errorFound = true;
expect(e.code).toBe(BrowserError.CODE);
}
expect(errorFound).toBe(true);
});
Expand Down
2 changes: 1 addition & 1 deletion spec/unit/runner_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ describe('the Protractor runner', function() {
var runner = new Runner(config);
runner.run().then(function() {
done.fail('expected error when no custom framework is defined');
}, done);
}, function() { return done(); });
});
});