From 17260f3201dbf201ac5c23a5fab8ef1c43d07c6e Mon Sep 17 00:00:00 2001
From: Balthazar Gronon <bgronon@gmail.com>
Date: Thu, 5 Mar 2015 18:52:08 +0100
Subject: [PATCH] fix(tests): change paths for karma and protractor

---
 app/templates/{protractor.conf.js => #protractor.conf.js} | 6 +++---
 app/templates/karma.conf.js                               | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename app/templates/{protractor.conf.js => #protractor.conf.js} (53%)

diff --git a/app/templates/protractor.conf.js b/app/templates/#protractor.conf.js
similarity index 53%
rename from app/templates/protractor.conf.js
rename to app/templates/#protractor.conf.js
index cd96b3d..2eaa806 100644
--- a/app/templates/protractor.conf.js
+++ b/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
index 950ae09..5babb67 100644
--- 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'],