| OLD | NEW |
| 1 // Karma configuration | 1 // Karma configuration |
| 2 // Generated on Mon Apr 20 2015 06:33:20 GMT-0700 (PDT) | 2 // Generated on Mon Apr 20 2015 06:33:20 GMT-0700 (PDT) |
| 3 | 3 |
| 4 module.exports = function(config) { | 4 module.exports = function(config) { |
| 5 var harmony_flags = '--js-flags="' + [ | 5 var harmony_flags = '--js-flags="' + [ |
| 6 '--harmony', | 6 '--harmony', |
| 7 ].join(' ') + '"'; | 7 ].join(' ') + '"'; |
| 8 | 8 |
| 9 var configuration = { | 9 var configuration = { |
| 10 | 10 |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 chrome_harmony: { | 77 chrome_harmony: { |
| 78 base: 'Chrome', | 78 base: 'Chrome', |
| 79 flags: [ harmony_flags ], | 79 flags: [ harmony_flags ], |
| 80 }, | 80 }, |
| 81 | 81 |
| 82 chrome_canary_harmony: { | 82 chrome_canary_harmony: { |
| 83 base: 'ChromeCanary', | 83 base: 'ChromeCanary', |
| 84 flags: [ harmony_flags ], | 84 flags: [ harmony_flags ], |
| 85 }, | 85 }, |
| 86 | 86 |
| 87 chrome_travis: { |
| 88 base: 'Chrome', |
| 89 flags: [ '--no-sandbox', harmony_flags ] |
| 90 }, |
| 91 |
| 87 chrome_canary_travis: { | 92 chrome_canary_travis: { |
| 88 base: 'ChromeCanary', | 93 base: 'ChromeCanary', |
| 89 flags: [ '--no-sandbox', harmony_flags ] | 94 flags: [ '--no-sandbox', harmony_flags ] |
| 90 }, | 95 }, |
| 91 }, | 96 }, |
| 92 browsers: ['chrome_canary_harmony'], | 97 browsers: ['chrome_harmony', 'chrome_canary_harmony'], |
| 93 | 98 |
| 94 // Continuous Integration mode | 99 // Continuous Integration mode |
| 95 // if true, Karma captures browsers, runs the tests and exits | 100 // if true, Karma captures browsers, runs the tests and exits |
| 96 singleRun: false, | 101 singleRun: false, |
| 97 }; | 102 }; |
| 98 | 103 |
| 99 if (process.env.TRAVIS) { | 104 if (process.env.TRAVIS) { |
| 100 configuration.browsers = ['chrome_canary_travis']; | 105 configuration.browsers = ['chrome_travis', 'chrome_canary_travis']; |
| 101 configuration.autoWatch = false; | 106 configuration.autoWatch = false; |
| 102 configuration.logLevel = config.LOG_DEBUG; | 107 configuration.logLevel = config.LOG_DEBUG; |
| 103 configuration.client.captureConsole = true; | 108 configuration.client.captureConsole = true; |
| 104 } | 109 } |
| 105 | 110 |
| 106 config.set(configuration); | 111 config.set(configuration); |
| 107 }; | 112 }; |
| OLD | NEW |