diff --git a/karma.conf.js b/karma.conf.js index 5f932a2..48b228d 100644 --- 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 index 78bb19a..c0b5749 100644 --- 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 new file mode 100644 index 0000000..d63ddd6 --- /dev/null +++ b/test/iframe-mount-test.html @@ -0,0 +1,20 @@ + + +
+ + +