fix(reloadOnSearch): Update locals.globals.$stateParams when reloadOnSearch=false

Closes #2356

Author: christopherthielen

src/state.js

@@ -1036,6 +1036,7 @@ function $StateProvider(   $urlRouterProvider,   $urlMatcherFactory) {
         if (hash) toParams['#'] = hash;
         $state.params = toParams;
         copy($state.params, $stateParams);
+        copy(filterByKeys(to.params.$$keys(), $stateParams), to.locals.globals.$stateParams);
         if (options.location && to.navigable && to.navigable.url) {
           $urlRouter.push(to.navigable.url, toParams, {
             $$avoidResync: true, replace: options.location === 'replace'

test/stateSpec.js

@@ -246,6 +246,28 @@ describe('state', function () {
       expect(called).toBeFalsy();
     }));
 
+    // Test for issue #2356
+    it('retains reloadOnSearch (dynamic) parameters after going to child, then back to reloadOnSearch state', inject(function ($state, $q, $stateParams, $location, $rootScope){
+      stateProvider.state('RS.child', { url: "/child", template: 'woo' });
+      initStateTo(RS);
+
+      var called;
+      $rootScope.$on('$stateChangeStart', function () { called = true });
+      $state.go(".", { term: 'goodbye' }); $q.flush();
+      expect($stateParams).toEqual({term: 'goodbye'});
+      expect($location.url()).toEqual("/search?term=goodbye");
+      expect(called).toBeFalsy();
+
+      $state.go("RS.child"); $q.flush();
+      expect($stateParams).toEqual({term: 'goodbye'});
+      expect($location.url()).toEqual("/search/child?term=goodbye");
+      expect(called).toBeTruthy();
+
+      $state.go("RS"); $q.flush();
+      expect($stateParams).toEqual({term: 'goodbye'});
+      expect($location.url()).toEqual("/search?term=goodbye");
+    }));
+
     it('does trigger state change for path params even if reloadOnSearch is false', inject(function ($state, $q, $location, $rootScope){
       initStateTo(RSP, { doReload: 'foo' });
       expect($state.params.doReload).toEqual('foo');