Merge branch 'testing' of https://github.com/4Science/dspace-angular into testing

Author: atarix83

karma.conf.js

@@ -3,13 +3,15 @@
  */
 
 module.exports = function(config) {
-  var webdriverConfig = {
-    hostname: '4science-devel1',
-    port: 4202
-  }
-
+    
   var testWebpackConfig = require('./webpack.test.config.js')({env: 'test'});
 
+  // Uncomment and change to run tests on a remote Selenium server
+  var webdriverConfig = {
+    hostname: 'localhost',
+    port: 4444
+  }
+  
   var configuration = {
 
     // base path that will be used to resolve all patterns (e.g. files, exclude)
@@ -57,7 +59,7 @@ module.exports = function(config) {
       reporters:[
         {type: 'in-memory'},
         {type: 'json', subdir: '.', file: 'coverage-final.json'},
-        {type : 'html', dir : 'coverage/'}
+        {type: 'html', dir : 'coverage/'}
       ]
     },
 
@@ -87,8 +89,8 @@ module.exports = function(config) {
      */
     reporters: [ 'mocha', 'coverage', 'karma-remap-istanbul' ],
 
-    // web server port
-    port: 4212,
+    // Karma web server port
+    port: 9876,
 
     // enable / disable colors in the output (reporters and logs)
     colors: true,
@@ -108,19 +110,25 @@ module.exports = function(config) {
      */
     browsers: [
       'Chrome'
+      //'ChromeTravisCi',
+      //'SeleniumChrome',
+      //'SeleniumFirefox'
     ],
 
     customLaunchers: {
-      ChromeTravisCi: {
+      // Continuous integraation with Chrome - launcher
+      'ChromeTravisCi': {
         base: 'Chrome',
         flags: ['--no-sandbox']
       },
-      'chrome': {
+      // Remote Selenium Server with Chrome - launcher
+      'SeleniumChrome': {
         base: 'WebDriver',
         config: webdriverConfig,
         browserName: 'chrome',
       },
-      'firefox': {
+      // Remote Selenium Server with Firefox - launcher
+      'SeleniumFirefox': {
         base: 'WebDriver',
         config: webdriverConfig,
         browserName: 'firefox',