Merge 90b5d03 into 03b71da

pact-foundation · May 17, 2020 · ad5ceb1 · ad5ceb1
2 parents 03b71da + 90b5d03
commit ad5ceb1
Show file tree

Hide file tree

Showing 7 changed files with 240 additions and 229 deletions.
diff --git a/examples/karma/jasmine/karma.conf.js b/examples/karma/jasmine/karma.conf.js
@@ -1,6 +1,7 @@
 // Karma configuration
 // Generated on Thu Nov 20 2014 14:51:15 GMT+1100 (AEDT)
 var path = require("path")
+process.env.CHROME_BIN = require("puppeteer").executablePath()
 
 module.exports = function(config) {
   config.set({
@@ -61,12 +62,12 @@ module.exports = function(config) {
 
     // start these browsers
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-    browsers: ["PhantomJS_without_security"],
+    browsers: ["Chrome_without_security"],
 
     customLaunchers: {
-      PhantomJS_without_security: {
-        base: "PhantomJS",
-        flags: ["--web-security=no"],
+      Chrome_without_security: {
+        base: "ChromeHeadless",
+        flags: ["--disable-web-security", "--disable-site-isolation-trials"],
       },
     },
 

diff --git a/examples/karma/mocha/karma.conf.js b/examples/karma/mocha/karma.conf.js
@@ -1,6 +1,7 @@
 // Karma configuration
 // Generated on Thu Nov 20 2014 14:51:15 GMT+1100 (AEDT)
 var path = require("path")
+process.env.CHROME_BIN = require("puppeteer").executablePath()
 
 module.exports = function(config) {
   config.set({
@@ -62,12 +63,12 @@ module.exports = function(config) {
 
     // start these browsers
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-    browsers: ["PhantomJS_without_security"],
+    browsers: ["Chrome_without_security"],
 
     customLaunchers: {
-      PhantomJS_without_security: {
-        base: "PhantomJS",
-        flags: ["--web-security=no"],
+      Chrome_without_security: {
+        base: "ChromeHeadless",
+        flags: ["--disable-web-security", "--disable-site-isolation-trials"],
       },
     },