Change iframe mount test to no use karma-server-side

Maybe this will fix CI browser tests? Maybe it's the karma `proxy` setting that was screwing things up? But also there is no reason to use server side in this case - simply local iframe is good enough.
featurist · Dec 22, 2018 · 767d321 · 767d321
1 parent adbefc6
commit 767d321
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 212 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -2,12 +2,13 @@ module.exports = function (config) {
   config.set({
     concurrency: process.env.BROWSERS === 'all' ? 2 : Infinity,
     basePath: '',
-    frameworks: ['browserify', 'mocha', 'server-side'],
+    frameworks: ['browserify', 'mocha'],
     files: [
       'test/global.js',
       'test/**/*Spec.js',
       'test/page1.html',
-      'test/page2.html'
+      'test/page2.html',
+      'test/iframe-mount-test.html'
     ],
     exclude: [
       '**/*.sw?'
@@ -50,11 +51,7 @@ module.exports = function (config) {
     customLaunchers: browsers,
     browserNoActivityTimeout: 120000,
     browserDisconnectTimeout: 120000,
-    browserDisconnectTolerance: 3,
-
-    proxies: {
-      '/iframe-test/': 'http://localhost:4572/'
-    }
+    browserDisconnectTolerance: 3
   })
 }
 

diff --git a/package.json b/package.json
@@ -35,7 +35,6 @@
     "karma-ievms": "0.1.0",
     "karma-mocha": "1.3.0",
     "karma-mocha-reporter": "^2.2.5",
-    "karma-server-side": "^1.7.0",
     "lie": "3.1.1",
     "mocha": "5.0.5",
     "must": "^0.13.4",

diff --git a/test/iframe-mount-test.html b/test/iframe-mount-test.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width" />
+    <title>Iframe mount test</title>
+  </head>
+  <body>
+    <div class="message">default</div>
+    <button>press me</button>
+    <script charset="utf-8">
+      document.addEventListener('click', function(e) {
+        if (e.target.innerText === 'press me') {
+          var div = document.querySelector('.message')
+          div.innerText = 'hello browser-monkey'
+        }
+      })
+    </script>
+  </body>
+</html>
diff --git a/test/mountSpec.js b/test/mountSpec.js
@@ -1,4 +1,3 @@
-var server = require('karma-server-side')
 var expect = require('chai').expect
 var isBrowser = !require('is-node')
 
@@ -17,43 +16,7 @@ if (isSupportedBrowser()) {
   testMount('angular', require('./app/angular'), require('../angular'))
   testMount('hyperdom', new (require('./app/hyperdom'))(), require('../hyperdom'))
   testMount('react', new (require('./app/react'))(), require('../react'))
-
-  context('iframe', () => {
-    var app
-    before(() => {
-      return server.run(function () {
-        var express = serverRequire('express') // eslint-disable-line 
-        app = express()
-        app.get('/', (req, res) => {
-          res.send(`<form action="/iframe-test/click">
-          <button type="submit">press me</button>
-          <div class="message">default</div>
-        </div>`)
-        })
-
-        app.get('/click', (req, res) => {
-          res.send('<div class="message">hello browser-monkey</div>')
-        })
-
-        var self = this
-        return new Promise(function (resolve) {
-          self.server = app.listen(4572, function () {
-            resolve()
-          })
-        })
-      })
-    })
-
-    after(() => {
-      return server.run(function () {
-        var self = this
-        return new Promise(function (resolve) {
-          self.server.close(resolve)
-        })
-      })
-    })
-    testMount('iframe', window.location.origin + '/iframe-test/', require('../iframe'))
-  })
+  testMount('iframe', '/base/test/iframe-mount-test.html', require('../iframe'))
 }
 
 function testMount (appType, app, monkeyBuilder) {