Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1220)

Unified Diff: Tools/GardeningServer/karma.conf.js

Issue 459463003: Convert moar Sheriff-o-Matic tests to Polymer. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: forgot to add lib/network-simulator.html Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Tools/GardeningServer/lib/network-simulator.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Tools/GardeningServer/karma.conf.js
diff --git a/Tools/GardeningServer/karma.conf.js b/Tools/GardeningServer/karma.conf.js
index 6732f4886e862a32dfe6c5f1a68270b149090ed3..875ef7cdf35c1c9405614d35dd9a821d7cc7d76c 100644
--- a/Tools/GardeningServer/karma.conf.js
+++ b/Tools/GardeningServer/karma.conf.js
@@ -14,20 +14,22 @@ module.exports = function(config) {
// mocha setup
client: {
mocha: {
- ui: 'bdd'
+ ui: 'bdd',
+ globals: ['net']
}
},
// list of files / patterns to load in the browser
files: [
'bower_components/platform/platform.js',
- 'test/karma_loader.html',
+ 'test/karma-loader.html',
'bower_components/chai/chai.js',
'bower_components/sugar/release/sugar-full.development.js',
{pattern: 'bower_components/**/*.{js,html,css,map}', included: false},
'node_modules/mocha/mocha.js',
'polymer-load-warning.html',
{pattern: 'model/*.html', included: false},
+ {pattern: 'lib/*.html', included: false},
'model/test/*.html',
'scripts/*.js',
{pattern: 'ui/*.html', included: false},
« no previous file with comments | « no previous file | Tools/GardeningServer/lib/network-simulator.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698