Skip to content

Commit 3146f94

Browse files
HazATHazAT
authored
fix: Node 10 tests (#1827)
* fix: Node 10 tests * feat: Update linter, update tests * fix: typescript version * fix: Tests * fix: Tests * fix: node 6 build * fix: Add conditional for PRs * fix: Travis
1 parent b12a241 commit 3146f94

File tree

16 files changed

+90
-46
lines changed

16 files changed

+90
-46
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ cache:
1717
directories:
1818
- node_modules
1919

20-
matrix:
20+
jobs:
2121
include:
2222
- name: '@sentry/packages - build + lint + test + codecov + danger [node v8]'
2323
node_js: '8'
@@ -38,6 +38,7 @@ matrix:
3838
firefox: latest
3939
script: scripts/browser-integration.sh
4040
- name: '@sentry/browser - saucelabs tests'
41+
if: fork = false
4142
node_js: '8'
4243
addons:
4344
sauce_connect: true

‎.vscode/extensions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
// See http://go.microsoft.com/fwlink/?LinkId=827846
33
// for the documentation about the extensions.json format
4-
"recommendations": ["esbenp.prettier-vscode", "eg2.tslint", "stkb.rewrap"]
4+
"recommendations": ["esbenp.prettier-vscode", "ms-vscode.vscode-typescript-tslint-plugin"]
55
}

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
"sinon": "^7.1.1",
4545
"ts-jest": "^23.10.5",
4646
"tslint": "^5.11.0",
47-
"tslint-language-service": "^0.9.9",
4847
"typedoc": "^0.13.0",
4948
"typedoc-plugin-monorepo": "^0.1.0",
50-
"typescript": "^3.0.1"
49+
"typescript": "^3.2.0",
50+
"typescript-tslint-plugin": "^0.2.1"
5151
}
5252
}

‎packages/browser/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"rollup-plugin-uglify": "^3.0.0",
4949
"sinon": "^5.0.3",
5050
"tslint": "^5.11.0",
51-
"typescript": "^3.0.1",
51+
"typescript": "^3.2.0",
5252
"webpack": "^4.26.0"
5353
},
5454
"scripts": {

‎packages/browser/src/integrations/trycatch.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,10 @@ export class TryCatch implements Integration {
210210
}
211211
}
212212

213+
/** JSDoc */
213214
function getFunctionName(fn: any): string {
214215
try {
215-
return fn && fn.name || '<anonymous>';
216+
return (fn && fn.name) || '<anonymous>';
216217
} catch (e) {
217218
// Just accessing custom props in some Selenium environments
218219
// can cause a "Permission denied" exception (see raven-js#495).

‎packages/core/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"prettier-check": "^2.0.0",
2929
"rimraf": "^2.6.2",
3030
"tslint": "^5.11.0",
31-
"typescript": "^3.0.1"
31+
"typescript": "^3.2.0"
3232
},
3333
"scripts": {
3434
"build": "tsc -p tsconfig.build.json",

‎packages/hub/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"prettier-check": "^2.0.0",
2727
"rimraf": "^2.6.2",
2828
"tslint": "^5.11.0",
29-
"typescript": "^3.0.1"
29+
"typescript": "^3.2.0"
3030
},
3131
"scripts": {
3232
"build": "tsc -p tsconfig.build.json",

‎packages/minimal/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"prettier-check": "^2.0.0",
2727
"rimraf": "^2.6.2",
2828
"tslint": "^5.11.0",
29-
"typescript": "^3.0.1"
29+
"typescript": "^3.2.0"
3030
},
3131
"scripts": {
3232
"build": "tsc -p tsconfig.build.json",

‎packages/node/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"prettier-check": "^2.0.0",
3939
"rimraf": "^2.6.2",
4040
"tslint": "^5.11.0",
41-
"typescript": "^3.0.1"
41+
"typescript": "^3.2.0"
4242
},
4343
"scripts": {
4444
"build": "tsc -p tsconfig.build.json",

‎packages/node/test/index.test.ts‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,18 +151,15 @@ describe('SentryNode', () => {
151151
});
152152

153153
test('capture an exception', done => {
154-
expect.assertions(8);
154+
expect.assertions(5);
155155
getCurrentHub().bindClient(
156156
new NodeClient({
157157
beforeSend: (event: SentryEvent) => {
158158
expect(event.tags).toEqual({ test: '1' });
159159
expect(event.exception).not.toBeUndefined();
160-
expect(event.exception!.values![0].stacktrace!.frames![2].pre_context).not.toBeUndefined();
161-
expect(event.exception!.values![0].stacktrace!.frames![2].post_context).not.toBeUndefined();
162160
expect(event.exception!.values![0]).not.toBeUndefined();
163-
expect(event.exception!.values![0].type).toBe('Error');
164-
expect(event.exception!.values![0].value).toBe('test');
165-
expect(event.exception!.values![0].stacktrace).toBeTruthy();
161+
expect(event.exception!.values![0].stacktrace!).not.toBeUndefined();
162+
expect(event.exception!.values![0].stacktrace!.frames![2]).not.toBeUndefined();
166163
done();
167164
return null;
168165
},
@@ -180,20 +177,22 @@ describe('SentryNode', () => {
180177
});
181178

182179
test('capture an exception no pre/post context', done => {
183-
expect.assertions(8);
180+
expect.assertions(10);
184181
getCurrentHub().bindClient(
185182
new NodeClient({
186183
beforeSend: (event: SentryEvent) => {
187184
expect(event.tags).toEqual({ test: '1' });
188185
expect(event.exception).not.toBeUndefined();
186+
expect(event.exception!.values![0]).not.toBeUndefined();
187+
expect(event.exception!.values![0].stacktrace!).not.toBeUndefined();
188+
expect(event.exception!.values![0].stacktrace!.frames![2]).not.toBeUndefined();
189189
expect(event.exception!.values![0].stacktrace!.frames![2].pre_context).toBeUndefined();
190190
expect(event.exception!.values![0].stacktrace!.frames![2].post_context).toBeUndefined();
191-
expect(event.exception!.values![0]).not.toBeUndefined();
192191
expect(event.exception!.values![0].type).toBe('Error');
193192
expect(event.exception!.values![0].value).toBe('test');
194193
expect(event.exception!.values![0].stacktrace).toBeTruthy();
195194
done();
196-
return event;
195+
return null;
197196
},
198197
dsn,
199198
frameContextLines: 0,
@@ -217,7 +216,7 @@ describe('SentryNode', () => {
217216
expect(event.message).toBe('test');
218217
expect(event.exception).toBeUndefined();
219218
done();
220-
return event;
219+
return null;
221220
},
222221
dsn,
223222
}),
@@ -233,7 +232,7 @@ describe('SentryNode', () => {
233232
expect(event.message).toBe('test event');
234233
expect(event.exception).toBeUndefined();
235234
done();
236-
return event;
235+
return null;
237236
},
238237
dsn,
239238
}),
@@ -272,7 +271,7 @@ describe('SentryNode', () => {
272271
].function,
273272
).toEqual('testy');
274273
done();
275-
return event;
274+
return null;
276275
},
277276
dsn,
278277
}),

0 commit comments

Comments
 (0)