Compare commits
4 Commits
master
...
chrome-for
Author | SHA1 | Date | |
---|---|---|---|
![]() |
3477deb627 | ||
![]() |
21e40e7451 | ||
![]() |
daed6a6d8a | ||
![]() |
4e283993c6 |
14
.travis.yml
14
.travis.yml
|
@ -18,8 +18,14 @@ matrix:
|
|||
|
||||
addons:
|
||||
sauce_connect: true
|
||||
apt:
|
||||
sources:
|
||||
- google-chrome
|
||||
packages:
|
||||
- google-chrome-stable
|
||||
|
||||
sudo: false
|
||||
sudo: required
|
||||
dist: trusty
|
||||
|
||||
cache:
|
||||
branch: md5deep
|
||||
|
@ -29,10 +35,8 @@ cache:
|
|||
before_install:
|
||||
- "npm config set spin false"
|
||||
- "npm install -g npm@^2"
|
||||
- mkdir travis-phantomjs
|
||||
- wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2
|
||||
- tar -xvf $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -C $PWD/travis-phantomjs
|
||||
- export PATH=$PWD/travis-phantomjs:$PATH
|
||||
- "export DISPLAY=:99.0"
|
||||
- "sh -e /etc/init.d/xvfb start"
|
||||
|
||||
install:
|
||||
- npm install -g bower
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
require 'json'
|
||||
|
||||
pull_request = ENV['TRAVIS_PULL_REQUEST'] != 'false'
|
||||
#pull_request = ENV['TRAVIS_PULL_REQUEST'] != 'false'
|
||||
|
||||
testem = JSON.parse(File.read('testem.json'))
|
||||
#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 }
|
||||
#File.open('testem.json', 'w') { |f| f.write testem.to_json }
|
||||
|
|
48
testem.json
48
testem.json
|
@ -1,51 +1,11 @@
|
|||
{
|
||||
"framework": "qunit",
|
||||
"test_page": "tests/index.html?hidepassed",
|
||||
"disable_watching": true,
|
||||
"launch_in_ci": [
|
||||
"PhantomJS"
|
||||
"Firefox"
|
||||
],
|
||||
"launch_in_dev": [
|
||||
"PhantomJS"
|
||||
],
|
||||
"launchers": {
|
||||
"SL_chrome": {
|
||||
"exe": "./node_modules/.bin/ember-cli-sauce",
|
||||
"args": [
|
||||
"-b",
|
||||
"chrome",
|
||||
"-p",
|
||||
"Windows 8",
|
||||
"--at",
|
||||
"--no-ct",
|
||||
"--u"
|
||||
],
|
||||
"protocol": "browser"
|
||||
},
|
||||
"SL_firefox": {
|
||||
"exe": "./node_modules/.bin/ember-cli-sauce",
|
||||
"args": [
|
||||
"-b",
|
||||
"firefox",
|
||||
"-p",
|
||||
"Windows 8",
|
||||
"--at",
|
||||
"--no-ct",
|
||||
"--u"
|
||||
],
|
||||
"protocol": "browser"
|
||||
},
|
||||
"SL_safari": {
|
||||
"exe": "./node_modules/.bin/ember-cli-sauce",
|
||||
"args": [
|
||||
"-b",
|
||||
"safari",
|
||||
"-p",
|
||||
"Mac 10.10",
|
||||
"--at",
|
||||
"--no-ct",
|
||||
"--u"
|
||||
],
|
||||
"protocol": "browser"
|
||||
}
|
||||
}
|
||||
"Firefox"
|
||||
]
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user