'data' property inheritance/override in chain of states

Author: alexandrbaran

src/state.js

@@ -16,6 +16,14 @@ function $StateProvider(   $urlRouterProvider,   $urlMatcherFactory,           $
       return compositeName ? findState(compositeName[1]) : root;
     },
 
+    // inherit 'data' from parent and override by own values (if any)
+    data: function(state) {
+      if (state.parent && state.parent.data) {
+        state.data = state.self.data = angular.extend({}, state.parent.data, state.data);
+      }
+      return state.data;
+    },
+
     // Build a URLMatcher if necessary, either via a relative or absolute URL
     url: function(state) {
       var url = state.url;
@@ -84,15 +92,6 @@ function $StateProvider(   $urlRouterProvider,   $urlMatcherFactory,           $
         if (own) ownParams.push(p);
       });
       return ownParams;
-    },
-
-    data: function(state) {
-      // inherit 'data' from parent and override by own values (if any)
-      if (state.parent && state.parent.data) {
-        state.data = angular.extend({}, state.parent.data, state.data);
-        state.self.data = state.data;
-      }
-      return state.data;
     }
   };
 

test/stateSpec.js

@@ -357,4 +357,30 @@ describe('state', function () {
       expect($state.$current.resolve).toEqual({});
     }));
   });
+
+  describe(' "data" property inheritance/override', function () {
+    it('"data" property should stay immutable for if state doesn\'t have parent', inject(function ($state) {
+      initStateTo(H);
+      expect($state.current.name).toEqual('H');
+      expect($state.current.data.propA).toEqual(H.data.propA);
+      expect($state.current.data.propB).toEqual(H.data.propB);
+    }));
+
+    it('"data" property should be inherited from parent if state doesn\'t define it', inject(function ($state) {
+      initStateTo(HH);
+      expect($state.current.name).toEqual('HH');
+      expect($state.current.data.propA).toEqual(H.data.propA);
+      expect($state.current.data.propB).toEqual(H.data.propB);
+    }));
+
+    it('"data" property should be overridden/extended if state defines it', inject(function ($state) {
+      initStateTo(HHH);
+      expect($state.current.name).toEqual('HHH');
+      expect($state.current.data.propA).toEqual(HHH.data.propA);
+      expect($state.current.data.propB).toEqual(H.data.propB);
+      expect($state.current.data.propB).toEqual(HH.data.propB);
+      expect($state.current.data.propC).toEqual(HHH.data.propC);
+    }));
+  });
+
 });