From e144a97f9ac87a7ea568a4c4d7a5f1d64b7d4a3f Mon Sep 17 00:00:00 2001 From: johanneswuerbach Date: Sat, 7 Feb 2015 12:56:37 +0100 Subject: [PATCH 1/2] Allow test running using phantomjs 2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6f66c71b..9afb2409 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,6 @@ "broccoli-sourcemap-concat": "^0.4.3", "broccoli-string-replace": "0.0.2", "git-repo-info": "^1.0.2", - "testem": "0.6.22" + "testem": "0.6.38" } } From 9cf1cf63dd4d681c7a64788e8c3df0b688e1c8d2 Mon Sep 17 00:00:00 2001 From: johanneswuerbach Date: Sat, 7 Feb 2015 12:57:06 +0100 Subject: [PATCH 2/2] Fixed broken test Extracted from https://github.com/switchfly/ember-mocha/pull/13 --- tests/it-test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/it-test.js b/tests/it-test.js index c0ab4054..f6269dc0 100644 --- a/tests/it-test.js +++ b/tests/it-test.js @@ -70,10 +70,10 @@ describe('it', function() { expect(skippedError).to.be.null; var pendingSpec = Mocha.suite.suites.find(function(suite) { return suite.tests.find(function(test) { - return test.title === 'a skipped spec'; + return test.title === 'is a skipped spec'; }); }); - expect(pendingSpec).to.be.defined; + expect(pendingSpec).to.exist; }); var callback = function() {