fix the fix for #2574

angular-ui · May 14, 2016 · 8b3bb6d · 8b3bb6d
1 parent b00801c
commit 8b3bb6d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/state.js b/src/state.js
@@ -1469,11 +1469,12 @@ function $StateProvider( $urlRouterProvider, $urlMatcherFactory) {
 
 angular.module('ui.router.state')
  .factory('$stateParams', function () { return {}; })
+ .constant("$state.runtime", { autoinject: true })
  .provider('$state', $StateProvider)
  // Inject $state to initialize when entering runtime. #2574
  .run(['$injector', function ($injector) {
  // Allow tests (stateSpec.js) to turn this off by defining this constant
- if (!$injector.get("$noAutoInjectStateService")) {
+ if ($injector.get("$state.runtime").autoinject) {
  $injector.get('$state');
  }
  }]);
diff --git a/test/stateSpec.js b/test/stateSpec.js
@@ -2,11 +2,11 @@ describe('state', function () {
 
  var stateProvider, locationProvider, templateParams, ctrlName, template;
 
- angular.module('ui.router').constant("$noAutoInjectStateService", true);
- beforeEach(module('ui.router', function($locationProvider) {
+ beforeEach(module('ui.router', ['$locationProvider', '$state.runtime', function($locationProvider, runtime) {
  locationProvider = $locationProvider;
  $locationProvider.html5Mode(false);
- }));
+ runtime.autoinject = false;
+ }]));
 
  var log, logEvents, logEnterExit;
  function eventLogger(event, to, toParams, from, fromParams) {