Skip to content

Commit

Permalink
chore(karma): import immutable.js
Browse files Browse the repository at this point in the history
  • Loading branch information
JonnyBGod committed Mar 15, 2016
1 parent f4c9e97 commit 90e3cf4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
5 changes: 4 additions & 1 deletion karma-test-shim.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ System.config({
map: {
'angular2': 'node_modules/angular2',
'rxjs': 'node_modules/rxjs'
}
},
paths: {
'immutable': '/base/node_modules/immutable/dist/immutable.js'
}
});

System.import('angular2/testing').then(function(testing) {
Expand Down
3 changes: 2 additions & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ module.exports = function(config) {
files: [
// for Travis
'node_modules/es6-shim/es6-shim.js',
'node_modules/immutable/dist/immutable.js',

// zone-microtask must be included first as it contains a Promise monkey patch
'node_modules/zone.js/dist/zone-microtask.js',
Expand All @@ -26,9 +27,9 @@ module.exports = function(config) {
{ pattern: 'node_modules/angular2/**/*.js', included: false, watched: false, served: true },
{ pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false, served: true },
{ pattern: 'node_modules/systemjs/dist/system-polyfills.js', included: false, watched: false, served: true }, // PhantomJS2 (and possibly others) might require it
{ pattern: 'node_modules/immutable/dist/immutable.js', included: true, watched: true },

{ pattern: 'src/**/*.ts', included: false, watched: true }, // source files
{ pattern: 'tests/**/*.ts', included: false, watched: true }, // test files

'karma-test-shim.js'
],
Expand Down
2 changes: 0 additions & 2 deletions src/service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000;
export function main() {
describe('service', () => {

var fixture: ComponentFixture;

it('is defined', () => {
expect(ScrollSpyService).toBeDefined();
});
Expand Down

0 comments on commit 90e3cf4

Please sign in to comment.