Skip to content

Commit d0d855a

Browse files
Narretzpetebacondarwin
authored andcommitted
chore(angularFiles): add missing files
ngMessageFormat test files were missing from angularTest ngMessages and ngAnimate were missing from karmaModules. This change highlighted a number of problems in the tests and code, which are also fixed. Closes angular#14314
1 parent 36b1493 commit d0d855a

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

angularFiles.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ var angularFiles = {
175175
'test/auto/*.js',
176176
'test/ng/**/*.js',
177177
'test/ngAnimate/*.js',
178+
'test/ngMessageFormat/*.js',
178179
'test/ngMessages/*.js',
179180
'test/ngCookies/*.js',
180181
'test/ngResource/*.js',
@@ -212,7 +213,9 @@ var angularFiles = {
212213
'test/modules/no_bootstrap.js',
213214
'src/ngScenario/browserTrigger.js',
214215
'test/helpers/*.js',
216+
'test/ngAnimate/*.js',
215217
'test/ngMessageFormat/*.js',
218+
'test/ngMessages/*.js',
216219
'test/ngMock/*.js',
217220
'test/ngCookies/*.js',
218221
'test/ngRoute/**/*.js',

test/helpers/matchers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ beforeEach(function() {
240240
};
241241
var classes = clazz.trim().split(/\s+/);
242242
for (var i = 0; i < classes.length; ++i) {
243-
if (!jqLiteHasClass(actual[0], classes[i])) {
243+
if (!angular.element(actual[0]).hasClass(classes[i])) {
244244
return { pass: isNot };
245245
}
246246
}

test/ngMessages/messagesSpec.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ describe('ngMessages', function() {
1212
return str.replace(/\s+/g,'');
1313
}
1414

15+
function trim(value) {
16+
return isString(value) ? value.trim() : value;
17+
}
18+
1519
var element;
1620
afterEach(function() {
1721
dealoc(element);

0 commit comments

Comments
 (0)