From a1d7388b47bd9ed28b010da2b5b346483b31c628 Mon Sep 17 00:00:00 2001 From: Mike North Date: Mon, 11 May 2015 02:15:17 -0700 Subject: [PATCH 1/2] Sauce labs for cross-browser and cross-device testing --- .travis.yml | 35 +++++++-------- package.json | 3 +- testem.json | 121 +++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 137 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8197d316..72d379e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,15 @@ ---- language: node_js node_js: - - "0.12" - +- '0.12' sudo: false - cache: directories: - - node_modules - + - node_modules env: + global: + - SAUCE_USERNAME=ember_md + - SAUCE_ACCESS_KEY=2ef9adbb-c055-4a8e-98de-df5b93fab92b + matrix: - EMBER_TRY_SCENARIO=default - EMBER_TRY_SCENARIO=ember-release - EMBER_TRY_SCENARIO=ember-beta @@ -18,17 +18,18 @@ env: matrix: fast_finish: true allow_failures: - - env: EMBER_TRY_SCENARIO=ember-canary - + - env: EMBER_TRY_SCENARIO=ember-canary before_install: - - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH - - "npm config set spin false" - - "npm install -g npm@^2" - +- export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH +- npm config set spin false +- npm install -g npm@^2 install: - - npm install -g bower - - npm install - - bower install - +- npm install -g bower +- npm install +- bower install +before_script: +- ember sauce:connect script: - - ember try $EMBER_TRY_SCENARIO test +- ember try $EMBER_TRY_SCENARIO test +after_script: +- ember sauce:disconnect diff --git a/package.json b/package.json index ed643389..bbc59427 100644 --- a/package.json +++ b/package.json @@ -30,10 +30,11 @@ "ember-cli-inject-live-reload": "^1.3.0", "ember-cli-qunit": "0.3.10", "ember-cli-sass": "3.1.0", + "ember-cli-sauce": "1.2.0", "ember-cli-uglify": "1.0.1", "ember-code-snippet": "^1.0.1", - "ember-export-application-global": "^1.0.2", "ember-disable-prototype-extensions": "^1.0.1", + "ember-export-application-global": "^1.0.2", "ember-try": "0.0.4" }, "keywords": [ diff --git a/testem.json b/testem.json index 42a4ddb2..6a6a0395 100644 --- a/testem.json +++ b/testem.json @@ -1,11 +1,124 @@ { "framework": "qunit", - "test_page": "tests/index.html?hidepassed", + "host": "lvh.me", + "test_page": "tests/index.html?hidepassed&coverage", "launch_in_ci": [ - "PhantomJS" + "PhantomJS", + "SL_internet_explorer_9_Windows_7", + "SL_internet_explorer_10_Windows_7", + "SL_internet_explorer_11_Windows_8.1", + "SL_firefox", + "SL_chrome", + "SL_safari", + "SL_iPhone_82", + "SL_android_51" ], "launch_in_dev": [ "PhantomJS", - "Chrome" - ] + "Chrome", + "Firefox", + "Safari" + ], + "parallel": 4, + "launchers": { + "SL_chrome": { + "exe": "./node_modules/.bin/ember-cli-sauce", + "args": [ + "-b", + "chrome", + "-p", + "Windows 8.1", + "--at", + "--no-ct", + "--u" + ], + "protocol": "browser" + }, + "SL_safari": { + "exe": "./node_modules/.bin/ember-cli-sauce", + "args": [ + "-b", + "safari", + "-v", + "8", + "--no-ct", + "--u" + ], + "protocol": "browser" + }, + "SL_internet_explorer_10_Windows_7": { + "exe": "./node_modules/.bin/ember-cli-sauce", + "args": [ + "-b", + "internet explorer", + "-v", + "10", + "-p", + "Windows 7", + "--at", + "--no-ct", + "--u" + ], + "protocol": "browser" + }, + "SL_internet_explorer_11_Windows_8.1": { + "exe": "./node_modules/.bin/ember-cli-sauce", + "args": [ + "-b", + "internet explorer", + "-v", + "11", + "-p", + "Windows 8.1", + "--at", + "--no-ct", + "--u" + ], + "protocol": "browser" + }, + "SL_firefox": { + "exe": "./node_modules/.bin/ember-cli-sauce", + "args": [ + "-b", + "firefox", + "--at", + "--no-ct", + "--u" + ], + "protocol": "browser" + }, + "SL_iPhone_82": { + "exe": "./node_modules/.bin/ember-cli-sauce", + "args": [ + "-b", + "iphone", + "-v", + "8.2", + "-p", + "OS X 10.10", + "-dn", + "iPhone Simulator", + "--at", + "--no-ct", + "--u" + ], + "protocol": "browser" + }, + "SL_android_51": { + "exe": "./node_modules/.bin/ember-cli-sauce", + "args": [ + "-b", + "android", + "-v", + "5.1", + "-p", + "Linux", + "-dn", + "Android Emulator", + "--no-ct", + "--u" + ], + "protocol": "browser" + } + } } From 3b7d88ce9353f20b851e92d1164b5c363ad179e4 Mon Sep 17 00:00:00 2001 From: Mike North Date: Mon, 11 May 2015 02:37:25 -0700 Subject: [PATCH 2/2] Add browser testing badge to readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ef565fb3..d13be2a8 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ [![Build Status](https://travis-ci.org/mike1o1/ember-material-design.svg?branch=master)](https://travis-ci.org/mike1o1/ember-material-design) [![Ember Observer Score](http://emberobserver.com/badges/ember-material-design.svg)](http://emberobserver.com/addons/ember-material-design) +[![Sauce Test Status](https://saucelabs.com/browser-matrix/ember_md.svg?auth=4224566d3e5343c119fbee3ab24f34c7)](https://saucelabs.com/u/ember_md) + # Ember-material-design