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

Commit b91b451

Browse files
rschmuklerrobertmesserle
authored andcommitted
refactor(): use strict, consolidate material.core, interimElement chaining
Closes #643. Closes #650. Closes #597. Closes #596. Closes #525.
1 parent b9b4add commit b91b451

File tree

14 files changed

+221
-551
lines changed

14 files changed

+221
-551
lines changed

config/karma.conf.js

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,24 @@
11

22
module.exports = function(config) {
3-
4-
var UNCOMPILED_SRC = [
5-
'config/test-utils.js',
6-
'src/core/**/*.js',
7-
8-
// Test utilities, source, and specifications.
9-
// We are explicit like this because we don't want to put
10-
// demos in the tests, and Karma doesn't support advanced
11-
// globbing.
12-
'src/components/*/*.js',
13-
'src/components/tabs/js/*.js'
14-
];
15-
16-
var COMPILED_SRC = [
17-
// Minified source
18-
'dist/angular-material.min.js',
19-
20-
// Test utilties and specifications
21-
'config/test-utils.js',
22-
'src/**/*.spec.js'
23-
];
24-
25-
// releaseMode is a custom configuration option.
26-
var testSrc = config.releaseMode ? COMPILED_SRC : UNCOMPILED_SRC;
27-
283
config.set({
294

305
basePath: __dirname + '/..',
316
frameworks: ['jasmine'],
327
files: [
33-
// Dependencies
348
'bower_components/angular/angular.js',
359
'bower_components/angular-animate/angular-animate.js',
3610
'bower_components/angular-aria/angular-aria.js',
3711
'bower_components/angular-mocks/angular-mocks.js',
38-
'bower_components/hammerjs/hammer.js'
39-
].concat(testSrc),
12+
'bower_components/hammerjs/hammer.js',
13+
'config/test-utils.js',
14+
'src/core/**/*.js',
15+
16+
// We are explicit like this because we don't want to put
17+
// demos in the tests, and Karma doesn't support advanced
18+
// globbing.
19+
'src/components/*/*.js',
20+
'src/components/tabs/js/*.js',
21+
],
4022

4123
port: 9876,
4224
reporters: ['progress'],

0 commit comments

Comments
 (0)