Skip to content

Commit

Permalink
chore: remove references to jasmine global
Browse files Browse the repository at this point in the history
  • Loading branch information
evocateur committed Jul 18, 2018
1 parent e908d23 commit 3d88a2b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions core/lerna/__tests__/cli.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ const copyFixture = require("@lerna-test/copy-fixture");
const CLI = path.join(__dirname, "../cli.js");
const bin = cwd => (...args) => execa(CLI, args, { cwd });

/* global jasmine */
jasmine.DEFAULT_TIMEOUT_INTERVAL = 30000;
jest.setTimeout(30e3);

describe("cli", () => {
it("should throw without command", async () => {
Expand Down
2 changes: 1 addition & 1 deletion setup-integration-timeout.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"use strict";

// allow CLI integration tests to run for awhile (300s)
jasmine.DEFAULT_TIMEOUT_INTERVAL = 300e3;
jest.setTimeout(300e3);
2 changes: 1 addition & 1 deletion setup-unit-test-timeout.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"use strict";

// allow 15s timeout in an attempt to lessen flakiness of unit tests...
jasmine.DEFAULT_TIMEOUT_INTERVAL = 15e3;
jest.setTimeout(15e3);

0 comments on commit 3d88a2b

Please sign in to comment.