Merge pull request #564 from ueokande/lanthan-integration-test

Use lanthan to do E2E testing

2 files changed, 10 insertions, 7 deletions

diff --git a/src/background/index.js b/src/background/index.js
index 29aa92b..f9efd4d 100644
--- a/src/background/index.js
+++ b/src/background/index.js
@@ -2,7 +2,8 @@ import ContentMessageListener from './infrastructures/ContentMessageListener';
 import SettingController from './controllers/SettingController';
 import VersionController from './controllers/VersionController';
 
-new SettingController().reload();
+let settingController = new SettingController();
+settingController.reload();
 
 browser.runtime.onInstalled.addListener((details) => {
   if (details.reason !== 'install' && details.reason !== 'update') {
@@ -12,3 +13,11 @@ browser.runtime.onInstalled.addListener((details) => {
 });
 
 new ContentMessageListener().run();
+browser.storage.onChanged.addListener((changes, area) => {
+  if (area !== 'local') {
+    return;
+  }
+  if (changes.settings) {
+    settingController.reload();
+  }
+});
diff --git a/src/background/infrastructures/ContentMessageListener.js b/src/background/infrastructures/ContentMessageListener.js
index 1179a8c..5b0f62e 100644
--- a/src/background/infrastructures/ContentMessageListener.js
+++ b/src/background/infrastructures/ContentMessageListener.js
@@ -51,8 +51,6 @@ export default class ContentMessageListener {
       return this.onConsoleEnterCommand(message.text);
     case messages.SETTINGS_QUERY:
       return this.onSettingsQuery();
-    case messages.SETTINGS_RELOAD:
-      return this.onSettingsReload();
     case messages.FIND_GET_KEYWORD:
       return this.onFindGetKeyword();
     case messages.FIND_SET_KEYWORD:
@@ -87,10 +85,6 @@ export default class ContentMessageListener {
     return this.settingController.getSetting();
   }
 
-  onSettingsReload() {
-    return this.settingController.reload();
-  }
-
   onFindGetKeyword() {
     return this.findController.getKeyword();
   }