Defer running the state and action transforms

index.js

@@ -1,16 +1,23 @@
 const identity = x => x;
 const getUndefined = () => {};
 function createRavenMiddleware(Raven, options = {}) {
+  // TODO: Validate options.
   const {
     breadcrumbDataFromAction = getUndefined,
     actionTransformer = identity,
     stateTransformer = identity,
     breadcrumbCategory = "redux-action"
   } = options;
+  Raven.setDataCallback((data, original) => {
+    data.extra.lastAction = actionTransformer(data.extra.lastAction);
+    data.extra.state = stateTransformer(data.extra.state);
+    return original ? original(data) : data;
+  });
   return store => {
     // Record the initial state in case we crash before the first action
     // succeeds.
-    Raven.setExtraContext({ state: stateTransformer(store.getState()) });
+    // TODO: This does not currently work.
+    Raven.setExtraContext({ state: store.getState() });
 
     return next => action => {
       // Log the action taken to Raven so that we have narrative context in our
@@ -22,14 +29,14 @@ function createRavenMiddleware(Raven, options = {}) {
       });
 
       // Set the action as context in case we crash in the reducer.
-      const extra = { lastAction: actionTransformer(action) };
+      const extra = { lastAction: action };
       Raven.context({ extra }, () => next(action));
 
       // Set the last action and state as context in case we crash before
       // the next action is dispatched.
       Raven.setExtraContext({
-        lastAction: actionTransformer(action),
-        state: stateTransformer(store.getState())
+        lastAction: action,
+        state: store.getState()
       });
     };
   };

index.test.js

@@ -119,8 +119,7 @@ describe("raven-for-redux", function() {
         )
       );
     });
-    // TODO: Issue #6
-    xit("does not transform the state or action until an exception is encountered", function() {
+    it("does not transform the state or action until an exception is encountered", function() {
       this.store.dispatch({ type: "INCREMENT" });
       expect(this.stateTransformer).not.toHaveBeenCalled();
       expect(this.actionTransformer).not.toHaveBeenCalled();