Skip to content

brainfood / videojs-contrib-hls

Go to a project
Toggle navigation
Toggle navigation pinning
86bcfb6c by jforbes
Options

Fixed task selection logic 

Run Karma tests with Chrome and Firefox
1 parent 12790e51
Inline Side-by-side
Showing 2 changed files with 8 additions and 6 deletions
...@@ -351,11 +351,13 @@ module.exports = function(grunt) { ...@@ -351,11 +351,13 @@ module.exports = function(grunt) {
351 351
352 grunt.task.run(['jshint', 'manifests-to-js']); 352 grunt.task.run(['jshint', 'manifests-to-js']);
353 353
354 if (process.env.TRAVIS_PULL_REQUEST) { 354 if (process.env.TRAVIS) {
355 grunt.task.run(['karma:phantomjs']); 355 if (process.env.TRAVIS_PULL_REQUEST === 'false') {
356 } else if (process.env.TRAVIS) { 356 grunt.task.run(['karma:saucelabs']);
357 grunt.task.run(['karma:saucelabs']); 357 grunt.task.run(['connect:test', 'protractor:saucelabs']);
358 grunt.task.run(['connect:test', 'protractor:saucelabs']); 358 } else {
359 grunt.task.run(['karma:phantomjs']);
360 }
359 } else { 361 } else {
360 if (tasks.length === 0) { 362 if (tasks.length === 0) {
361 tasks.push('chrome'); 363 tasks.push('chrome');
......
...@@ -61,7 +61,7 @@ module.exports = function(config) { ...@@ -61,7 +61,7 @@ module.exports = function(config) {
61 customLaunchers: customLaunchers, 61 customLaunchers: customLaunchers,
62 62
63 // Start these browsers 63 // Start these browsers
64 browsers: ['chrome_sl', 'ipad_sl'], //Object.keys(customLaunchers), 64 browsers: ['chrome_sl', 'firefox_sl'], //Object.keys(customLaunchers),
65 65
66 // List of files / patterns to load in the browser 66 // List of files / patterns to load in the browser
67 // Add any new src files to this list. 67 // Add any new src files to this list.
......