| 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 logLevel: config.LOG_INFO, | 67 logLevel: config.LOG_INFO, |
| 68 | 68 |
| 69 // enable / disable watching file and executing tests whenever any file chan
ges | 69 // enable / disable watching file and executing tests whenever any file chan
ges |
| 70 autoWatch: true, | 70 autoWatch: true, |
| 71 | 71 |
| 72 browserNoActivityTimeout: 60000, | 72 browserNoActivityTimeout: 60000, |
| 73 browserDisconnectTolerance: 5, | 73 browserDisconnectTolerance: 5, |
| 74 | 74 |
| 75 // start these browsers | 75 // start these browsers |
| 76 // available browser launchers: https://npmjs.org/browse/keyword/karma-launc
her | 76 // available browser launchers: https://npmjs.org/browse/keyword/karma-launc
her |
| 77 | |
| 78 // FIXME(vsm): Once harmony is on by default, we can simply add the followin
g: | |
| 79 // browsers: ['Chrome'], | |
| 80 // and remove the custom launchers. | |
| 81 customLaunchers: { | 77 customLaunchers: { |
| 82 chrome_harmony: { | |
| 83 base: 'Chrome', | |
| 84 flags: [ harmony_flags ], | |
| 85 }, | |
| 86 | |
| 87 chrome_canary_harmony: { | |
| 88 base: 'ChromeCanary', | |
| 89 flags: [ harmony_flags ], | |
| 90 }, | |
| 91 | |
| 92 chrome_travis: { | 78 chrome_travis: { |
| 93 base: 'Chrome', | 79 base: 'Chrome', |
| 94 flags: [ '--no-sandbox', harmony_flags ] | 80 flags: [ '--no-sandbox', harmony_flags ] |
| 95 }, | 81 }, |
| 96 | 82 |
| 97 chrome_canary_travis: { | 83 chrome_canary_travis: { |
| 98 base: 'ChromeCanary', | 84 base: 'ChromeCanary', |
| 99 flags: [ '--no-sandbox', harmony_flags ] | 85 flags: [ '--no-sandbox', harmony_flags ] |
| 100 }, | 86 }, |
| 101 }, | 87 }, |
| 102 // TODO(jmesserly): 'chrome_harmony', | 88 |
| 103 browsers: ['chrome_canary_harmony'], | 89 browsers: ['Chrome'], |
| 104 | 90 |
| 105 // Continuous Integration mode | 91 // Continuous Integration mode |
| 106 // if true, Karma captures browsers, runs the tests and exits | 92 // if true, Karma captures browsers, runs the tests and exits |
| 107 singleRun: false, | 93 singleRun: false, |
| 108 }; | 94 }; |
| 109 | 95 |
| 110 if (process.env.TRAVIS) { | 96 if (process.env.TRAVIS) { |
| 111 configuration.browsers = ['chrome_canary_travis']; | 97 configuration.browsers = ['chrome_travis', 'chrome_canary_travis']; |
| 112 configuration.autoWatch = false; | 98 configuration.autoWatch = false; |
| 113 configuration.logLevel = config.LOG_DEBUG; | 99 // Enable this for more logging on Travis. It is too much for Travis to |
| 100 // automatically display, but still results in a downloadable raw log. |
| 101 // configuration.logLevel = config.LOG_DEBUG; |
| 114 configuration.client.captureConsole = true; | 102 configuration.client.captureConsole = true; |
| 115 } | 103 } |
| 116 | 104 |
| 117 config.set(configuration); | 105 config.set(configuration); |
| 118 }; | 106 }; |
| OLD | NEW |