Test Configuration Updated

FrankDeGroot · Jan 2, 2013 · ca3bba6 · ca3bba6
1 parent e184eae
commit ca3bba6
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 5 deletions.
diff --git a/app/js/ctrl/nav.js b/app/js/ctrl/nav.js
@@ -1,4 +1,6 @@
-function NavCtrl($scope, $location) {
+'use strict';
+
+function NavCtrl($scope, $location) {
     $scope.isUrl = function (path, className) {
         if ($location.path() == path) {
             return className;

diff --git a/config/testacular-e2e.conf.js b/config/testacular-e2e.conf.js
@@ -8,6 +8,7 @@ files = [
 
 autoWatch = false;
 
+//browsers = ['PhantomJS'];
 browsers = ['Chrome'];
 
 singleRun = true;

diff --git a/config/testacular.conf.js b/config/testacular.conf.js
@@ -12,6 +12,7 @@ files = [
 
 autoWatch = true;
 
+//browsers = ['PhantomJS'];
 browsers = ['Chrome'];
 
 junitReporter = {

diff --git a/scripts/e2e-test.bat b/scripts/e2e-test.bat
@@ -8,4 +8,6 @@ REM - NodeJS (http://nodejs.org/)
 REM - Testacular (npm install -g testacular)
 
 set BASE_DIR=%~dp0
-testacular start "%BASE_DIR%\..\config\testacular-e2e.conf.js" %*
+set PHANTOMJS_BIN=%APPDATA%\npm\node_modules\phantomjs\lib\phantom\phantomjs.exe
+set CHROME_BIN=%ProgramFiles(x86)%\Google\Chrome\Application\chrome.exe
+start testacular start "%BASE_DIR%\..\config\testacular-e2e.conf.js" %*
diff --git a/scripts/test.bat b/scripts/test.bat
@@ -8,4 +8,6 @@ REM - NodeJS (http://nodejs.org/)
 REM - Testacular (npm install -g testacular)
 
 set BASE_DIR=%~dp0
-testacular start "%BASE_DIR%\..\config\testacular.conf.js" %*
+set PHANTOMJS_BIN=%APPDATA%\npm\node_modules\phantomjs\lib\phantom\phantomjs.exe
+set CHROME_BIN=%ProgramFiles(x86)%\Google\Chrome\Application\chrome.exe
+start testacular start "%BASE_DIR%\..\config\testacular.conf.js" %*
diff --git a/srv/srv.js b/srv/srv.js
@@ -1,7 +1,7 @@
 var app = require('./app'),
     api = require('./api'),
     ip = process.env.IP || '127.0.0.1',
-    port = process.env.PORT || 3000;
+    port = process.env.PORT || 8000;
 
 api(app, function () {
     app.listen(port, function () {

diff --git a/test/e2e/scenarios.js b/test/e2e/scenarios.js
@@ -5,7 +5,7 @@
 describe('my app', function() {
 
   beforeEach(function() {
-    browser().navigateTo('../../app/index.html');
+    browser().navigateTo('/');
   });
 
 

diff --git a/test/unit/ctrl/navSpec.js b/test/unit/ctrl/navSpec.js
@@ -0,0 +1,2 @@
+'use strict';
+