Merge remote-tracking branch 'origin/master' into greenkeeper/css-loader-1.0.0

2 files changed, 2 insertions, 47 deletions

diff --git a/test/content/actions/addon.test.js b/test/content/actions/addon.test.js
deleted file mode 100644
index 5f96372..0000000
--- a/test/content/actions/addon.test.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import actions from 'content/actions';
-import * as addonActions from 'content/actions/addon';
-
-describe("addon actions", () => {
-  describe("enable", () => {
-    it('create ADDON_ENABLE action', () => {
-      let action = addonActions.enable();
-      expect(action.type).to.equal(actions.ADDON_ENABLE);
-    });
-  });
-
-  describe("disable", () => {
-    it('create ADDON_DISABLE action', () => {
-      let action = addonActions.disable();
-      expect(action.type).to.equal(actions.ADDON_DISABLE);
-    });
-  });
-
-  describe("toggle", () => {
-    it('create ADDON_TOGGLE_ENABLED action', () => {
-      let action = addonActions.toggleEnabled();
-      expect(action.type).to.equal(actions.ADDON_TOGGLE_ENABLED);
-    });
-  });
-});
diff --git a/test/content/reducers/addon.test.js b/test/content/reducers/addon.test.js
index 8c546d2..d4eb845 100644
--- a/test/content/reducers/addon.test.js
+++ b/test/content/reducers/addon.test.js
@@ -7,31 +7,11 @@ describe("addon reducer", () => {
     expect(state).to.have.property('enabled', true);
   });
 
-  it('return next state for ADDON_ENABLE', () => {
-    let action = { type: actions.ADDON_ENABLE};
+  it('return next state for ADDON_SET_ENABLED', () => {
+    let action = { type: actions.ADDON_SET_ENABLED, enabled: true };
     let prev = { enabled: false };
     let state = addonReducer(prev, action);
 
     expect(state.enabled).is.equal(true);
   });
-
-  it('return next state for ADDON_DISABLE', () => {
-    let action = { type: actions.ADDON_DISABLE};
-    let prev = { enabled: true };
-    let state = addonReducer(prev, action);
-
-    expect(state.enabled).is.equal(false);
-  });
-
-  it('return next state for ADDON_TOGGLE_ENABLED', () => {
-    let action = { type: actions.ADDON_TOGGLE_ENABLED };
-    let state = { enabled: false };
-
-    state = addonReducer(state, action);
-    expect(state.enabled).is.equal(true);
-
-    state = addonReducer(state, action);
-    expect(state.enabled).is.equal(false);
-  });
-
 });