Skip to content

Commit afca555

Browse files
committedMar 27, 2015
Nudged versions, fixes tests in Phantom.js
- Bumbed chartist to 0.7.3 - Bumped Ember deps up (bower & npm) - Added bind() to test-helper.js to fix phantom.js issue
1 parent d08a3b0 commit afca555

File tree

4 files changed

+3046
-2947
lines changed

4 files changed

+3046
-2947
lines changed
 

‎bower.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
"ember-resolver": "~0.1.11",
99
"loader.js": "stefanpenner/loader.js#1.0.1",
1010
"ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3",
11-
"ember-cli-test-loader": "rwjblue/ember-cli-test-loader#0.0.4",
11+
"ember-cli-test-loader": "rwjblue/ember-cli-test-loader#0.1.3",
1212
"ember-load-initializers": "stefanpenner/ember-load-initializers#0.0.2",
13-
"ember-qunit": "0.1.8",
14-
"ember-qunit-notifications": "0.0.4",
15-
"qunit": "~1.15.0"
13+
"ember-qunit": "~0.3.0",
14+
"ember-qunit-notifications": "~0.0.7",
15+
"qunit": "~1.17.1"
1616
},
1717
"devDependencies": {
18-
"chartist": "~0.5.0"
18+
"chartist": "~0.7.3"
1919
}
2020
}

‎package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,13 @@
3232
"ember-cli-esnext": "0.1.1",
3333
"ember-cli-ic-ajax": "0.1.1",
3434
"ember-cli-inject-live-reload": "^1.3.0",
35-
"ember-cli-qunit": "0.1.2",
35+
"ember-cli-qunit": "~0.3.9",
3636
"ember-cli-sass": "3.0.3",
3737
"ember-data": "1.0.0-beta.12",
3838
"ember-export-application-global": "^1.0.0",
3939
"express": "^4.8.5",
40-
"glob": "^4.0.5"
40+
"glob": "~4.0.5",
41+
"rimraf": "~2.2.8"
4142
},
4243
"keywords": [
4344
"ember-addon",

‎tests/test-helper.js

+25
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,31 @@ import {
55

66
setResolver(resolver);
77

8+
9+
// This is to save PhantomJS from itself, because PhantomJS < 2.0 doesn't have
10+
// Function.prototype.bind for _reasons_
11+
if (!Function.prototype.bind) {
12+
Function.prototype.bind = function(oThis) {
13+
if (typeof this !== "function") {
14+
// closest thing possible to the ECMAScript 5 internal IsCallable function
15+
throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");
16+
}
17+
18+
var aArgs = Array.prototype.slice.call(arguments, 1),
19+
fToBind = this,
20+
FNOP = function() {},
21+
fBound = function() {
22+
return fToBind.apply(this instanceof FNOP && oThis? this : oThis, aArgs.concat(Array.prototype.slice.call(arguments)));
23+
};
24+
25+
FNOP.prototype = this.prototype;
26+
fBound.prototype = new FNOP();
27+
28+
return fBound;
29+
};
30+
}
31+
32+
833
document.write('<div id="ember-testing-container"><div id="ember-testing"></div></div>');
934

1035
QUnit.config.urlConfig.push({ id: 'nocontainer', label: 'Hide container'});

‎vendor/chartist/chartist.js

+3,013-2,940
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.