Skip to content

Commit

Permalink
test: [sauce] use karma@canary to prevent timeouts
Browse files Browse the repository at this point in the history
  • Loading branch information
logicalparadox committed Sep 18, 2013
1 parent cd5b24e commit 8a2e00b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 14 deletions.
5 changes: 2 additions & 3 deletions Makefile
Expand Up @@ -54,8 +54,8 @@ test-cov: lib-cov

test-phantom: build
@printf "==> [Test :: Karma (PhantomJS)]\n"
@CHAI_TEST_ENV=phantom ./node_modules/.bin/karma start \
--single-run
@./node_modules/.bin/karma start \
--single-run --browsers PhantomJS

test-sauce: build
@printf "==> [Test :: Karma (Sauce)]\n"
Expand All @@ -72,7 +72,6 @@ test-coveralls: lib-cov
test-travisci: lib-cov
@echo TRAVIS_JOB_ID $(TRAVIS_JOB_ID)
@make test-node
@make test-phantom
@make test-coveralls
@make test-sauce

Expand Down
3 changes: 1 addition & 2 deletions package.json
Expand Up @@ -33,10 +33,9 @@
"component": "*"
, "coveralls": "2.0.16"
, "jscoverage": "0.3.7"
, "karma": "0.10.x"
, "karma": "canary"
, "karma-mocha": "*"
, "karma-sauce-launcher": "git://github.com/embarkmobile/karma-sauce-launcher.git#feature-passfail"
, "karma-spec-reporter": "*"
, "mocha": "1.8.2"
, "mocha-lcov-reporter": "0.0.1"
}
Expand Down
7 changes: 0 additions & 7 deletions sauce.browsers.js
Expand Up @@ -16,13 +16,6 @@ exports['SL_Safari'] = {
, version: '6'
};

exports['SL_IE_9'] = {
base: 'SauceLabs'
, browserName: 'internet explorer'
, platform: 'Windows 2008'
, version: '9'
};

exports['SL_IE_10'] = {
base: 'SauceLabs'
, browserName: 'internet explorer'
Expand Down
4 changes: 2 additions & 2 deletions test/expect.js
Expand Up @@ -714,15 +714,15 @@ describe('expect', function () {
});

it('satisfy', function(){
function matcher (num){
var matcher = function (num) {
return num === 1;
};

expect(1).to.satisfy(matcher);

err(function(){
expect(2).to.satisfy(matcher, 'blah');
}, "blah: expected 2 to satisfy [Function: matcher]");
}, "blah: expected 2 to satisfy [Function]");
});

it('closeTo', function(){
Expand Down

0 comments on commit 8a2e00b

Please sign in to comment.