Skip to content

Commit

Permalink
test(.travis): run on OSX and Safari (#1260)
Browse files Browse the repository at this point in the history
  • Loading branch information
Marcos Cáceres committed Jun 11, 2017
1 parent 3bb7140 commit 6e4b112
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 31 deletions.
27 changes: 5 additions & 22 deletions .travis.yml
@@ -1,34 +1,17 @@
os: osx
osx_image: xcode8.3
language: node_js
sudo: required
dist: trusty
node_js:
- v6.10
- v7

install:
- yarn install

before_install:
- "export DISPLAY=:99.0"
- "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 -extension RANDR"
- sh -e /etc/init.d/xvfb start

before_script:
- export CHROME_URL=https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64
- export CHROME_REV=$(curl -s ${CHROME_URL}/LAST_CHANGE)
- curl ${CHROME_URL}/${CHROME_REV}/chrome-linux.zip --create-dirs -o out/chrome-linux.zip
- unzip out/chrome-linux.zip -d out
- export CHROME_CANARY_BIN=$PWD/out/chrome-linux/chrome
- export CHROME_BIN=$PWD/out/chrome-linux/chrome
- yarn run build


addons:
firefox: "latest"
apt:
sources:
- google-chrome
packages:
- google-chrome-stable
# firefox: latest-beta
chrome: stable

cache: yarn

Expand Down
12 changes: 3 additions & 9 deletions karma.conf.js
Expand Up @@ -101,20 +101,14 @@ module.exports = function(config) {

browserNoActivityTimeout: 100000,

customLaunchers: {
chrome_canary_travis: {
base: "ChromeCanary",
flags: ["--no-sandbox"],
},
},
};
if (process.env.TRAVIS) {
options.detectBrowsers.enabled = false;
options.detectBrowsers.enabled = true;
options.autoWatch = false;
options.singleRun = true;
options.concurrency = 1;
options.concurrency = 2;
options.reporters = ["mocha"];
options.browsers = ["chrome_canary_travis"]; //"FirefoxNightly"
//options.browsers = ["FirefoxNightly"]; //"FirefoxNightly"
}
config.set(options);
};

0 comments on commit 6e4b112

Please sign in to comment.