Skip to content

Commit a58cd8b

Browse files
committed
Switch to Jasmine 2 for testing.
Motivation: Focused specs, better ongoing support Modifications: Added jasmine and jasmine-core to package.json. Updated other dependencies.
1 parent 8106d75 commit a58cd8b

File tree

5 files changed

+48
-41
lines changed

5 files changed

+48
-41
lines changed

dist/error-stack-parser-with-polyfills.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/error-stack-parser.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gulpfile.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var coveralls = require('gulp-coveralls');
33
var del = require('del');
44
var gulp = require('gulp');
55
var jshint = require('gulp-jshint');
6-
var karma = require('karma').server;
6+
var karma = require('karma');
77
var runSequence = require('run-sequence');
88
var sourcemaps = require('gulp-sourcemaps');
99
var uglify = require('gulp-uglify');
@@ -20,17 +20,19 @@ gulp.task('lint', function () {
2020
});
2121

2222
gulp.task('test', function (done) {
23-
karma.start({
23+
var server = new karma.Server({
2424
configFile: __dirname + '/karma.conf.js',
2525
singleRun: true
2626
}, done);
27+
server.start();
2728
});
2829

2930
gulp.task('test-ci', ['dist'], function (done) {
30-
karma.start({
31+
var server = new karma.Server({
3132
configFile: __dirname + '/karma.conf.ci.js',
3233
singleRun: true
3334
}, done);
35+
server.start();
3436
});
3537

3638
gulp.task('copy', function () {

package.json

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,23 @@
2828
"gulp": "^3.9.0",
2929
"gulp-concat": "^2.6.0",
3030
"gulp-coveralls": "^0.1.4",
31-
"gulp-jshint": "^1.11.2",
32-
"gulp-sourcemaps": "^1.5.2",
33-
"gulp-uglify": "^1.4.1",
34-
"jasmine-node": "~1.14",
35-
"karma": "~0.12",
36-
"karma-chrome-launcher": "^0.1.5",
37-
"karma-coverage": "^0.5.2",
38-
"karma-firefox-launcher": "^0.1.3",
39-
"karma-ie-launcher": "^0.1.5",
40-
"karma-jasmine": "^0.1.6",
31+
"gulp-jshint": "^2.0.0",
32+
"gulp-sourcemaps": "^1.6.0",
33+
"gulp-uglify": "^1.5.1",
34+
"jasmine": "^2.3.2",
35+
"jasmine-core": "^2.3.4",
36+
"jshint": "^2.8.0",
37+
"karma": "~0.13",
38+
"karma-chrome-launcher": "^0.1.12",
39+
"karma-coverage": "^0.5.3",
40+
"karma-firefox-launcher": "^0.1.7",
41+
"karma-ie-launcher": "^0.2.0",
42+
"karma-jasmine": "^0.3.6",
4143
"karma-opera-launcher": "^0.1.0",
4244
"karma-phantomjs2-launcher": "^0.3.2",
4345
"karma-safari-launcher": "^0.1.1",
44-
"karma-sauce-launcher": "^0.2.10",
45-
"run-sequence": "^1.1.1"
46+
"karma-sauce-launcher": "^0.3.0",
47+
"run-sequence": "^1.1.5"
4648
},
4749
"bugs": {
4850
"url": "https://github.com/stacktracejs/error-stack-parser/issues"
@@ -58,3 +60,4 @@
5860
"test": "gulp test"
5961
}
6062
}
63+

spec/spec-helper.js

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,33 @@ if (!Array.isArray) {
77
}
88

99
beforeEach(function() {
10-
this.addMatchers({
11-
toMatchStackFrame: function(expected) {
12-
var actual = this.actual;
13-
var message = '';
14-
if (actual.getFunctionName() !== expected[0]) {
15-
message += 'expected functionName: ' + actual.getFunctionName() + ' to equal ' + expected[0] + '\n';
16-
}
17-
if (Array.isArray(actual.getArgs()) && Array.isArray(expected[1])) {
18-
if (actual.getArgs().join() !== expected[1].join()) {
19-
message += 'expected args: ' + actual.getArgs() + ' to equal ' + expected[1] + '\n';
10+
jasmine.addMatchers({
11+
toMatchStackFrame: function() {
12+
return {
13+
compare: function(actual, expected) {
14+
var message = '';
15+
if (actual.getFunctionName() !== expected[0]) {
16+
message += 'expected functionName: ' + actual.getFunctionName() + ' to equal ' + expected[0] + '\n';
17+
}
18+
if (Array.isArray(actual.getArgs()) && Array.isArray(expected[1])) {
19+
if (actual.getArgs().join() !== expected[1].join()) {
20+
message += 'expected args: ' + actual.getArgs() + ' to equal ' + expected[1] + '\n';
21+
}
22+
} else if (actual.getArgs() !== expected[1]) {
23+
message += 'expected args: ' + actual.getArgs() + ' to equal ' + expected[1] + '\n';
24+
}
25+
if (actual.getFileName() !== expected[2]) {
26+
message += 'expected fileName: ' + actual.getFileName() + ' to equal ' + expected[2] + '\n';
27+
}
28+
if (actual.getLineNumber() !== expected[3]) {
29+
message += 'expected lineNumber: ' + actual.getLineNumber() + ' to equal ' + expected[3] + '\n';
30+
}
31+
if (actual.getColumnNumber() !== expected[4]) {
32+
message += 'expected columnNumber: ' + actual.getColumnNumber() + ' to equal ' + expected[4] + '\n';
33+
}
34+
return {pass: message === '', message: message};
2035
}
21-
} else if (actual.getArgs() !== expected[1]) {
22-
message += 'expected args: ' + actual.getArgs() + ' to equal ' + expected[1] + '\n';
23-
}
24-
if (actual.getFileName() !== expected[2]) {
25-
message += 'expected fileName: ' + actual.getFileName() + ' to equal ' + expected[2] + '\n';
26-
}
27-
if (actual.getLineNumber() !== expected[3]) {
28-
message += 'expected lineNumber: ' + actual.getLineNumber() + ' to equal ' + expected[3] + '\n';
29-
}
30-
if (actual.getColumnNumber() !== expected[4]) {
31-
message += 'expected columnNumber: ' + actual.getColumnNumber() + ' to equal ' + expected[4] + '\n';
32-
}
33-
this.message = function() { return message };
34-
return message === '';
36+
};
3537
}
3638
});
3739
});

0 commit comments

Comments
 (0)