Merge pull request #248 from azakus/fix-grunt-tests

Fix grunt tests
googlearchive · Sep 9, 2013 · 13d542f · 13d542f
2 parents 9628530 + 85da676
commit 13d542f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/conf/karma.conf.js b/conf/karma.conf.js
@@ -2,19 +2,20 @@ module.exports = function(karma) {
   var common = require('../tools/test/karma-common.conf.js');
   karma.set(common.mixin_common_opts(karma, {
     // base path, that will be used to resolve files and exclude
-    basePath: '../',
+    basePath: '../../',
 
     // list of files / patterns to load in the browser
     files: [
-      'tools/test/mocha-htmltest.js',
-      'conf/mocha.conf.js',
-      'node_modules/chai/chai.js',
-      'shadowdom.js',
-      'test/test.main.js',
-      {pattern: 'src/**/*.js', included: false},
-      {pattern: 'test/**/*.js', included: false},
-      {pattern: 'test/**/*.html', included: false},
-      {pattern: 'tools/**/*.js', included: false}
+      'observe-js/src/observe.js',
+      'ShadowDOM/tools/test/mocha-htmltest.js',
+      'ShadowDOM/conf/mocha.conf.js',
+      'ShadowDOM/node_modules/chai/chai.js',
+      'ShadowDOM/shadowdom.js',
+      'ShadowDOM/test/test.main.js',
+      {pattern: 'ShadowDOM/src/**/*.js', included: false},
+      {pattern: 'ShadowDOM/test/**/*.js', included: false},
+      {pattern: 'ShadowDOM/test/**/*.html', included: false},
+      {pattern: 'ShadowDOM/tools/**/*.js', included: false}
     ]
   }));
 };
diff --git a/conf/mocha.conf.js b/conf/mocha.conf.js
@@ -1 +1 @@
-mocha.setup({ui:'tdd',htmlbase: '/base/test/',ignoreLeaks: true});
+mocha.setup({ui:'tdd',htmlbase: '/base/ShadowDOM/test/',ignoreLeaks: true});