fix(tests): change paths for karma and protractor

42Zavattas · Mar 5, 2015 · 17260f3 · 17260f3
1 parent e4f2cb5
commit 17260f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/templates/protractor.conf.js → app/templates/#protractor.conf.js b/app/templates/protractor.conf.js → app/templates/#protractor.conf.js
@@ -1,15 +1,15 @@
 exports.config = { // jshint ignore:line
 
   // The version is susceptible to change
-  seleniumServerJar: '../node_modules/gulp-protractor/node_modules/protractor/selenium/selenium-server-standalone-2.45.0.jar',
-  // chromeDriver: '../node_modules/gulp-protractor/node_modules/protractor/selenium/chromedriver',
+  seleniumServerJar: './node_modules/gulp-protractor/node_modules/protractor/selenium/selenium-server-standalone-2.45.0.jar',
+  // chromeDriver: './node_modules/gulp-protractor/node_modules/protractor/selenium/chromedriver',
 
   baseUrl: 'http://localhost:9000',
 
   capabilities: {
     browserName: 'chrome'
     // chromeOptions: {
-    //    binary: '/usr/bin/google-chrome-unstable'
+    //    binary: '/usr/bin/google-chrome-stable'
     // }
   },
 

diff --git a/app/templates/karma.conf.js b/app/templates/karma.conf.js
@@ -3,7 +3,7 @@
 module.exports = function (config) {
   config.set({
 
-    basePath: '',
+    basePath: 'client',
 
     frameworks: ['jasmine'],