Merge pull request #49 from skrustev/master

Fix not working tests, update readme and add Travis CI integration.

Author: kdinev

.gitignore

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

.travis.yml

@@ -0,0 +1,4 @@
+language: node_js
+after_success: npm run test-single && npm run protractor
+node_js:
+  - "5"

README.md

@@ -1,4 +1,7 @@
-#Ignite UI directives for AngularJS (Preview) 
+#Ignite UI directives for AngularJS
+
+[![Build Status](https://travis-ci.org/IgniteUI/igniteui-angular.svg?branch=master)](https://travis-ci.org/IgniteUI/igniteui-angular)
+
 Use the directives found in `igniteui-angular.js` to use [Ignite UI](http://igniteui.com) controls in [AngularJS](http://angularjs.com) pages. [Work with the running samples here](http://igniteui.github.io/igniteui-angular).
 
 #Requirements
@@ -154,23 +157,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,16 +4,17 @@
   "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": ""
   },
   "scripts": {
@@ -24,13 +25,14 @@
 
     "pretest": "npm install",
     "test": "karma start test/karma.conf.js",
-    "test-single-run": "karma start test/karma.conf.js  --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",
 
     "preprotractor": "npm run update-webdriver",
-    "protractor": "protractor test/protractor-conf.js",
+    "protractor": "npm start | protractor test/protractor-conf.js",
 
     "update-index-async": "node -e \"require('shelljs/global'); sed('-i', /\\/\\/@@NG_LOADER_START@@[\\s\\S]*\\/\\/@@NG_LOADER_END@@/, '//@@NG_LOADER_START@@\\n' + cat('app/bower_components/angular-loader/angular-loader.min.js') + '\\n//@@NG_LOADER_END@@', 'app/index-async.html');\""
   }

test/app/js/util.js

@@ -1,15 +1,13 @@
-var ptor = protractor.getInstance();
-
 function executeScript(script) {
-	ptor.driver.executeScript(script);
+	browser.driver.executeScript(script);
 }
 
 function getResult(script) {
-	return ptor.driver.executeScript('return ' + script);
+	return browser.driver.executeScript('return ' + script);
 }
 
 function getAll(locatior) {
-	return ptor.findElements(locatior);
+	return browser.findElements(locatior);
 }
 
 function isInitialized(elementId, widget) {
@@ -19,10 +17,10 @@ function isInitialized(elementId, widget) {
 }
 
 function resetNorthwindScope() {
-	ptor.driver.executeScript(
+	browser.driver.executeScript(
 		'angular.element($("#grid1")).scope().northwind = angular.copy(angular.element($("#grid1")).scope().northwind_bak.slice(0));'
 	);
-	ptor.driver.executeScript(
+	browser.driver.executeScript(
 		'angular.element($("#grid1")).scope().$apply();'
 	);
 }

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'
 		}
 

test/unit/directiveSpecs.js

@@ -1,6 +1,6 @@
 describe('Ignite directives', function() {
-
-	beforeEach(module('igniteui-directives'));
+	
+	beforeEach(module('my-app'));
 
 	//these can go into html files
 	var gridTpl = '<ig-grid id="grid1" data-source="northwind" height="400px" primary-key="ProductID" auto-commit="true" width="700px" auto-generate-columns="false">' +