Skip to content

Commit 7ad8139

Browse files
author
Spencer Alger
committed
updated dep list, added versions, and checked that the tests run well against the latest 1.0 beta and 0.90
1 parent 7912ae6 commit 7ad8139

File tree

9 files changed

+2625
-2166
lines changed

9 files changed

+2625
-2166
lines changed

Gruntfile.js

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -158,24 +158,12 @@ module.exports = function (grunt) {
158158
}
159159
}
160160
}
161-
},
162-
mocha: {
163-
yaml_suite: {
164-
options: {
165-
// log: true,
166-
run: true,
167-
urls: [ 'http://localhost:8888' ],
168-
timeout: 10e3,
169-
'--web-security': false
170-
}
171-
}
172161
}
173162
});
174163

175164
// load plugins
176165
grunt.loadNpmTasks('grunt-run');
177166
grunt.loadNpmTasks('grunt-open');
178-
grunt.loadNpmTasks('grunt-mocha');
179167
grunt.loadNpmTasks('grunt-browserify');
180168
grunt.loadNpmTasks('grunt-mocha-test');
181169
grunt.loadNpmTasks('grunt-contrib-clean');
@@ -190,9 +178,7 @@ module.exports = function (grunt) {
190178
'jshint',
191179
'mochaTest:unit',
192180
'build',
193-
'mochaTest:yaml_suite',
194-
// 'start:integration_server',
195-
// 'mocha:yaml_suite' -- this will fail because of the way that PhantomJS handle's DELETE requests with body's
181+
'mochaTest:yaml_suite'
196182
]);
197183

198184
grunt.registerTask('build', [
@@ -227,6 +213,11 @@ module.exports = function (grunt) {
227213

228214
var taskData = this.data;
229215

216+
/**
217+
* You must always run the build task first, to ensure that the lastest API and yaml tests are available.
218+
* This is run in the default and browser_tests:{{browser}} tests.
219+
*/
220+
grunt.task.requires('build');
230221
grunt.task.requires('run:integration_server');
231222

232223
grunt.config.set('open.yaml_suite_' + this.target, {

0 commit comments

Comments
 (0)