Merge pull request #358 from ueokande/improve-build

Improve build

3 files changed, 7 insertions, 17 deletions

diff --git a/e2e/ambassador/src/background/index.js b/e2e/ambassador/src/background/index.js
index 5264c16..db2deb3 100644
--- a/e2e/ambassador/src/background/index.js
+++ b/e2e/ambassador/src/background/index.js
@@ -1,6 +1,6 @@
 import {
   WINDOWS_CREATE, WINDOWS_REMOVE, WINDOWS_GET,
-  TABS_CREATE, TABS_REMOVE, TABS_SELECT_AT, TABS_GET_ZOOM, TABS_SET_ZOOM,
+  TABS_CREATE, TABS_SELECT_AT, TABS_GET_ZOOM, TABS_SET_ZOOM,
   EVENT_KEYPRESS, EVENT_KEYDOWN, EVENT_KEYUP,
   SCROLL_GET, SCROLL_SET,
 } from '../shared/messages';
@@ -20,8 +20,6 @@ receiveContentMessage((message) => {
       url: message.url,
       windowId: message.windowId,
     });
-  case TABS_REMOVE:
-    return browser.tabs.remove(message.tabId);
   case TABS_SELECT_AT:
     return tabs.selectAt({
       windowId: message.windowId,
diff --git a/e2e/ambassador/webpack.config.js b/e2e/ambassador/webpack.config.js
index 2a544bf..d292317 100644
--- a/e2e/ambassador/webpack.config.js
+++ b/e2e/ambassador/webpack.config.js
@@ -14,19 +14,6 @@ config = {
     filename: '[name].js'
   },
 
-  module: {
-    loaders: [
-      {
-        test: [ /\.js$/ ],
-        exclude: /node_modules/,
-        loader: 'babel-loader',
-        query: {
-          presets: ['es2015']
-        }
-      }
-    ]
-  },
-
   resolve: {
     extensions: [ '.js' ],
     modules: [path.join(__dirname, 'src'), 'node_modules']
diff --git a/e2e/karma.conf.js b/e2e/karma.conf.js
index 6140ff3..5ef4646 100644
--- a/e2e/karma.conf.js
+++ b/e2e/karma.conf.js
@@ -34,7 +34,6 @@ module.exports = function (config) {
     },
 
     reporters: ['mocha'],
-    browserDisconnectTimeout: 5000,
 
     plugins: [
       require('./karma-webext-launcher'),
@@ -42,5 +41,11 @@ module.exports = function (config) {
       'karma-webpack',
       'karma-mocha-reporter',
     ],
+
+    client: {
+      mocha: {
+        timeout: 5000
+      }
+    }
   })
 }