From 9201f869215069e15c85008292311a4eb5549f83 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 3 Dec 2015 13:59:49 +0100 Subject: [PATCH] Try Sauce Labs on pushes It seems that phantomjs 2.0.0 has problems with running tessts built with new ember-cli and sauce labs tests seem to work again. I'm switching back to sauce labs on pushes for the time being. --- .travis.yml | 4 ++-- ci/prepare_testem.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 28361939..b6f36c35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,8 +16,8 @@ matrix: fast_finish: true -#addons: -# sauce_connect: true +addons: + sauce_connect: true sudo: false diff --git a/ci/prepare_testem.rb b/ci/prepare_testem.rb index 1351b28a..ec9d7a69 100644 --- a/ci/prepare_testem.rb +++ b/ci/prepare_testem.rb @@ -4,7 +4,7 @@ pull_request = ENV['TRAVIS_PULL_REQUEST'] != 'false' testem = JSON.parse(File.read('testem.json')) -testem['launch_in_ci'] = ['PhantomJS'] -#testem['launch_in_ci'] += ['SL_chrome', 'SL_firefox'] unless pull_request +testem['launch_in_ci'] = ['PhantomJS'] +testem['launch_in_ci'] = ['SL_chrome', 'SL_firefox'] unless pull_request File.open('testem.json', 'w') { |f| f.write testem.to_json }