Skip to content

Commit 05d4e51

Browse files
committed
Fixed when() API. Reorganized.
Stable Version 0.5.1.
1 parent 4a642ec commit 05d4e51

15 files changed

Lines changed: 2718 additions & 2580 deletions

Gruntfile.js

Lines changed: 100 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -6,102 +6,110 @@
66
* Licensed under the MIT license. <https://github.com/jmdobry/angular-data-mocks/blob/master/LICENSE>
77
*/
88
module.exports = function (grunt) {
9-
'use strict';
9+
'use strict';
1010

11-
require('load-grunt-tasks')(grunt);
12-
require('time-grunt')(grunt);
11+
require('load-grunt-tasks')(grunt);
12+
require('time-grunt')(grunt);
1313

14-
var pkg = grunt.file.readJSON('package.json');
14+
var pkg = grunt.file.readJSON('package.json');
1515

16-
// Project configuration.
17-
grunt.initConfig({
18-
pkg: pkg,
19-
clean: {
20-
coverage: ['coverage/'],
21-
dist: ['dist/']
22-
},
23-
jshint: {
24-
all: ['Gruntfile.js', 'src/**/*.js', 'test/*.js'],
25-
jshintrc: '.jshintrc'
26-
},
27-
watch: {
28-
files: ['src/**/*.js'],
29-
tasks: ['build']
30-
},
31-
uglify: {
32-
dist: {
33-
options: {
34-
banner: '/**\n' +
35-
'* @author Jason Dobry <jason.dobry@gmail.com>\n' +
36-
'* @file angular-data-mocks.min.js\n' +
37-
'* @version <%= pkg.version %> - Homepage <https://github.com/jmdobry/angular-data-mocks>\n' +
38-
'* @copyright (c) 2014 Jason Dobry <https://github.com/jmdobry/>\n' +
39-
'* @license MIT <https://github.com/jmdobry/angular-data-mocks/blob/master/LICENSE>\n' +
40-
'*\n' +
41-
'* @overview A mock of angular-data for testing purposes.\n' +
42-
'*/\n'
43-
},
44-
files: {
45-
'dist/angular-data-mocks.min.js': ['dist/angular-data-mocks.js']
46-
}
47-
}
48-
},
49-
karma: {
50-
options: {
51-
configFile: './karma.conf.js'
52-
},
53-
dev: {
54-
browsers: ['Chrome'],
55-
autoWatch: true,
56-
singleRun: false
57-
},
58-
min: {
59-
browsers: ['Chrome'],
60-
autoWatch: false,
61-
singleRun: true,
62-
options: {
63-
files: [
64-
'bower_components/angular/angular.js',
65-
'bower_components/angular-mocks/angular-mocks.js',
66-
'dist/angular-data.min.js',
67-
'test/integration/**/*.js',
68-
'karma.start.js'
69-
]
70-
}
71-
},
72-
ci: {
73-
browsers: ['Firefox', 'PhantomJS']
74-
}
75-
},
76-
coveralls: {
77-
options: {
78-
coverage_dir: 'coverage'
79-
}
80-
},
16+
// Project configuration.
17+
grunt.initConfig({
18+
pkg: pkg,
19+
clean: {
20+
coverage: ['coverage/'],
21+
dist: ['dist/']
22+
},
23+
jshint: {
24+
all: ['Gruntfile.js', 'src/**/*.js', 'test/*.js'],
25+
jshintrc: '.jshintrc'
26+
},
27+
watch: {
28+
files: ['src/**/*.js'],
29+
tasks: ['build']
30+
},
31+
uglify: {
32+
dist: {
33+
options: {
34+
banner: '/**\n' +
35+
'* @author Jason Dobry <jason.dobry@gmail.com>\n' +
36+
'* @file angular-data-mocks.min.js\n' +
37+
'* @version <%= pkg.version %> - Homepage <https://github.com/jmdobry/angular-data-mocks>\n' +
38+
'* @copyright (c) 2014 Jason Dobry <https://github.com/jmdobry/>\n' +
39+
'* @license MIT <https://github.com/jmdobry/angular-data-mocks/blob/master/LICENSE>\n' +
40+
'*\n' +
41+
'* @overview A mock of angular-data for testing purposes.\n' +
42+
'*/\n'
43+
},
44+
files: {
45+
'dist/angular-data-mocks.min.js': ['dist/angular-data-mocks.js']
46+
}
47+
}
48+
},
49+
karma: {
50+
options: {
51+
configFile: './karma.conf.js'
52+
},
53+
dev: {
54+
browsers: ['Chrome'],
55+
autoWatch: true,
56+
singleRun: false
57+
},
58+
min: {
59+
browsers: ['Chrome'],
60+
autoWatch: false,
61+
singleRun: true,
62+
options: {
63+
files: [
64+
'bower_components/angular/angular.js',
65+
'bower_components/angular-mocks/angular-mocks.js',
66+
'dist/angular-data.min.js',
67+
'test/integration/**/*.js',
68+
'karma.start.js'
69+
]
70+
}
71+
},
72+
ci: {
73+
browsers: ['Firefox', 'PhantomJS']
74+
}
75+
},
76+
coveralls: {
77+
options: {
78+
coverage_dir: 'coverage'
79+
}
80+
},
8181

82-
copy: {
83-
dist: {
84-
src: 'src/angular-data-mocks.js',
85-
dest: 'dist/angular-data-mocks.js',
86-
options: {
87-
process: function (content) {
88-
return content.replace(/<%= pkg\.version %>/gi, pkg.version);
89-
}
90-
}
91-
}
92-
}
93-
});
82+
copy: {
83+
dist: {
84+
src: 'dist/angular-data-mocks.js',
85+
dest: 'dist/angular-data-mocks.js',
86+
options: {
87+
process: function (content) {
88+
return content.replace(/<%= pkg\.version %>/gi, pkg.version);
89+
}
90+
}
91+
}
92+
},
93+
browserify: {
94+
dist: {
95+
files: {
96+
'dist/angular-data-mocks.js': ['src/index.js']
97+
}
98+
}
99+
}
100+
});
94101

95-
grunt.registerTask('test', ['clean:coverage', 'karma:dev']);
96-
grunt.registerTask('build', [
97-
'clean',
98-
'jshint',
99-
'copy',
100-
'uglify:dist'
101-
]);
102-
grunt.registerTask('default', ['build']);
103-
grunt.registerTask('go', ['build', 'watch']);
102+
grunt.registerTask('test', ['clean:coverage', 'karma:dev']);
103+
grunt.registerTask('build', [
104+
'clean',
105+
'jshint',
106+
'browserify',
107+
'copy',
108+
'uglify:dist'
109+
]);
110+
grunt.registerTask('default', ['build']);
111+
grunt.registerTask('go', ['build', 'watch']);
104112

105-
// Used by TravisCI
106-
grunt.registerTask('ci', ['build', 'karma:ci']);
113+
// Used by TravisCI
114+
grunt.registerTask('ci', ['build', 'karma:ci']);
107115
};

README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
angular-data-mocks
22
==================
33

4+
[![Bower version](https://badge.fury.io/bo/angular-data-mocks.svg)](http://badge.fury.io/bo/angular-data-mocks)
5+
6+
[![NPM version](https://badge.fury.io/js/angular-data-mocks.svg)](http://badge.fury.io/js/angular-data-mocks)
7+
8+
[![Build Status](https://travis-ci.org/jmdobry/angular-data-mocks.svg?branch=master)](https://travis-ci.org/jmdobry/angular-data-mocks)
9+
10+
[![Coverage Status](https://coveralls.io/repos/jmdobry/angular-data-mocks/badge.png)](https://coveralls.io/r/jmdobry/angular-data-mocks)
11+
12+
[![Dependency Status](https://gemnasium.com/jmdobry/angular-data-mocks.svg)](https://gemnasium.com/jmdobry/angular-data-mocks)
13+
414
A mock of angular-data for testing purposes.
15+
16+
[Documentation](http://angular-data.pseudobry.com/documentation/guide/angular-data-mocks/overview)

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"author": "Jason Dobry",
33
"name": "angular-data-mocks",
44
"description": "A mock of angular-data for testing purposes.",
5-
"version": "0.5.0",
5+
"version": "0.5.1",
66
"homepage": "https://github.com/jmdobry/angular-data-mocks/",
77
"repository": {
88
"type": "git",

0 commit comments

Comments
 (0)