Fixing karma conf after moving files

lucasvo · Jan 16, 2015 · 8962457 · 8962457
1 parent c60ebff
commit 8962457
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -19,7 +19,7 @@ module.exports = function(config) {
       'test/test-main.js',
       {pattern: 'backbone-postmaster.js', included: false},
       {pattern: 'test/**/*Spec.js', included: false},
-      {pattern: 'test/vendor/**/*.js', included: false}
+      {pattern: 'libs/**/*.js', included: false}
     ],
 
 

diff --git a/test/test-main.js b/test/test-main.js
@@ -9,17 +9,16 @@ Object.keys(window.__karma__.files).forEach(function(file) {
   if (TEST_REGEXP.test(file)) {
     // Normalize paths to RequireJS module names.
     allTestFiles.push(pathToModule(file));
-    console.log(allTestFiles);
   }
 });
 require.config({
   // Karma serves files under /base, which is the basePath from your config file
   baseUrl: '/base',
   paths: {
   //  'router':'router',
-    'underscore':'libs/underscore',
-    'jquery':'libs/jquery-1.11.1',
-    'backbone':'libs/backbone'
+    'underscore':'/base/libs/underscore',
+    'jquery':'/base/libs/jquery-1.11.1',
+    'backbone':'/base/libs/backbone'
   }, 
   // dynamically load all test files
   deps: allTestFiles,