Skip to content

Commit a7744f8

Browse files
committed
chore: fix travis build
- bump to mocha 1.21.5 in order to remove "*" version-range on the "debug"-dependency - explicit use of "dot"-reporter for mocha 1.21.5, fixes failing tests of console.log output - fix tests running in the browser: assign variable "global" with global "this", backport from master-branch - update saucelab config: - Remove Safari 6 and 7 that are not supported by saucelabs anymore and cause timeouts when running the saucelabs tests. - Add Safari 8 - Note: The tests fail with Safari 9 and 10 because in these versions the "column"-property of "Error" is read-only (see jquery/esprima#1290) - firefox needs explicit platform and version specifier
1 parent a203c4c commit a7744f8

File tree

5 files changed

+23
-5
lines changed

5 files changed

+23
-5
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: node_js
22
before_install:
3-
- npm install -g grunt-cli@0.4
3+
- npm install -g grunt-cli
44
script:
55
- grunt --stack travis
66
email:

Gruntfile.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,8 @@ module.exports = function(grunt) {
161161
concurrency: 2,
162162
browsers: [
163163
{browserName: 'chrome'},
164-
{browserName: 'firefox'},
165-
{browserName: 'safari', version: 7, platform: 'OS X 10.9'},
166-
{browserName: 'safari', version: 6, platform: 'OS X 10.8'},
164+
{browserName: 'firefox', version: 'latest', platform: 'Windows 8.1'},
165+
{browserName: 'safari', version: 8, platform: 'OS X 10.10'},
167166
{browserName: 'internet explorer', version: 11, platform: 'Windows 8.1'},
168167
{browserName: 'internet explorer', version: 10, platform: 'Windows 8'},
169168
{browserName: 'internet explorer', version: 9, platform: 'Windows 7'}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"istanbul": "^0.3.0",
5252
"jison": "~0.3.0",
5353
"keen.io": "0.0.3",
54-
"mocha": "~1.20.0",
54+
"mocha": "~1.21.5",
5555
"mustache": "0.x",
5656
"semver": "^4.0.0",
5757
"underscore": "^1.5.1",

spec/env/common.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
var global = (function() { return this; }());
2+
3+
var AssertError;
4+
if (Error.captureStackTrace) {
5+
AssertError = function AssertError(message, caller) {
6+
Error.prototype.constructor.call(this, message);
7+
this.message = message;
8+
9+
if (Error.captureStackTrace) {
10+
Error.captureStackTrace(this, caller || AssertError);
11+
}
12+
};
13+
14+
AssertError.prototype = new Error();
15+
} else {
16+
AssertError = Error;
17+
}
18+
119
global.shouldCompileTo = function(string, hashOrArray, expected, message) {
220
shouldCompileToWithPartials(string, hashOrArray, false, expected, message);
321
};

spec/env/runner.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ run('./node', function() {
2727
function run(env, callback) {
2828
var mocha = new Mocha();
2929
mocha.ui('bdd');
30+
mocha.reporter('dot');
3031
mocha.files = files.slice();
3132
if (grep) {
3233
mocha.grep(grep);

0 commit comments

Comments
 (0)