Merge branch 'skrustev-master'

Author: kdinev

.gitignore

@@ -1,4 +1,5 @@
 node_modules
 bower_components
 dist
-test_out
+test_out
+coverage

.travis.yml

@@ -1,8 +1,17 @@
 language: node_js
 node_js:
   - "5"
-script: npm run test-single
 before_install:
   - export CHROME_BIN=chromium-browser
   - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
+  - sh -e /etc/init.d/xvfb start
+  - sleep 3
+  - sudo apt-get update
+  - sudo apt-get install -y libappindicator1 fonts-liberation
+  - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+  - sudo dpkg -i google-chrome*.deb
+script:
+  - npm run start
+  - sleep 3
+  - npm run test-single
+  - npm run protractor

package.json

@@ -2,6 +2,7 @@
   "name": "igniteui-angular",
   "dependencies": {},
   "devDependencies": {
+    "coveralls": "",
     "grunt": "",
     "grunt-contrib-jshint": "",
     "grunt-contrib-uglify": "",
@@ -13,26 +14,28 @@
     "shelljs": "",
     "karma": "",
     "karma-jasmine": "",
+    "karma-coverage": "",
     "karma-chrome-launcher": "",
     "karma-firefox-launcher": "",
     "karma-junit-reporter": ""
+
   },
   "scripts": {
     "postinstall": "bower install",
 
     "prestart": "npm install",
-    "start": "http-server -a localhost -p 8000",
+    "start": "http-server -a localhost -p 8000 &",
 
     "pretest": "npm install",
     "test": "karma start test/karma.conf.js",
-    "test-single": "karma start test/karma.conf.js --single-run --reporters junit,dots",
+    "test-single": "karma start test/karma.conf.js --single-run --reporters junit,dots,coverage",
     "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": "npm start | protractor test/protractor-conf.js",
+    "protractor": "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/karma.conf.js

@@ -21,16 +21,27 @@ module.exports = function(config){
 
 		frameworks: ['jasmine'],
 
-		plugins : [ 'karma-chrome-launcher', 'karma-firefox-launcher', 'karma-jasmine', 'karma-junit-reporter' ],
+		plugins : [ 'karma-chrome-launcher', 'karma-firefox-launcher', 'karma-jasmine', 'karma-junit-reporter', 'karma-coverage' ],
 
-		reporters: ['junit'],
+		reporters: ['junit', 'coverage'],
 
 		junitReporter : {
 			outputDir: './test_out',
 			outputFile: 'unit.xml',
 			suite: 'unit'
 		},
 
+		preprocessors: {
+		  'src/*.js': ['coverage']
+		},
+		
+		coverageReporter: {
+			reporters:[
+				{ type: 'lcov', dir:'coverage/' },
+				{ type: 'json', dir:'coverage/', file: 'coverage.json' },
+			],
+		},
+		
 		browsers : ['Chrome'],
 
 		customLaunchers: {

test/protractor-conf.js

@@ -1,11 +1,11 @@
-exports.config = {
+var cfg = {
 
 	allScriptsTimeout: 11000,
 
 	specs: [
 		"e2e/*.js"
 	],
-	chromeOnly: true, //https://github.com/angular/protractor/issues/187
+	//chromeOnly: true, //https://github.com/angular/protractor/issues/187
 	capabilities: {
 		"browserName": "chrome"
 	},
@@ -18,3 +18,11 @@ exports.config = {
 		defaultTimeoutInterval: 30000
 	}
 };
+
+if (process.env.TRAVIS) {
+	cfg.capabilities.chromeOptions = {
+			'args': ['--no-sandbox']
+		};
+}
+
+exports.config = cfg;