From c264e37182cdc9d43abad964f89952b54b4850bd Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Fri, 21 Oct 2016 23:54:50 -0500 Subject: [PATCH] chore(travis): pend grunt build task chore(travis): Move test prep to gulpfile --- .travis.yml | 1 - Gruntfile.js | 10 +--------- gulp/gulp-tests.js | 14 ++++++++++++-- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index b3415fa8a3..cd874ce06a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ node_js: - '4.3.1' before_install: - npm install -g npm@3 - - npm install -g grunt-cli - if [ $REQUIRES_SERVER ]; then sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10; echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list; sudo apt-get update; sudo apt-get install mongodb-org-server; fi before_script: - npm run test:build diff --git a/Gruntfile.js b/Gruntfile.js index 218d109745..e20ff4cce2 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -126,15 +126,7 @@ module.exports = function(grunt) { // Register tasks. grunt.registerTask('build:prod', ['loadManifestFiles', 'clean:build', 'uglify', 'stylus', 'cssmin', 'copy:build', 'hashres']); grunt.registerTask('build:dev', ['cssmin', 'stylus']); - grunt.registerTask('build:test', ['test:prepare:translations', 'build:dev']); - - grunt.registerTask('test:prepare:translations', function() { - var i18n = require('./website/server/libs/i18n'), - fs = require('fs'); - fs.writeFileSync('test/client-old/spec/mocks/translations.js', - "if(!window.env) window.env = {};\n" + - "window.env.translations = " + JSON.stringify(i18n.translations['en']) + ';'); - }); + grunt.registerTask('build:test', ['build:dev']); // Load tasks grunt.loadNpmTasks('grunt-contrib-uglify'); diff --git a/gulp/gulp-tests.js b/gulp/gulp-tests.js index 10169c9cd3..6930ed8833 100644 --- a/gulp/gulp-tests.js +++ b/gulp/gulp-tests.js @@ -13,6 +13,9 @@ import Bluebird from 'bluebird'; import runSequence from 'run-sequence'; import os from 'os'; import nconf from 'nconf'; +import fs from 'fs'; + +const i18n = require('../website/server/libs/i18n'); // TODO rewrite @@ -72,10 +75,17 @@ gulp.task('test:prepare:server', ['test:prepare:mongo'], () => { } }); -gulp.task('test:prepare:build', ['build'], (cb) => { - exec(testBin('grunt build:test'), cb); +gulp.task('test:prepare:translations', (cb) => { + fs.writeFile( + 'test/client-old/spec/mocks/translations.js', + `if(!window.env) window.env = {}; +window.env.translations = ${JSON.stringify(i18n.translations['en'])};`, cb); + }); +gulp.task('test:prepare:build', ['build', 'test:prepare:translations']); +// exec(testBin('grunt build:test'), cb); + gulp.task('test:prepare:webdriver', (cb) => { exec('npm run test:prepare:webdriver', cb); });