Skip to content

Commit 88a2c2b

Browse files
committed
Wrote tests for DS.filter.
Data store no longer maintains state between instantiations.
1 parent a4bcfd8 commit 88a2c2b

File tree

30 files changed

+870
-498
lines changed

30 files changed

+870
-498
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ node_modules
1616

1717
coverage/
1818
doc/
19+
bower_components/
1920

2021
*.iml
2122
.idea/

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ before_script:
1010
- export DISPLAY=:99.0
1111
- sh -e /etc/init.d/xvfb start
1212
script:
13-
- grunt cli
13+
- grunt ci

Gruntfile.js

+25-18
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ module.exports = function (grunt) {
3838
all: ['Gruntfile.js', 'src/**/*.js', 'test/*.js'],
3939
jshintrc: '.jshintrc'
4040
},
41+
watch: {
42+
files: ['src/**/*.js'],
43+
tasks: ['build']
44+
},
4145
uglify: {
4246
main: {
4347
options: {
@@ -84,21 +88,24 @@ module.exports = function (grunt) {
8488
}
8589
}
8690
}
87-
// },
88-
// karma: {
89-
// options: {
90-
// configFile: './karma.conf.js'
91-
// },
92-
// dev: {
93-
// browsers: ['Chrome'],
94-
// autoWatch: true,
95-
// singleRun: false
96-
// },
97-
// },
98-
// coveralls: {
99-
// options: {
100-
// coverage_dir: 'coverage'
101-
// }
91+
},
92+
karma: {
93+
options: {
94+
configFile: './karma.conf.js'
95+
},
96+
dev: {
97+
browsers: ['Chrome'],
98+
autoWatch: true,
99+
singleRun: false
100+
},
101+
ci: {
102+
browsers: ['Firefox', 'PhantomJS']
103+
}
104+
},
105+
coveralls: {
106+
options: {
107+
coverage_dir: 'coverage'
108+
}
102109
},
103110

104111
concat: {
@@ -231,11 +238,11 @@ module.exports = function (grunt) {
231238
}
232239
});
233240

241+
grunt.registerTask('test', ['clean:coverage', 'karma:dev']);
234242
grunt.registerTask('doc', ['clean:doc', 'docular', 'concat', 'copy', 'clean:afterDoc', 'uglify:scripts']);
235243
grunt.registerTask('build', ['clean:dist', 'jshint', 'browserify', 'uglify:main']);
236244
grunt.registerTask('default', ['build']);
237245

238-
// Used by the CLI build servers
239-
grunt.registerTask('test-cli', ['karma:1.0.4', 'karma:1.0.5', 'karma:1.0.6', 'karma:1.0.7', 'karma:1.0.8', 'karma:1.1.4', 'karma:1.1.5']);
240-
grunt.registerTask('cli', ['clean', 'jshint', 'copy', 'uglify', 'test-cli', 'coveralls']);
246+
// Used by TravisCI
247+
grunt.registerTask('ci', ['build', 'karma:ci', 'coveralls', 'doc']);
241248
};

bower.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,9 @@
2424
"karma.conf.js",
2525
".gitignore",
2626
".travis.yml"
27-
]
27+
],
28+
"devDependencies": {
29+
"angular": "~1.2.8",
30+
"angular-mocks": "~1.2.8"
31+
}
2832
}

0 commit comments

Comments
 (0)