From: Tim Otten <totten@civicrm.org>
Date: Mon, 16 May 2016 21:58:18 +0000 (-0700)
Subject: Revert "Adding jasmine testing across domains"
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5915de41a4d7d48baf52e3a4832981e1787fc023;p=civicrm-core.git

Revert "Adding jasmine testing across domains"
---

diff --git a/karma.conf.js b/karma.conf.js
index b04979c744..eada18ded5 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -1,18 +1,7 @@
 module.exports = function(config) {
   config.set({
     autoWatch: true,
-    browsers: ['PhantomJS', 'PhantomJS_custom'],
-    customLaunchers: {
-      'PhantomJS_custom': {
-        base: 'PhantomJS',
-        options: {
-            windowName: 'my-window',
-            settings: {
-                webSecurityEnabled: false
-            }
-        }
-      }
-    },
+    browsers: ['PhantomJS'],
     exclude: [
     ],
     files: [
diff --git a/tests/karma/unit/externalDomainSpec.js b/tests/karma/unit/externalDomainSpec.js
deleted file mode 100644
index e8f23283ff..0000000000
--- a/tests/karma/unit/externalDomainSpec.js
+++ /dev/null
@@ -1,29 +0,0 @@
-'use strict';
-
-describe('Web page', function(){
-
-    var request = new XMLHttpRequest();
-    var url = 'http://localhost:8000'; // Change to your port!
-
-    beforeAll(function(){
-        /**
-         * Warning! Default installation of jasmine (karma+phantomjs)
-         * doesn't support JS request to other domains than own.
-         * The solutions is at page https://github.com/karma-runner/karma-phantomjs-launcher
-         * + add additional configuration to karma.conf.js
-         *   with parameter for PhantomJS webSecurityEnabled: false
-         * + change run parameter in npm/test.sh
-         */
-        request.open("GET", url, false);
-        request.send();
-    });
-
-    it('has response code 200', function(){
-        expect(request.status).toBe(200);
-    });
-
-    it('contain tag body', function(){
-        expect(request.responseText).toContain('<body');
-    });
-
-});
diff --git a/tools/scripts/npm/test.sh b/tools/scripts/npm/test.sh
index 9863e9c332..1a114feaae 100644
--- a/tools/scripts/npm/test.sh
+++ b/tools/scripts/npm/test.sh
@@ -2,13 +2,13 @@
 if which node_modules/karma/bin/karma >> /dev/null; then
   if which nodejs >> /dev/null; then
     ## Debian
-    nodejs node_modules/karma/bin/karma start --browsers PhantomJS_custom
+    nodejs node_modules/karma/bin/karma start
   else
     ## Official
-    node node_modules/karma/bin/karma start --browsers PhantomJS_custom
+    node node_modules/karma/bin/karma start
   fi
 elif which karma >> /dev/null ; then
-  karma start --browsers PhantomJS_custom
+  karma start
 else
   echo "ERROR: Failed to find karma"
   exit 1