Skip to content

Commit

Permalink
Security update 12 2020 (#27)
Browse files Browse the repository at this point in the history
* upgrade packages and support new jasmine version
  • Loading branch information
maboesanman authored Dec 30, 2020
1 parent de20396 commit 5526307
Show file tree
Hide file tree
Showing 14 changed files with 4,116 additions and 4,680 deletions.
5,162 changes: 2,256 additions & 2,906 deletions package-lock.json

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "givens",
"version": "1.3.4",
"version": "1.3.5",
"description": "Easy test setup without side effects",
"main": "dist/getGiven.js",
"types": "dist/getGiven.d.ts",
Expand Down Expand Up @@ -50,21 +50,21 @@
"author": "Mason Boeman",
"license": "MIT",
"devDependencies": {
"@types/jest": "^26.0.0",
"@types/node": "^13.9.2",
"@typescript-eslint/eslint-plugin": "^2.24.0",
"@typescript-eslint/parser": "^2.24.0",
"copyfiles": "^2.3.0",
"@types/jest": "^26.0.19",
"@types/node": "^13.13.38",
"@typescript-eslint/eslint-plugin": "^2.34.0",
"@typescript-eslint/parser": "^2.34.0",
"copyfiles": "^2.4.1",
"eslint": "^6.8.0",
"eslint-plugin-import": "^2.20.1",
"eslint-plugin-jasmine": "^4.1.0",
"eslint-plugin-jest": "^23.8.2",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jasmine": "^4.1.1",
"eslint-plugin-jest": "^23.20.0",
"eslint-plugin-mocha": "^4.1.0",
"jest": "^26.2.0",
"jest": "^26.6.3",
"npm-run-all": "^4.1.5",
"source-map-url-cli": "^0.1.0",
"ts-jest": "^26.1.0",
"typescript": "^3.8.3"
"ts-jest": "^26.4.4",
"typescript": "^3.9.7"
},
"jest": {
"automock": true,
Expand Down
2 changes: 1 addition & 1 deletion src/getContextInfo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function mochaContextMatcher(rawStack: string): ContextInfo | undefined {
}

function jasmineContextMatcher(rawStack: string): ContextInfo | undefined {
if (!/jasmine\.js/.test(rawStack)) {
if (!/(jasmine\.js|jasmine\/lib\/loader\.js)/.test(rawStack)) {
return undefined;
}
if (!/Env\.describe/.test(rawStack)) {
Expand Down
360 changes: 171 additions & 189 deletions test/integration-tests/javascript/jasmine/package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions test/integration-tests/javascript/jasmine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"devDependencies": {
"givens": "file:../../../../build/package",
"jasmine": "^3.5.0",
"nyc": "^15.0.1"
"jasmine": "^3.6.3",
"nyc": "^15.1.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,34 @@ function exampleFn() {

// we need to assert in unusual places in this file.
// due to the nature of getContextInfo
assert.equal(exampleFn().allowed, false);
assert.equal(exampleFn().message, 'given must be called inside a describe');
assert.strictEqual(exampleFn().allowed, false);
assert.strictEqual(exampleFn().message, 'given must be called inside a describe');

describe('getContextInfo', () => {
assert.equal(exampleFn().allowed, true);
assert.strictEqual(exampleFn().allowed, true);

beforeAll(() => {
assert.equal(exampleFn().allowed, false);
assert.equal(exampleFn().message, 'given must be called inside a describe');
assert.strictEqual(exampleFn().allowed, false);
assert.strictEqual(exampleFn().message, 'given must be called inside a describe');
});

beforeEach(() => {
assert.equal(exampleFn().allowed, false);
assert.equal(exampleFn().message, 'given must be called inside a describe');
assert.strictEqual(exampleFn().allowed, false);
assert.strictEqual(exampleFn().message, 'given must be called inside a describe');
});

afterEach(() => {
assert.equal(exampleFn().allowed, false);
assert.equal(exampleFn().message, 'given must be called inside a describe');
assert.strictEqual(exampleFn().allowed, false);
assert.strictEqual(exampleFn().message, 'given must be called inside a describe');
});

afterAll(() => {
assert.equal(exampleFn().allowed, false);
assert.equal(exampleFn().message, 'given must be called inside a describe');
assert.strictEqual(exampleFn().allowed, false);
assert.strictEqual(exampleFn().message, 'given must be called inside a describe');
});

it('inside it', () => {
assert.equal(exampleFn().allowed, false);
assert.equal(exampleFn().message, 'given must be called inside a describe');
assert.strictEqual(exampleFn().allowed, false);
assert.strictEqual(exampleFn().message, 'given must be called inside a describe');
});
});
Loading

0 comments on commit 5526307

Please sign in to comment.