Rename initialState => initialActiveState

Author: mjackson

modules/mixins/ActiveDelegate.js

@@ -42,22 +42,22 @@ var ActiveDelegate = {
   },
 
   propTypes: {
-    initialState: React.PropTypes.object
+    initialActiveState: React.PropTypes.object // Mainly for testing.
   },
 
   getDefaultProps: function () {
     return {
-      initialState: {}
+      initialActiveState: {}
     };
   },
 
   getInitialState: function () {
-    var initialState = this.props.initialState;
+    var state = this.props.initialActiveState;
 
     return {
-      activeRoutes: initialState.activeRoutes || [],
-      activeParams: initialState.activeParams || {},
-      activeQuery: initialState.activeQuery || {}
+      activeRoutes: state.activeRoutes || [],
+      activeParams: state.activeParams || {},
+      activeQuery: state.activeQuery || {}
     };
   },
 

modules/mixins/__tests__/ActiveDelegate-test.js

@@ -23,7 +23,7 @@ describe('ActiveDelegate', function () {
       beforeEach(function () {
         component = ReactTestUtils.renderIntoDocument(
           App({
-            initialState: {
+            initialActiveState: {
               activeRoutes: [ route ]
             }
           })
@@ -44,7 +44,7 @@ describe('ActiveDelegate', function () {
       beforeEach(function () {
         component = ReactTestUtils.renderIntoDocument(
           App({
-            initialState: {
+            initialActiveState: {
               activeRoutes: [ route ],
               activeParams: { id: '123', show: 'true', variant: 456 },
               activeQuery: { search: 'abc', limit: 789 }
@@ -81,7 +81,7 @@ describe('ActiveDelegate', function () {
       beforeEach(function () {
         component = ReactTestUtils.renderIntoDocument(
           App({
-            initialState: {
+            initialActiveState: {
               activeRoutes: [ route ],
               activeParams: { id: 123 }
             }