Update test instructions, add reporter to karma and remove not used

dependencies.

Author: skrustev

.gitignore

@@ -1,3 +1,4 @@
 node_modules
 bower_components
-dist
+dist
+test_out

README.md

@@ -154,23 +154,38 @@ The easiest way to run the unit tests is to use the npm script:
 
 	npm test
 
-This will start the [Karma](http://karma-runner.github.io/0.12/index.html) test runner and execute the tests.
+This will start the [Karma](http://karma-runner.github.io/0.12/index.html) test runner and execute the tests. By default the browser is Chrome.
 
-####End to end testing
-These tests are run with the [Protractor](https://github.com/angular/protractor) test runner, it simulates interaction.
-So first the web server should be brought up:
+To run the tests for a single run you can use:
 
-	npm start
+	npm run test-single
 
-So that Protractor can execute the tests against it. Starting the tests is done with:
+To run the tests on Firefox you can use:
 
-	npm run protractor
+	npm run test-single-firefox
+	
+###End to end testing
+These tests are run with the [Protractor](https://github.com/angular/protractor) test runner, it simulates interaction.
+
+####Setup
 
-**Note**: Protractor is built upon WebDriver and this should be installed:
+Before proceeding you need to download and install the latest version of the stand-alone WebDriver tool:
 
 	npm run update-webdriver
+	
+After that make sure you have [Java Development Kit (JDK)](http://www.oracle.com/technetwork/java/javase/downloads/index.html) installed on your machine. It is required for the Standalone Selenium Server.
+
+####Running tests
+
+So first the web server should be brought up so that Protractor can execute the tests against it:
+
+	npm start
+
+Running the tests is done with:
+
+	npm run protractor
 
-This will download and install the latest version of the stand-alone WebDriver tool.
+**Note:** You will need to run the protractor on a separate bash
 
 ---------------------------------------
 

package.json

@@ -4,21 +4,18 @@
   "devDependencies": {
     "grunt": "",
     "grunt-contrib-jshint": "",
-    "grunt-contrib-concat": "",
     "grunt-contrib-uglify": "",
     "grunt-contrib-watch": "",
-    "grunt-contrib-requirejs": "",
     "jshint-stylish": "",
-    "karma": "",
     "protractor": "",
     "http-server": "",
     "bower": "",
     "shelljs": "",
-	"karma": "",
-	"karma-jasmine": "",
-	"karma-chrome-launcher": "",
-	"karma-firefox-launcher": "",
-	"karma-junit-reporter": ""
+    "karma": "",
+    "karma-jasmine": "",
+    "karma-chrome-launcher": "",
+    "karma-firefox-launcher": "",
+    "karma-junit-reporter": ""
   },
   "scripts": {
     "postinstall": "bower install",
@@ -28,8 +25,8 @@
 
     "pretest": "npm install",
     "test": "karma start test/karma.conf.js",
-    "test-chrome-single": "karma start test/karma.conf.js --browsers Chrome --single-run",
-    "test-firefox-single": "karma start test/karma.conf.js --browsers Firefox --single-run",
+    "test-single": "karma start test/karma.conf.js --single-run --reporters junit,dots",
+    "test-single-firefox": "karma start test/karma.conf.js --browsers Firefox --single-run  --reporters junit,dots",
 
     "preupdate-webdriver": "npm install",
     "update-webdriver": "webdriver-manager update",

test/karma.conf.js

@@ -24,9 +24,12 @@ module.exports = function(config){
 		browsers : ['Chrome'],
 
 		plugins : [ 'karma-chrome-launcher', 'karma-firefox-launcher', 'karma-jasmine', 'karma-junit-reporter' ],
-
+		
+		reporters: ['junit'],
+		
 		junitReporter : {
-			outputFile: 'test_out/unit.xml',
+			outputDir: './test_out',
+			outputFile: 'unit.xml',
 			suite: 'unit'
 		}