From d3a97abab1e67ffee018371d1481418c3c3eec8e Mon Sep 17 00:00:00 2001 From: Juanfran Date: Wed, 27 May 2015 09:00:09 +0200 Subject: [PATCH] travis support --- .travis.yml | 14 ++++++++++++++ karma.conf.js | 17 +++++++++++++++-- package.json | 3 ++- 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..18a06b23 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,14 @@ +before_install: + - export CHROME_BIN=chromium-browser + - export DISPLAY=:99.0 + - sh -e /etc/init.d/xvfb start + - npm install -g bower + - npm install -g gulp +install: + - npm install + - bower install +before_script: + - gulp deploy +language: node_js +node_js: + - "0.12" \ No newline at end of file diff --git a/karma.conf.js b/karma.conf.js index 209da9ec..4777a4ee 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -2,7 +2,7 @@ // Generated on Wed Apr 15 2015 09:44:14 GMT+0200 (CEST) module.exports = function(config) { - config.set({ + var configuration = { // base path that will be used to resolve all patterns (eg. files, exclude) basePath: '', @@ -78,9 +78,22 @@ module.exports = function(config) { // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher browsers: ['Chrome'], + customLaunchers: { + Chrome_travis_ci: { + base: 'Chrome', + flags: ['--no-sandbox'] + } + }, // Continuous Integration mode // if true, Karma captures browsers, runs the tests and exits singleRun: false - }); + }; + + if(process.env.TRAVIS){ + configuration.browsers = ['Chrome_travis_ci']; + configuration.singleRun = true; + } + + config.set(configuration); }; diff --git a/package.json b/package.json index ad9f67d3..827693a8 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,8 @@ } ], "scripts": { - "scss-lint": "gulp scss-lint --fail" + "scss-lint": "gulp scss-lint --fail", + "test": "./node_modules/karma/bin/karma start" }, "devDependencies": { "angular-mocks": "^1.3.15",