| 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 configuration = { | 5 var configuration = { |
| 6 | 6 |
| 7 // base path that will be used to resolve all patterns (eg. files, exclude) | 7 // base path that will be used to resolve all patterns (eg. files, exclude) |
| 8 basePath: '', | 8 basePath: '', |
| 9 | 9 |
| 10 // frameworks to use | 10 // frameworks to use |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 chrome_canary_harmony: { | 70 chrome_canary_harmony: { |
| 71 base: 'ChromeCanary', | 71 base: 'ChromeCanary', |
| 72 flags: ['--js-flags="--harmony-arrow-functions --harmony-classes --harmo
ny-computed-property-names"'] | 72 flags: ['--js-flags="--harmony-arrow-functions --harmony-classes --harmo
ny-computed-property-names"'] |
| 73 }, | 73 }, |
| 74 | 74 |
| 75 chrome_travis: { | 75 chrome_travis: { |
| 76 base: 'Chrome', | 76 base: 'Chrome', |
| 77 flags: ['--no-sandbox --js-flags="--harmony-arrow-functions --harmony-cl
asses --harmony-computed-property-names"'] | 77 flags: ['--no-sandbox --js-flags="--harmony-arrow-functions --harmony-cl
asses --harmony-computed-property-names"'] |
| 78 }, | 78 }, |
| 79 }, | 79 }, |
| 80 browsers: ['chrome_harmony'], | 80 browsers: ['chrome_canary_harmony'], |
| 81 | 81 |
| 82 // Continuous Integration mode | 82 // Continuous Integration mode |
| 83 // if true, Karma captures browsers, runs the tests and exits | 83 // if true, Karma captures browsers, runs the tests and exits |
| 84 singleRun: false, | 84 singleRun: false, |
| 85 }; | 85 }; |
| 86 | 86 |
| 87 if (process.env.TRAVIS) { | 87 if (process.env.TRAVIS) { |
| 88 configuration.browsers = ['chrome_travis']; | 88 configuration.browsers = ['chrome_travis']; |
| 89 } | 89 } |
| 90 | 90 |
| 91 config.set(configuration); | 91 config.set(configuration); |
| 92 }; | 92 }; |
| OLD | NEW |