Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 0ac2d31

Browse files
committed
wip
1 parent 735c6a3 commit 0ac2d31

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

karma-shared.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module.exports = function(config, specificOptions) {
66
autoWatch: true,
77
logLevel: config.LOG_INFO,
88
logColors: true,
9-
browsers: ['Chrome'],
9+
browsers: ['Firefox'],
1010
browserDisconnectTimeout: 10000,
1111
browserDisconnectTolerance: 2,
1212
browserNoActivityTimeout: 30000,

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"gulp-sourcemaps": "^1.2.2",
5757
"gulp-uglify": "^1.0.1",
5858
"gulp-util": "^3.0.1",
59-
"jasmine-core": "^2.6.1",
59+
"jasmine-core": "2.6.1",
6060
"jasmine-node": "^2.0.0",
6161
"jasmine-reporters": "^2.2.0",
6262
"jquery": "^3.2.1",

test/ng/directive/ngOptionsSpec.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2898,12 +2898,14 @@ describe('ngOptions', function() {
28982898

28992899
// Set up spies
29002900
forEach(options, function(option, i) {
2901-
optionsSetSelected[i] = jasmine.createSpy('optionSetSelected' + i);
2902-
_selected[i] = option.selected;
2903-
Object.defineProperty(option, 'selected', {
2904-
get: function() { return _selected[i]; },
2905-
set: optionsSetSelected[i].and.callFake(function(value) { _selected[i] = value; })
2906-
});
2901+
optionsSetSelected[i] = spyOnProperty(option, 'selected', 'set').and.callThrough();
2902+
2903+
// optionsSetSelected[i] = jasmine.createSpy('optionSetSelected' + i).and.callFake(function(value) { _selected[i] = value; });
2904+
// _selected[i] = option.selected;
2905+
// Object.defineProperty(option, 'selected', {
2906+
// get: function() { return _selected[i]; },
2907+
// set: optionsSetSelected[i].and.callFake(function(value) { _selected[i] = value; })
2908+
// });
29072909
});
29082910

29092911
// Select `optionA`

yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3477,7 +3477,7 @@ jade@0.26.3:
34773477
commander "0.6.1"
34783478
mkdirp "0.3.0"
34793479

3480-
jasmine-core@^2.6.1:
3480+
jasmine-core@2.6.1:
34813481
version "2.6.1"
34823482
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.6.1.tgz#66a61cddb699958e3613edef346c996f6311fc3b"
34833483

0 commit comments

Comments
 (0)