Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 408e936

Browse files
author
Alister Stevens
committed
Merge branch '1.6.12' of github.com:PebblePad/angular.js into 1.6.12
Conflicts: test/jquery_alias.js test/jquery_remove.js
2 parents b4cdbe1 + 6c282be commit 408e936

File tree

3 files changed

+0
-40
lines changed

3 files changed

+0
-40
lines changed

test/helpers/privateMocks.js

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,5 @@
11
'use strict';
22

3-
/* globals xit */
4-
function assertCompareNodes(a,b,not) {
5-
a = a[0] ? a[0] : a;
6-
b = b[0] ? b[0] : b;
7-
expect(a === b).toBe(!not);
8-
}
9-
10-
function baseThey(msg, vals, spec, itFn) {
11-
var valsIsArray = angular.isArray(vals);
12-
13-
angular.forEach(vals, function(val, key) {
14-
var m = msg.split('$prop').join(angular.toJson(valsIsArray ? val : key));
15-
itFn(m, function() {
16-
spec.call(this, val);
17-
});
18-
});
19-
}
20-
21-
function they(msg, vals, spec) {
22-
baseThey(msg, vals, spec, it);
23-
}
24-
25-
function fthey(msg, vals, spec) {
26-
baseThey(msg, vals, spec, fit);
27-
}
28-
29-
function xthey(msg, vals, spec) {
30-
baseThey(msg, vals, spec, xit);
31-
}
32-
333
function createMockStyleSheet(doc) {
344
doc = doc ? doc[0] : window.document;
355

test/jquery_alias.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

test/jquery_remove.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)