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

Commit 7b8afbc

Browse files
committed
v1.7.0-rc.0
1 parent ca366bd commit 7b8afbc

File tree

3 files changed

+12
-47
lines changed

3 files changed

+12
-47
lines changed

angular-mocks.js

Lines changed: 9 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.6.10
2+
* @license AngularJS v1.7.0-rc.0
33
* (c) 2010-2018 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -803,7 +803,7 @@ angular.mock.TzDate.prototype = Date.prototype;
803803
* You need to require the `ngAnimateMock` module in your test suite for instance `beforeEach(module('ngAnimateMock'))`
804804
*/
805805
angular.mock.animate = angular.module('ngAnimateMock', ['ng'])
806-
.info({ angularVersion: '1.6.10' })
806+
.info({ angularVersion: '1.7.0-rc.0' })
807807

808808
.config(['$provide', function($provide) {
809809

@@ -2101,13 +2101,13 @@ function MockXhr() {
21012101
var header = this.$$respHeaders[name];
21022102
if (header) return header;
21032103

2104-
name = angular.lowercase(name);
2104+
name = angular.$$lowercase(name);
21052105
header = this.$$respHeaders[name];
21062106
if (header) return header;
21072107

21082108
header = undefined;
21092109
angular.forEach(this.$$respHeaders, function(headerVal, headerName) {
2110-
if (!header && angular.lowercase(headerName) === name) header = headerVal;
2110+
if (!header && angular.$$lowercase(headerName) === name) header = headerVal;
21112111
});
21122112
return header;
21132113
};
@@ -2239,11 +2239,6 @@ angular.mock.$RootElementProvider = function() {
22392239
* A decorator for {@link ng.$controller} with additional `bindings` parameter, useful when testing
22402240
* controllers of directives that use {@link $compile#-bindtocontroller- `bindToController`}.
22412241
*
2242-
* Depending on the value of
2243-
* {@link ng.$compileProvider#preAssignBindingsEnabled `preAssignBindingsEnabled()`}, the properties
2244-
* will be bound before or after invoking the constructor.
2245-
*
2246-
*
22472242
* ## Example
22482243
*
22492244
* ```js
@@ -2289,8 +2284,6 @@ angular.mock.$RootElementProvider = function() {
22892284
*
22902285
* * check if a controller with given name is registered via `$controllerProvider`
22912286
* * check if evaluating the string on the current scope returns a constructor
2292-
* * if $controllerProvider#allowGlobals, check `window[constructor]` on the global
2293-
* `window` object (deprecated, not recommended)
22942287
*
22952288
* The string can use the `controller as property` syntax, where the controller instance is published
22962289
* as the specified property on the `scope`; the `scope` must be injected into `locals` param for this
@@ -2301,22 +2294,13 @@ angular.mock.$RootElementProvider = function() {
23012294
* the `bindToController` feature and simplify certain kinds of tests.
23022295
* @return {Object} Instance of given controller.
23032296
*/
2304-
function createControllerDecorator(compileProvider) {
2297+
function createControllerDecorator() {
23052298
angular.mock.$ControllerDecorator = ['$delegate', function($delegate) {
23062299
return function(expression, locals, later, ident) {
23072300
if (later && typeof later === 'object') {
2308-
var preAssignBindingsEnabled = compileProvider.preAssignBindingsEnabled();
2309-
23102301
var instantiate = $delegate(expression, locals, true, ident);
2311-
if (preAssignBindingsEnabled) {
2312-
angular.extend(instantiate.instance, later);
2313-
}
2314-
23152302
var instance = instantiate();
2316-
if (!preAssignBindingsEnabled || instance !== instantiate.instance) {
2317-
angular.extend(instance, later);
2318-
}
2319-
2303+
angular.extend(instance, later);
23202304
return instance;
23212305
}
23222306
return $delegate(expression, locals, later, ident);
@@ -2434,7 +2418,7 @@ angular.module('ngMock', ['ng']).provider({
24342418
$provide.decorator('$rootScope', angular.mock.$RootScopeDecorator);
24352419
$provide.decorator('$controller', createControllerDecorator($compileProvider));
24362420
$provide.decorator('$httpBackend', angular.mock.$httpBackendDecorator);
2437-
}]).info({ angularVersion: '1.6.10' });
2421+
}]).info({ angularVersion: '1.7.0-rc.0' });
24382422

24392423
/**
24402424
* @ngdoc module
@@ -2449,7 +2433,7 @@ angular.module('ngMock', ['ng']).provider({
24492433
*/
24502434
angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) {
24512435
$provide.decorator('$httpBackend', angular.mock.e2e.$httpBackendDecorator);
2452-
}]).info({ angularVersion: '1.6.10' });
2436+
}]).info({ angularVersion: '1.7.0-rc.0' });
24532437

24542438
/**
24552439
* @ngdoc service
@@ -3394,30 +3378,11 @@ angular.mock.$RootScopeDecorator = ['$delegate', function($delegate) {
33943378

33953379
if (!evnt) return;
33963380

3397-
var originalPreventDefault = evnt.preventDefault,
3398-
appWindow = element.ownerDocument.defaultView,
3399-
fakeProcessDefault = true,
3400-
finalProcessDefault,
3401-
angular = appWindow.angular || {};
3402-
3403-
// igor: temporary fix for https://bugzilla.mozilla.org/show_bug.cgi?id=684208
3404-
angular['ff-684208-preventDefault'] = false;
3405-
evnt.preventDefault = function() {
3406-
fakeProcessDefault = false;
3407-
return originalPreventDefault.apply(evnt, arguments);
3408-
};
3409-
34103381
if (!eventData.bubbles || supportsEventBubblingInDetachedTree() || isAttachedToDocument(element)) {
3411-
element.dispatchEvent(evnt);
3382+
return element.dispatchEvent(evnt);
34123383
} else {
34133384
triggerForPath(element, evnt);
34143385
}
3415-
3416-
finalProcessDefault = !(angular['ff-684208-preventDefault'] || !fakeProcessDefault);
3417-
3418-
delete angular['ff-684208-preventDefault'];
3419-
3420-
return finalProcessDefault;
34213386
};
34223387

34233388
function supportsTouchEvents() {

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "angular-mocks",
3-
"version": "1.6.10",
3+
"version": "1.7.0-rc.0",
44
"license": "MIT",
55
"main": "./angular-mocks.js",
66
"ignore": [],
77
"dependencies": {
8-
"angular": "1.6.10"
8+
"angular": "1.7.0-rc.0"
99
}
1010
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-mocks",
3-
"version": "1.6.10",
3+
"version": "1.7.0-rc.0",
44
"description": "AngularJS mocks for testing",
55
"main": "angular-mocks.js",
66
"scripts": {

0 commit comments

Comments
 (0)