Skip to content

Commit a71ad3c

Browse files
test(uiView): Moved ui-view test to proper file
1 parent faa341e commit a71ad3c

File tree

2 files changed

+47
-47
lines changed

2 files changed

+47
-47
lines changed

test/stateDirectivesSpec.js

-47
Original file line numberDiff line numberDiff line change
@@ -559,50 +559,3 @@ describe('uiSrefActive', function() {
559559
expect(angular.element(template[0].querySelector('a')).attr('class')).toBe('active');
560560
}));
561561
});
562-
563-
describe('uiView controllers or onEnter handlers', function() {
564-
var el, template, scope, document, count;
565-
566-
beforeEach(module('ui.router'));
567-
568-
beforeEach(module(function($stateProvider) {
569-
count = 0;
570-
$stateProvider
571-
.state('aside', { url: '/aside', template: '<div class="aside"></div>' })
572-
.state('A', { url: '/A', template: '<div class="A" ui-view="fwd"></div>' })
573-
.state('A.fwd', {
574-
url: '/fwd', views: { 'fwd@A': {
575-
template: '<div class="fwd" ui-view>',
576-
controller: function($state) { if (count++ < 20 && $state.current.name == 'A.fwd') $state.go(".nest"); }
577-
}}
578-
})
579-
.state('A.fwd.nest', { url: '/nest', template: '<div class="nest"></div>' });
580-
}));
581-
582-
beforeEach(inject(function($document) {
583-
document = $document[0];
584-
}));
585-
586-
it('should not go into an infinite loop when controller uses $state.go', inject(function($rootScope, $q, $compile, $state) {
587-
el = angular.element('<div><ui-view></ui-view></div>');
588-
template = $compile(el)($rootScope);
589-
$rootScope.$digest();
590-
591-
$state.transitionTo('aside');
592-
$q.flush();
593-
expect(template[0].querySelector('.aside')).toBeDefined();
594-
expect(template[0].querySelector('.fwd')).toBeNull();
595-
596-
$state.transitionTo('A');
597-
$q.flush();
598-
expect(template[0].querySelector('.A')).not.toBeNull();
599-
expect(template[0].querySelector('.fwd')).toBeNull();
600-
601-
$state.transitionTo('A.fwd');
602-
$q.flush();
603-
expect(template[0].querySelector('.A')).not.toBeNull();
604-
expect(template[0].querySelector('.fwd')).not.toBeNull();
605-
expect(template[0].querySelector('.nest')).not.toBeNull();
606-
expect(count).toBe(1);
607-
}));
608-
});

test/viewDirectiveSpec.js

+47
Original file line numberDiff line numberDiff line change
@@ -557,3 +557,50 @@ describe('uiView', function () {
557557
}));
558558
});
559559
});
560+
561+
describe('uiView controllers or onEnter handlers', function() {
562+
var el, template, scope, document, count;
563+
564+
beforeEach(module('ui.router'));
565+
566+
beforeEach(module(function($stateProvider) {
567+
count = 0;
568+
$stateProvider
569+
.state('aside', { url: '/aside', template: '<div class="aside"></div>' })
570+
.state('A', { url: '/A', template: '<div class="A" ui-view="fwd"></div>' })
571+
.state('A.fwd', {
572+
url: '/fwd', views: { 'fwd@A': {
573+
template: '<div class="fwd" ui-view>',
574+
controller: function($state) { if (count++ < 20 && $state.current.name == 'A.fwd') $state.go(".nest"); }
575+
}}
576+
})
577+
.state('A.fwd.nest', { url: '/nest', template: '<div class="nest"></div>' });
578+
}));
579+
580+
beforeEach(inject(function($document) {
581+
document = $document[0];
582+
}));
583+
584+
it('should not go into an infinite loop when controller uses $state.go', inject(function($rootScope, $q, $compile, $state) {
585+
el = angular.element('<div><ui-view></ui-view></div>');
586+
template = $compile(el)($rootScope);
587+
$rootScope.$digest();
588+
589+
$state.transitionTo('aside');
590+
$q.flush();
591+
expect(template[0].querySelector('.aside')).toBeDefined();
592+
expect(template[0].querySelector('.fwd')).toBeNull();
593+
594+
$state.transitionTo('A');
595+
$q.flush();
596+
expect(template[0].querySelector('.A')).not.toBeNull();
597+
expect(template[0].querySelector('.fwd')).toBeNull();
598+
599+
$state.transitionTo('A.fwd');
600+
$q.flush();
601+
expect(template[0].querySelector('.A')).not.toBeNull();
602+
expect(template[0].querySelector('.fwd')).not.toBeNull();
603+
expect(template[0].querySelector('.nest')).not.toBeNull();
604+
expect(count).toBe(1);
605+
}));
606+
});

0 commit comments

Comments
 (0)