From 369512c6c13ed92a7e4afadefc9a1e1e87910a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20M=C3=A9tais?= Date: Tue, 16 Jan 2018 21:06:18 -0600 Subject: [PATCH] Remove Blanket coverage testing --- Gruntfile.js | 88 ++----------------------------------------------- package.json | 2 -- test/blanket.js | 7 ---- 3 files changed, 2 insertions(+), 95 deletions(-) delete mode 100644 test/blanket.js diff --git a/Gruntfile.js b/Gruntfile.js index 313447f..c72f0f0 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -80,27 +80,11 @@ module.exports = function(grunt) { dev: { src: ['front/src/css'] }, - coverage: { - src: ['.tmp', 'coverage/'] - }, build: { src: ['front/build'] } }, copy: { - beforeCoverage: { - files: [ - {src: ['bin/server.js'], dest: '.tmp/'} - ] - }, - coverage: { - files: [ - {cwd: 'test', src: '**/*', dest: 'coverage/test', expand: true}, - {cwd: 'lib/metadata', src: '**/*', dest: 'coverage/lib/metadata', expand: true}, - {cwd: 'node_modules/phantomas', src: '**/*', dest: 'coverage/node_modules/phantomas', expand: true}, - {cwd: 'lib/tools/phantomas/custom_modules', src: '**/*', dest: 'coverage/lib/tools/phantomas/custom_modules', expand: true} - ] - }, build: { files: [ {src: ['./front/src/img/favicon.png'], dest: './front/build/img/favicon.png'}, @@ -108,50 +92,18 @@ module.exports = function(grunt) { ] } }, - lineremover: { - beforeCoverage: { - files: { - '.tmp/bin/cli.js': 'bin/cli.js' - }, - options: { - exclusionPattern: /#!\/usr\/bin\/env node/ - } - } - }, - blanket: { - coverageApp: { - src: ['app/'], - dest: 'coverage/app/' - }, - coverageLib: { - src: ['lib/'], - dest: 'coverage/lib/' - }, - coverageBin: { - src: ['.tmp/bin/'], - dest: 'coverage/bin/' - } - }, mochaTest: { test: { options: { reporter: 'spec', }, - src: ['coverage/test/core/*.js', 'coverage/test/api/*.js'] + src: ['test/core/*.js', 'test/api/*.js'] }, 'test-current-work': { options: { reporter: 'spec', }, src: ['test/core/contentTypeCheckerTest.js'] - }, - coverage: { - options: { - reporter: 'html-cov', - quiet: true, - captureFile: 'coverage/coverage.html' - }, - src: ['coverage/test/core/*.js', 'coverage/test/api/*.js'] } }, env: { @@ -182,7 +134,7 @@ module.exports = function(grunt) { test: { options: { port: 8387, - server: './coverage/bin/server.js', + server: './bin/server.js', showStack: true } }, @@ -266,34 +218,6 @@ module.exports = function(grunt) { }); - // Custom task: copies the test settings.json file to the coverage folder, and checks if there's no missing fields - grunt.registerTask('copy-test-server-settings', function() { - var mainSettingsFile = './server_config/settings.json'; - var testSettingsFile = './test/fixtures/settings.json'; - - var mainSettings = grunt.file.readJSON(mainSettingsFile); - var testSettings = grunt.file.readJSON(testSettingsFile); - - // Recursively compare keys of two objects (not the values) - function compareKeys(original, copy, context) { - for (var key in original) { - if (!copy[key] && copy[key] !== '' && copy[key] !== 0) { - grunt.fail.warn('Settings file ' + testSettingsFile + ' doesn\'t contain key ' + context + '.' + key); - } - if (original[key] !== null && typeof original[key] === 'object') { - compareKeys(original[key], copy[key], context + '.' + key); - } - } - } - - compareKeys(mainSettings, testSettings, 'settings'); - - var outputFile = './coverage/server_config/settings.json'; - grunt.file.write(outputFile, JSON.stringify(testSettings, null, 4)); - grunt.log.ok('File ' + outputFile + ' created'); - }); - - grunt.registerTask('icons', [ 'webfont:icons', 'less', @@ -335,12 +259,6 @@ module.exports = function(grunt) { grunt.registerTask('test', [ 'build', 'express:testSuite', - 'clean:coverage', - 'copy-test-server-settings', - 'lineremover:beforeCoverage', - 'copy:beforeCoverage', - 'blanket', - 'copy:coverage', 'express:test', 'mochaTest:test', 'clean:tmp' @@ -349,8 +267,6 @@ module.exports = function(grunt) { grunt.registerTask('test-current-work', [ 'jshint', 'express:testSuite', - 'clean:coverage', - 'copy-test-server-settings', 'express:test-current-work', 'mochaTest:test-current-work', 'clean:tmp' diff --git a/package.json b/package.json index 6516b6c..1091cc3 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,6 @@ "devDependencies": { "chai": "~4.1.2", "grunt": "~1.0.1", - "grunt-blanket": "~0.0.10", "grunt-contrib-clean": "~1.1.0", "grunt-contrib-concat": "~1.0.1", "grunt-contrib-copy": "~1.0.0", @@ -86,7 +85,6 @@ "grunt-express": "~1.4.1", "grunt-filerev": "~2.3.1", "grunt-inline-angular-templates": "~0.1.5", - "grunt-line-remover": "~0.0.2", "grunt-mocha-test": "~0.13.3", "grunt-parallel": "~0.5.1", "grunt-replace": "~1.0.1", diff --git a/test/blanket.js b/test/blanket.js deleted file mode 100644 index d8260ab..0000000 --- a/test/blanket.js +++ /dev/null @@ -1,7 +0,0 @@ -var path = require('path'); -var srcDir = path.join(__dirname, '..', 'server'); - -require('blanket')({ - // Only files that match the pattern will be instrumented - pattern: srcDir -}); \ No newline at end of file