#17 Test for unsubscribe on destroy.

Author: mmasterson

force-app/main/default/aura/Redux/ReduxController.js

@@ -16,6 +16,7 @@
 
             if(window.reducerQueue && window.reducerQueue[reduxName]) {
                 combinedReducer = Redux.combineReducers(Object.assign({}, reducerObject, window.reducerQueue[reduxName]));
+                window.reducerRegistry = {};
                 window.reducerRegistry[reduxName] = Object.assign({}, window.reducerRegistry[reduxName], reducerObject, window.reducerQueue[reduxName]);
             } else if(window.reducerRegistry && window.reducerRegistry[reduxName]) {
                 combinedReducer = Redux.combineReducers(reducerObject);
@@ -90,7 +91,7 @@
         var listener = params ? params.listener : null;
 
         if(listener && window.reduxStore && window.reduxStore[reduxName]) {
-            window.reduxStore[reduxName].subscribe(listener);
+            return window.reduxStore[reduxName].subscribe(listener);
         }
     },
 
@@ -147,12 +148,7 @@
                     for(var key in mapStateToAttributes) {
                         if(mapStateToAttributes.hasOwnProperty(key)) {
                             if(typeof mapStateToAttributes[key] === "function") {
-                                try {
-                                    var returnedFunction = mapStateToAttributes[key]();
-                                    target.set(key, returnedFunction(state, target));
-                                } catch(e) {
-                                    target.set(key, mapStateToAttributes[key](state, target))
-                                }
+                                target.set(key, mapStateToAttributes[key](state, target))
                             } else {
                                 target.set(key, state[mapStateToAttributes[key]]);
                             }

force-app/test/default/staticresources/reduxTests.resource

@@ -201,34 +201,50 @@ describe("Redux Tests", function() {
 
         it('unsubscribes when destroyed', function(done) {
             var renderInto = document.getElementById("renderTestComponents");
-            $T.createComponent("c:TestReduxContainer", {}, renderInto)
+            var originalComponent;
+            var called = 0;
+            $T.createComponent("c:Redux", {}, renderInto)
                 .then(function(component) {
-
-                    var redux = component.find("store");
-
-                    var toggle = false;
-                    function toggleReducer(state, action) {
-                        toggle = !toggle;
-                        if(toggle) {
-                            return "Toggle is True";
-                        } else {
-                            return "Toggle is False";
+                    originalComponent = component;
+                    function reducer(state, action) {
+                        switch (action.type) {
+                            case 'INCREMENT':
+                                return state + 1;
+                            case 'DECREMENT':
+                                return state - 1;
+                            default:
+                                var defaultState = 0;
+                                return defaultState;
                         }
                     }
 
-                    redux.createStore("toggle", toggleReducer);
+                    function handleChanges() {
+                        called++;
+                    }
 
-                    var mapStateToAttributes = {
-                        "v.message": "toggle"
-                    };
+                    component.createStore("counter", reducer);
+                    component.unsubscribe = component.subscribe(handleChanges);
+                    component.dispatch({type: "INCREMENT"});
 
-                    redux.connect(mapStateToAttributes, component);
-                    expect(component.get("v.message")).toBe("Toggle is True");
+                    expect(called).toBe(1);
+                    component.dispatch({type: "INCREMENT"});
+                    expect(called).toBe(2);
+                }).catch(function(e) {
+                done.fail(e);
+            });
+
+            $T.createComponent("c:Redux", {}, renderInto)
+                .then(function(component) {
+                    function reducer(state, action) {
+                        return "Hello World"
+                    }
+
+                    originalComponent.destroy();
+                    component.createStore("helloWorld", reducer);
                     component.dispatch({type: "INCREMENT"});
-                    expect(component.get("v.message")).toBe("Toggle is False");
-                    component.destroy();
+
                     component.dispatch({type: "INCREMENT"});
-                    expect(component.get("v.message")).toBe("Toggle is True");
+                    expect(called).toBe(2);
                     done();
                 }).catch(function(e) {
                 done.fail(e);