Merge pull request #20 from madmax983/unsubscribe-failing-test

Unsubscribe failing test

Author: madmax983

force-app/main/default/aura/Redux/Redux.cmp

@@ -1,5 +1,6 @@
 <aura:component description="Redux">
     <ltng:require scripts="{!$Resource.redux}"/>
+    <aura:handler name="destroy" value="{!this}" action="{!c.handleUnsubscribe}"/>
     <aura:attribute name="name" type="string" default="redux" />
     <aura:method name="createStore" action="{!c.createStore}">
         <aura:attribute name="name" type="string" />

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]]);
                             }
@@ -163,7 +159,7 @@
 
             handleChanges();
 
-            window.reduxStore[reduxName].subscribe(handleChanges);
+            component.unsubscribe = window.reduxStore[reduxName].subscribe(handleChanges);
             target.dispatch = window.reduxStore[reduxName].dispatch;
         } else {
             if(window.subscriberQueue && window.subscriberQueue[reduxName]) {
@@ -179,6 +175,11 @@
                 }];
             }
         }
+    },
+    handleUnsubscribe: function(component) {
+      if (component.unsubscribe) {
+        component.unsubscribe();
+      }
     }
 
 })

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

@@ -198,6 +198,58 @@ describe("Redux Tests", function() {
                 done.fail(e);
             });
         });
+
+        it('unsubscribes when destroyed', function(done) {
+            var renderInto = document.getElementById("renderTestComponents");
+            var originalComponent;
+            var called = 0;
+            $T.createComponent("c:Redux", {}, renderInto)
+                .then(function(component) {
+                    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;
+                        }
+                    }
+
+                    function handleChanges() {
+                        called++;
+                    }
+
+                    component.createStore("counter", reducer);
+                    component.unsubscribe = component.subscribe(handleChanges);
+                    component.dispatch({type: "INCREMENT"});
+
+                    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"});
+
+                    component.dispatch({type: "INCREMENT"});
+                    expect(called).toBe(2);
+                    done();
+                }).catch(function(e) {
+                done.fail(e);
+            });
+        });
     });
 
     describe('Test Queueing', function() {

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

@@ -114,7 +114,9 @@
         while (cmpsToCleanup.length) {
             var globalId = cmpsToCleanup.shift();
             var cmp = $A.getComponent(globalId);
-            cmp.destroy();
+            if(cmp && cmp.isValid()) {
+                cmp.destroy();
+            }
         }
     }