@@ -165,48 +165,6 @@ module.exports = function(grunt) {
165165 }
166166 }
167167 } ,
168- 'saucelabs-mocha' : {
169- all : {
170- options : {
171- build : process . env . TRAVIS_JOB_ID ,
172- urls : [
173- 'http://localhost:9999/spec/?headless=true' ,
174- 'http://localhost:9999/spec/amd.html?headless=true'
175- ] ,
176- detailedError : true ,
177- concurrency : 4 ,
178- browsers : [
179- { browserName : 'chrome' } ,
180- { browserName : 'firefox' , platform : 'Linux' }
181- // {browserName: 'safari', version: 9, platform: 'OS X 10.11'},
182- // {browserName: 'safari', version: 8, platform: 'OS X 10.10'},
183- // {
184- // browserName: 'internet explorer',
185- // version: 11,
186- // platform: 'Windows 8.1'
187- // },
188- // {
189- // browserName: 'internet explorer',
190- // version: 10,
191- // platform: 'Windows 8'
192- // }
193- ]
194- }
195- } ,
196- sanity : {
197- options : {
198- build : process . env . TRAVIS_JOB_ID ,
199- urls : [
200- 'http://localhost:9999/spec/umd.html?headless=true' ,
201- 'http://localhost:9999/spec/amd-runtime.html?headless=true' ,
202- 'http://localhost:9999/spec/umd-runtime.html?headless=true'
203- ] ,
204- detailedError : true ,
205- concurrency : 2 ,
206- browsers : [ { browserName : 'chrome' } ]
207- }
208- }
209- } ,
210168
211169 bgShell : {
212170 integrationTests : {
@@ -238,59 +196,42 @@ module.exports = function(grunt) {
238196 grunt . loadNpmTasks ( 'grunt-contrib-watch' ) ;
239197 grunt . loadNpmTasks ( 'grunt-babel' ) ;
240198 grunt . loadNpmTasks ( 'grunt-bg-shell' ) ;
241- grunt . loadNpmTasks ( '@knappi/grunt-saucelabs' ) ;
242199 grunt . loadNpmTasks ( 'grunt-webpack' ) ;
243200
244201 grunt . task . loadTasks ( 'tasks' ) ;
245202
246- this . registerTask (
247- 'build' ,
248- 'Builds a distributable version of the current project' ,
249- [ 'parser' , 'node' , 'globals' ]
250- ) ;
251-
252- this . registerTask ( 'node' , [ 'babel:cjs' ] ) ;
253- this . registerTask ( 'globals' , [ 'webpack' ] ) ;
254-
255- this . registerTask ( 'release' , 'Build final packages' , [
256- 'amd' ,
203+ grunt . registerTask ( 'node' , [ 'babel:cjs' ] ) ;
204+ grunt . registerTask ( 'amd' , [ 'babel:amd' , 'requirejs' ] ) ;
205+ grunt . registerTask ( 'globals' , [ 'webpack' ] ) ;
206+ grunt . registerTask ( 'release' , 'Build final packages' , [
257207 'uglify' ,
258208 'test:min' ,
259209 'copy:dist' ,
260210 'copy:components' ,
261211 'copy:cdnjs'
262212 ] ) ;
263213
264- this . registerTask ( 'amd' , [ 'babel:amd' , 'requirejs' ] ) ;
265-
266- this . registerTask ( 'test' , [ 'test:bin' , 'test:cov' ] ) ;
267-
268- grunt . registerTask ( 'bench' , [ 'metrics' ] ) ;
269-
270- if ( process . env . SAUCE_ACCESS_KEY ) {
271- grunt . registerTask ( 'sauce' , [ 'concat:tests' , 'connect' , 'saucelabs-mocha' ] ) ;
272- } else {
273- grunt . registerTask ( 'sauce' , [ ] ) ;
274- }
275-
276- // Requires secret properties (saucelabs-credentials etc.) from .travis.yaml
214+ // Requires secret properties from .travis.yaml
277215 grunt . registerTask ( 'extensive-tests-and-publish-to-aws' , [
278216 'default' ,
279217 'bgShell:integrationTests' ,
280- 'sauce' ,
281218 'metrics' ,
282219 'publish-to-aws'
283220 ] ) ;
284- grunt . registerTask ( 'on-file-change' , [
285- 'build' ,
286- 'amd' ,
287- 'concat:tests' ,
288- 'test'
289- ] ) ;
221+
222+ grunt . registerTask ( 'on-file-change' , [ 'build' , 'concat:tests' , 'test' ] ) ;
290223
291224 // === Primary tasks ===
292225 grunt . registerTask ( 'dev' , [ 'clean' , 'connect' , 'watch' ] ) ;
293226 grunt . registerTask ( 'default' , [ 'clean' , 'build' , 'test' , 'release' ] ) ;
227+ grunt . registerTask ( 'test' , [ 'test:bin' , 'test:cov' ] ) ;
228+ grunt . registerTask ( 'bench' , [ 'metrics' ] ) ;
229+ grunt . registerTask ( 'prepare' , [ 'build' , 'concat:tests' ] ) ;
230+ grunt . registerTask (
231+ 'build' ,
232+ 'Builds a distributable version of the current project' ,
233+ [ 'parser' , 'node' , 'amd' , 'globals' ]
234+ ) ;
294235 grunt . registerTask ( 'integration-tests' , [
295236 'default' ,
296237 'bgShell:integrationTests'
0 commit comments