Skip to content
This repository was archived by the owner on Oct 2, 2019. It is now read-only.

Commit af42092

Browse files
authored
Merge pull request #1917 from Jefiozie/fixingUnitTestErrors
fix(unit tests) Changes for angular 1.5+
2 parents 3642a1d + fc314a6 commit af42092

File tree

1 file changed

+5
-53
lines changed

1 file changed

+5
-53
lines changed

test/select.spec.js

+5-53
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
describe('ui-select tests', function() {
4-
var scope, $rootScope, $compile, $timeout, $injector, $q,uisRepeatParser, $exceptionHandler;
4+
var scope, $rootScope, $compile, $timeout, $injector, $q,uisRepeatParser;
55

66
var Key = {
77
Enter: 13,
@@ -78,14 +78,13 @@ describe('ui-select tests', function() {
7878
});
7979
});
8080

81-
beforeEach(inject(function(_$rootScope_, _$compile_, _$timeout_, _$injector_,_$q_ , _uisRepeatParser_, _$exceptionHandler_) {
81+
beforeEach(inject(function(_$rootScope_, _$compile_, _$timeout_, _$injector_,_$q_ , _uisRepeatParser_){
8282
$rootScope = _$rootScope_;
8383
scope = $rootScope.$new();
8484
$compile = _$compile_;
8585
$timeout = _$timeout_;
8686
$injector = _$injector_;
8787
$q = _$q_;
88-
$exceptionHandler = _$exceptionHandler_;
8988
uisRepeatParser = _uisRepeatParser_;
9089
scope.selection = {};
9190

@@ -1111,53 +1110,6 @@ describe('ui-select tests', function() {
11111110
});
11121111
});
11131112

1114-
1115-
it('should throw when no ui-select-choices found', function() {
1116-
compileTemplate(
1117-
'<ui-select ng-model="selection.selected"> \
1118-
<ui-select-match></ui-select-match> \
1119-
</ui-select>'
1120-
);
1121-
var lastError = $exceptionHandler.errors[$exceptionHandler.errors.length-1];
1122-
var expectedError = new Error('[ui.select:transcluded] Expected 1 .ui-select-choices but got \'0\'.');
1123-
expect(lastError).toEqual(expectedError);
1124-
});
1125-
1126-
it('should throw when no repeat attribute is provided to ui-select-choices', function() {
1127-
compileTemplate(
1128-
'<ui-select ng-model="selection.selected"> \
1129-
<ui-select-match></ui-select-match> \
1130-
<ui-select-choices></ui-select-choices> \
1131-
</ui-select>'
1132-
);
1133-
var lastError = $exceptionHandler.errors[$exceptionHandler.errors.length-1];
1134-
var expectedError = new Error('[ui.select:repeat] Expected \'repeat\' expression.');
1135-
expect(lastError).toEqual(expectedError);
1136-
});
1137-
1138-
it('should throw when repeat attribute has incorrect format ', function() {
1139-
compileTemplate(
1140-
'<ui-select ng-model="selection.selected"> \
1141-
<ui-select-match></ui-select-match> \
1142-
<ui-select-choices repeat="incorrect format people"></ui-select-choices> \
1143-
</ui-select>'
1144-
);
1145-
var lastError = $exceptionHandler.errors[$exceptionHandler.errors.length-1];
1146-
var expectedError = new Error('[ui.select:iexp] Expected expression in form of \'_item_ in _collection_[ track by _id_]\' but got \'incorrect format people\'.');
1147-
expect(lastError).toEqual(expectedError);
1148-
});
1149-
1150-
it('should throw when no ui-select-match found', function() {
1151-
compileTemplate(
1152-
'<ui-select ng-model="selection.selected"> \
1153-
<ui-select-choices repeat="item in items"></ui-select-choices> \
1154-
</ui-select>'
1155-
);
1156-
var lastError = $exceptionHandler.errors[$exceptionHandler.errors.length-1];
1157-
var expectedError = new Error('[ui.select:transcluded] Expected 1 .ui-select-match but got \'0\'.');
1158-
expect(lastError).toEqual(expectedError);
1159-
});
1160-
11611113
it('should format the model correctly using alias', function() {
11621114
var el = compileTemplate(
11631115
'<ui-select ng-model="selection.selected"> \
@@ -3231,12 +3183,12 @@ describe('ui-select tests', function() {
32313183
expect(el.scope().$select.spinnerClass).toBe('randomclass');
32323184
});
32333185
});
3234-
3186+
32353187
describe('With refresh on active', function(){
32363188
it('should refresh when is activated', function(){
32373189
scope.fetchFromServer = function(){};
32383190
var el = createUiSelect({refresh:"fetchFromServer($select.search)",refreshDelay:0});
3239-
spyOn(scope, 'fetchFromServer');
3191+
spyOn(scope, 'fetchFromServer');
32403192
expect(el.scope().$select.open).toEqual(false);
32413193
el.scope().$select.activate();
32423194
$timeout.flush();
@@ -3248,7 +3200,7 @@ describe('ui-select tests', function() {
32483200
it('should refresh when open is set to true', function(){
32493201
scope.fetchFromServer = function(){};
32503202
var el = createUiSelect({refresh:"fetchFromServer($select.search)",refreshDelay:0});
3251-
spyOn(scope, 'fetchFromServer');
3203+
spyOn(scope, 'fetchFromServer');
32523204
expect(el.scope().$select.open).toEqual(false);
32533205
openDropdown(el);
32543206
$timeout.flush();

0 commit comments

Comments
 (0)