From d50cc5e8d46fceb7315f59db44c7a4c1201466f4 Mon Sep 17 00:00:00 2001 From: Matteo Figus Date: Fri, 24 Mar 2017 23:15:07 +0000 Subject: [PATCH 1/8] Minification back with uglify option --- src/cli/domain/package-static-files.js | 21 +++++++++----------- test/unit/cli-domain-package-static-files.js | 3 --- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/cli/domain/package-static-files.js b/src/cli/domain/package-static-files.js index af29dbf09..e20ac37eb 100644 --- a/src/cli/domain/package-static-files.js +++ b/src/cli/domain/package-static-files.js @@ -16,23 +16,20 @@ var strings = require('../../resources'); var minifyFile = function(fileType, fileContent, ocOptions){ if(fileType === '.js'){ - /* - 2017-02-24 Reverting #418 var presetOptions = { targets: { - browsers: 'not ie <= 8' - } + browsers: 'ie 8', + uglify: true + }, + useBuiltIns: true, + modules: false }; - var babelOptions = { - presets: [[babelPresetEnv, presetOptions]] - }; - - var es5 = babel.transform(fileContent, babelOptions).code; - - */ - return uglifyJs.minify(fileContent, { fromString: true }).code; + var babelOptions = { presets: [[babelPresetEnv, presetOptions]] }, + es5 = babel.transform(fileContent, babelOptions).code; + + return uglifyJs.minify(es5, { fromString: true }).code; } else if(fileType === '.css'){ return new CleanCss().minify(fileContent).styles; } diff --git a/test/unit/cli-domain-package-static-files.js b/test/unit/cli-domain-package-static-files.js index 73b1906db..99abf6a67 100644 --- a/test/unit/cli-domain-package-static-files.js +++ b/test/unit/cli-domain-package-static-files.js @@ -251,10 +251,7 @@ describe('cli : domain : packageStaticFiles', function(){ it('should first transpile and minify the file', function(){ expect(mocks['fs-extra'].readFileSync.calledOnce).to.be.true; - /* - 2017-02-24 Reverting #418 expect(mocks['babel-core'].transform.calledOnce).to.be.true; - */ expect(mocks['uglify-js'].minify.calledOnce).to.be.true; }); From 7083fda2f599f064ad203dd25c214f215d9fffba Mon Sep 17 00:00:00 2001 From: Matteo Figus Date: Sat, 25 Mar 2017 00:01:28 +0000 Subject: [PATCH 2/8] Minify bugfix --- src/cli/domain/package-components.js | 2 +- test/unit/cli-domain-package-components.js | 192 +++++++++++++-------- 2 files changed, 122 insertions(+), 72 deletions(-) diff --git a/src/cli/domain/package-components.js b/src/cli/domain/package-components.js index 2b18c6d69..e726d3ff2 100644 --- a/src/cli/domain/package-components.js +++ b/src/cli/domain/package-components.js @@ -15,7 +15,7 @@ module.exports = function(){ return function(options, callback){ var componentPath = options.componentPath; - var minify = options.minify || true; + var minify = options.minify === true; var files = fs.readdirSync(componentPath), publishPath = path.join(componentPath, '_package'); diff --git a/test/unit/cli-domain-package-components.js b/test/unit/cli-domain-package-components.js index 7b0f31d4f..6c4994d6b 100644 --- a/test/unit/cli-domain-package-components.js +++ b/test/unit/cli-domain-package-components.js @@ -6,96 +6,146 @@ var path = require('path'); var sinon = require('sinon'); var _ = require('underscore'); -var initialise = function(){ - - var fsMock = { - existsSync: sinon.stub(), - lstatSync: sinon.stub(), - mkdirSync: sinon.spy(), - readdirSync: sinon.stub(), - readFileSync: sinon.stub(), - readJson: sinon.stub(), - readJsonSync: sinon.stub(), - writeFile: sinon.stub().yields(null, 'ok'), - writeJson: sinon.stub().yields(null, 'ok') - }; - - var pathMock = { - extname: path.extname, - join: path.join, - resolve: function(){ - return _.toArray(arguments).join('/'); - } - }; - - var Local = injectr('../../src/cli/domain/package-components.js', { - 'fs-extra': fsMock, - 'uglify-js': { - minify: function(code){ - return { - code: code - }; +describe('cli : domain : package-components', function(){ + + var packageStaticFilesStub; + + var initialise = function(){ + + var fsMock = { + existsSync: sinon.stub(), + lstatSync: sinon.stub(), + mkdirSync: sinon.spy(), + readdirSync: sinon.stub(), + readFileSync: sinon.stub(), + readJson: sinon.stub(), + readJsonSync: sinon.stub(), + writeFile: sinon.stub().yields(null, 'ok'), + writeJson: sinon.stub().yields(null, 'ok') + }; + + var pathMock = { + extname: path.extname, + join: path.join, + resolve: function(){ + return _.toArray(arguments).join('/'); } - }, - path: pathMock, - './package-static-files': sinon.stub().yields(null, 'ok'), - './package-template': sinon.stub().yields(null, { type: 'jade', src: 'template.js', hashKey: '123456'}) - }, { __dirname: '' }); + }; - var local = new Local(); + packageStaticFilesStub = sinon.stub().yields(null, 'ok'); - return { local: local, fs: fsMock }; -}; + var PackageComponents = injectr('../../src/cli/domain/package-components.js', { + 'fs-extra': fsMock, + path: pathMock, + './package-static-files': packageStaticFilesStub, + './package-template': sinon.stub().yields(null, { type: 'jade', src: 'template.js', hashKey: '123456'}) + }, { __dirname: ''}); -var executePackaging = function(local, callback){ - return local({ - componentPath: '.', - minify: false, - verbose: false - }, callback); -}; + var packageComponents = new PackageComponents(); -describe('cli : domain : local', function(){ + return { packageComponents: packageComponents, fs: fsMock }; + }; + + var executePackaging = function(packageComponents, minify, callback){ + return packageComponents({ + componentPath: '.', + minify: minify, + verbose: false + }, callback); + }; describe('when packaging', function(){ describe('when component is valid', function(){ - var component; - beforeEach(function(done){ + describe('when minify=true', function(){ + + var component; + beforeEach(function(done){ - var data = initialise(); + var data = initialise(); - component = { - name: 'helloworld', - oc: { - files: { - template: { - type: 'jade', - src: 'template.jade' + component = { + name: 'helloworld', + oc: { + files: { + static: ['css'], + template: { + type: 'jade', + src: 'template.jade' + } } - } - }, - dependencies: {} - }; + }, + dependencies: {} + }; - data.fs.existsSync.returns(true); - data.fs.readJsonSync.onCall(0).returns(component); - data.fs.readJsonSync.onCall(1).returns({ version: '1.2.3' }); + data.fs.existsSync.returns(true); + data.fs.readJsonSync.onCall(0).returns(component); + data.fs.readJsonSync.onCall(1).returns({ version: '1.2.3' }); - executePackaging(data.local, done); - }); + executePackaging(data.packageComponents, true, done); + }); - it('should add version to package.json file', function(){ - expect(component.oc.version).to.eql('1.2.3'); - }); + it('should add version to package.json file', function(){ + expect(component.oc.version).to.eql('1.2.3'); + }); + + it('should mark the package.json as a packaged', function(){ + expect(component.oc.packaged).to.eql(true); + }); - it('should mark the package.json as a packaged', function(){ - expect(component.oc.packaged).to.eql(true); + it('should save hash for template in package.json', function(){ + expect(component.oc.files.template.hashKey).not.be.empty; + }); + + it('should minify static resources', function(){ + expect(packageStaticFilesStub.args[0][0].minify).to.eql(true); + }); }); - it('should save hash for template in package.json', function(){ - expect(component.oc.files.template.hashKey).not.be.empty; + describe('when minify=false', function(){ + + var component; + beforeEach(function(done){ + + var data = initialise(); + + component = { + name: 'helloworld', + oc: { + files: { + static: ['css'], + template: { + type: 'jade', + src: 'template.jade' + } + } + }, + dependencies: {} + }; + + data.fs.existsSync.returns(true); + data.fs.readJsonSync.onCall(0).returns(component); + data.fs.readJsonSync.onCall(1).returns({ version: '1.2.3' }); + + executePackaging(data.packageComponents, false, done); + }); + + it('should add version to package.json file', function(){ + expect(component.oc.version).to.eql('1.2.3'); + }); + + it('should mark the package.json as a packaged', function(){ + expect(component.oc.packaged).to.eql(true); + }); + + it('should save hash for template in package.json', function(){ + expect(component.oc.files.template.hashKey).not.be.empty; + }); + + it('should minify static resources', function(){ + expect(packageStaticFilesStub.args[0][0].minify).to.eql(false); + }); }); }); }); From d021498d51bb615f163f1266c921ed094a5e20ba Mon Sep 17 00:00:00 2001 From: Matteo Figus Date: Sat, 25 Mar 2017 00:15:05 +0000 Subject: [PATCH 3/8] Test babel is called with correct parameters --- test/unit/cli-domain-package-static-files.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/unit/cli-domain-package-static-files.js b/test/unit/cli-domain-package-static-files.js index 99abf6a67..446741bfe 100644 --- a/test/unit/cli-domain-package-static-files.js +++ b/test/unit/cli-domain-package-static-files.js @@ -250,8 +250,13 @@ describe('cli : domain : packageStaticFiles', function(){ }); it('should first transpile and minify the file', function(){ + var transformMock = mocks['babel-core'].transform; expect(mocks['fs-extra'].readFileSync.calledOnce).to.be.true; - expect(mocks['babel-core'].transform.calledOnce).to.be.true; + expect(transformMock.calledOnce).to.be.true; + expect(transformMock.args[0][1].presets[0][1].targets.uglify).to.be.true; + }); + + it('should then minify the file', function(){ expect(mocks['uglify-js'].minify.calledOnce).to.be.true; }); From 0b0e461db427008ab2e77a4545eee3c66face85f Mon Sep 17 00:00:00 2001 From: Matteo Figus Date: Sat, 25 Mar 2017 00:25:22 +0000 Subject: [PATCH 4/8] Moved things around --- .../index.js} | 31 ++---------------- .../package-static-files/minify-file.js | 32 +++++++++++++++++++ test/unit/cli-domain-package-static-files.js | 28 +++++++++------- 3 files changed, 51 insertions(+), 40 deletions(-) rename src/cli/domain/{package-static-files.js => package-static-files/index.js} (71%) create mode 100644 src/cli/domain/package-static-files/minify-file.js diff --git a/src/cli/domain/package-static-files.js b/src/cli/domain/package-static-files/index.js similarity index 71% rename from src/cli/domain/package-static-files.js rename to src/cli/domain/package-static-files/index.js index e20ac37eb..51029bcb0 100644 --- a/src/cli/domain/package-static-files.js +++ b/src/cli/domain/package-static-files/index.js @@ -1,41 +1,14 @@ 'use strict'; var async = require('async'); -var babel = require('babel-core'); -var babelPresetEnv = require('babel-preset-env'); -var CleanCss = require('clean-css'); var format = require('stringformat'); var fs = require('fs-extra'); +var minifyFile = require('./minify-file'); var nodeDir = require('node-dir'); var path = require('path'); -var uglifyJs = require('uglify-js'); var _ = require('underscore'); -var strings = require('../../resources'); - -var minifyFile = function(fileType, fileContent, ocOptions){ - - if(fileType === '.js'){ - - var presetOptions = { - targets: { - browsers: 'ie 8', - uglify: true - }, - useBuiltIns: true, - modules: false - }; - - var babelOptions = { presets: [[babelPresetEnv, presetOptions]] }, - es5 = babel.transform(fileContent, babelOptions).code; - - return uglifyJs.minify(es5, { fromString: true }).code; - } else if(fileType === '.css'){ - return new CleanCss().minify(fileContent).styles; - } - - return fileContent; -}; +var strings = require('../../../resources'); var copyDir = function(params, cb){ var staticPath = path.join(params.componentPath, params.staticDir), diff --git a/src/cli/domain/package-static-files/minify-file.js b/src/cli/domain/package-static-files/minify-file.js new file mode 100644 index 000000000..4e76d980d --- /dev/null +++ b/src/cli/domain/package-static-files/minify-file.js @@ -0,0 +1,32 @@ +'use strict'; + +var babel = require('babel-core'); +var babelPresetEnv = require('babel-preset-env'); +var CleanCss = require('clean-css'); +var uglifyJs = require('uglify-js'); + +module.exports = function(fileType, fileContent, ocOptions){ + + if(fileType === '.js'){ + + var presetOptions = { + targets: { + browsers: 'ie 8', + uglify: true + }, + useBuiltIns: true, + modules: false + }; + + var babelOptions = { presets: [[babelPresetEnv, presetOptions]] }, + es5 = babel.transform(fileContent, babelOptions).code; + + return uglifyJs.minify(es5, { fromString: true }).code; + + } else if(fileType === '.css'){ + + return new CleanCss().minify(fileContent).styles; + } + + return fileContent; +}; diff --git a/test/unit/cli-domain-package-static-files.js b/test/unit/cli-domain-package-static-files.js index 446741bfe..3f84d4a92 100644 --- a/test/unit/cli-domain-package-static-files.js +++ b/test/unit/cli-domain-package-static-files.js @@ -8,10 +8,11 @@ var _ = require('underscore'); var packageStaticFiles, error, - mocks; + mocks, + minifyMocks; var initialise = function(mocks, params, cb){ - packageStaticFiles = injectr('../../src/cli/domain/package-static-files.js', mocks, { console: console }); + packageStaticFiles = injectr('../../src/cli/domain/package-static-files/index.js', mocks, { console: console }); packageStaticFiles(params, function(e, r){ error = e; cb(); @@ -20,7 +21,8 @@ var initialise = function(mocks, params, cb){ var cleanup = function(){ error = null; - mocks = { + + minifyMocks = { 'babel-core': { transform: sinon.stub().returns({ code: 'this-is-transpiled' @@ -31,6 +33,15 @@ var cleanup = function(){ return { styles: 'this-is-minified'}; } }), + 'uglify-js': { + minify: sinon.stub().returns({ + code: 'this-is-minified' + }) + } + }; + + mocks = { + './minify-file': injectr('../../src/cli/domain/package-static-files/minify-file.js', minifyMocks), 'fs-extra': { copySync: sinon.spy(), ensureDirSync: sinon.spy(), @@ -57,11 +68,6 @@ var cleanup = function(){ resolve: function(){ return _.toArray(arguments).join('/'); } - }, - 'uglify-js': { - minify: sinon.stub().returns({ - code: 'this-is-minified' - }) } }; }; @@ -250,14 +256,14 @@ describe('cli : domain : packageStaticFiles', function(){ }); it('should first transpile and minify the file', function(){ - var transformMock = mocks['babel-core'].transform; + var transformMock = minifyMocks['babel-core'].transform; expect(mocks['fs-extra'].readFileSync.calledOnce).to.be.true; expect(transformMock.calledOnce).to.be.true; expect(transformMock.args[0][1].presets[0][1].targets.uglify).to.be.true; }); it('should then minify the file', function(){ - expect(mocks['uglify-js'].minify.calledOnce).to.be.true; + expect(minifyMocks['uglify-js'].minify.calledOnce).to.be.true; }); it('should save the file in the folder', function(){ @@ -325,7 +331,7 @@ describe('cli : domain : packageStaticFiles', function(){ it('should first minify the file', function(){ expect(mocks['fs-extra'].readFileSync.calledOnce).to.be.true; - expect(mocks['clean-css'].calledOnce).to.be.true; + expect(minifyMocks['clean-css'].calledOnce).to.be.true; }); it('should save the file in the folder', function(){ From ca995d7e0aea2a1cae384b3415a9c92d4bad3d4b Mon Sep 17 00:00:00 2001 From: Matteo Figus Date: Sat, 25 Mar 2017 00:34:48 +0000 Subject: [PATCH 5/8] Consistency --- test/unit/cli-domain-package-static-files.js | 124 +++++++++---------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/test/unit/cli-domain-package-static-files.js b/test/unit/cli-domain-package-static-files.js index 3f84d4a92..97c85e695 100644 --- a/test/unit/cli-domain-package-static-files.js +++ b/test/unit/cli-domain-package-static-files.js @@ -6,75 +6,75 @@ var path = require('path'); var sinon = require('sinon'); var _ = require('underscore'); -var packageStaticFiles, - error, - mocks, - minifyMocks; - -var initialise = function(mocks, params, cb){ - packageStaticFiles = injectr('../../src/cli/domain/package-static-files/index.js', mocks, { console: console }); - packageStaticFiles(params, function(e, r){ - error = e; - cb(); - }); -}; - -var cleanup = function(){ - error = null; - - minifyMocks = { - 'babel-core': { - transform: sinon.stub().returns({ - code: 'this-is-transpiled' - }) - }, - 'clean-css': sinon.stub().returns({ - minify: function(){ - return { styles: 'this-is-minified'}; - } - }), - 'uglify-js': { - minify: sinon.stub().returns({ - code: 'this-is-minified' - }) - } +describe('cli : domain : package-static-files', function(){ + + var packageStaticFiles, + error, + mocks, + minifyMocks; + + var initialise = function(mocks, params, cb){ + packageStaticFiles = injectr('../../src/cli/domain/package-static-files/index.js', mocks, { console: console }); + packageStaticFiles(params, function(e, r){ + error = e; + cb(); + }); }; - mocks = { - './minify-file': injectr('../../src/cli/domain/package-static-files/minify-file.js', minifyMocks), - 'fs-extra': { - copySync: sinon.spy(), - ensureDirSync: sinon.spy(), - existsSync: sinon.stub().returns(true), - lstatSync: sinon.stub().returns({ - isDirectory: function(){ return true; } - }), - readFileSync: sinon.stub().returns('some content'), - writeFileSync: sinon.spy() - }, - 'node-dir': { paths: sinon.stub().yields(null, { files:[] })}, - path: { - basename: path.basename, - dirname: function(){ - return path.dirname.apply(this, _.toArray(arguments)).replace(/\\/g, '/'); - }, - extname: path.extname, - join: function(){ - return path.join.apply(this, _.toArray(arguments)).replace(/\\/g, '/'); + var cleanup = function(){ + error = null; + + minifyMocks = { + 'babel-core': { + transform: sinon.stub().returns({ + code: 'this-is-transpiled' + }) }, - relative: function(){ - return path.relative.apply(this, _.toArray(arguments)).replace(/\\/g, '/'); + 'clean-css': sinon.stub().returns({ + minify: function(){ + return { styles: 'this-is-minified'}; + } + }), + 'uglify-js': { + minify: sinon.stub().returns({ + code: 'this-is-minified' + }) + } + }; + + mocks = { + './minify-file': injectr('../../src/cli/domain/package-static-files/minify-file.js', minifyMocks), + 'fs-extra': { + copySync: sinon.spy(), + ensureDirSync: sinon.spy(), + existsSync: sinon.stub().returns(true), + lstatSync: sinon.stub().returns({ + isDirectory: function(){ return true; } + }), + readFileSync: sinon.stub().returns('some content'), + writeFileSync: sinon.spy() }, - resolve: function(){ - return _.toArray(arguments).join('/'); + 'node-dir': { paths: sinon.stub().yields(null, { files:[] })}, + path: { + basename: path.basename, + dirname: function(){ + return path.dirname.apply(this, _.toArray(arguments)).replace(/\\/g, '/'); + }, + extname: path.extname, + join: function(){ + return path.join.apply(this, _.toArray(arguments)).replace(/\\/g, '/'); + }, + relative: function(){ + return path.relative.apply(this, _.toArray(arguments)).replace(/\\/g, '/'); + }, + resolve: function(){ + return _.toArray(arguments).join('/'); + } } - } + }; }; -}; - -cleanup(); -describe('cli : domain : packageStaticFiles', function(){ + cleanup(); describe('when oc.files.static is empty', function(){ From 9e89afb0cbd5414f38a33d512f54a1c8eab39c67 Mon Sep 17 00:00:00 2001 From: Matteo Figus Date: Sat, 25 Mar 2017 00:52:25 +0000 Subject: [PATCH 6/8] A couple of integration tests --- src/cli/domain/package-static-files/index.js | 2 +- .../package-static-files/minify-file.js | 4 +- ...domain-package-static-files-minify-file.js | 39 +++++++++++++++++++ 3 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 test/integration/cli-domain-package-static-files-minify-file.js diff --git a/src/cli/domain/package-static-files/index.js b/src/cli/domain/package-static-files/index.js index 51029bcb0..ca96cad7f 100644 --- a/src/cli/domain/package-static-files/index.js +++ b/src/cli/domain/package-static-files/index.js @@ -34,7 +34,7 @@ var copyDir = function(params, cb){ if(params.minify && params.ocOptions.minify !== false && (fileExt === '.js' || fileExt === '.css')){ var fileContent = fs.readFileSync(filePath).toString(), - minified = minifyFile(fileExt, fileContent, params.ocOptions); + minified = minifyFile(fileExt, fileContent); fs.writeFileSync(fileDestination, minified); } else { diff --git a/src/cli/domain/package-static-files/minify-file.js b/src/cli/domain/package-static-files/minify-file.js index 4e76d980d..a5424eac6 100644 --- a/src/cli/domain/package-static-files/minify-file.js +++ b/src/cli/domain/package-static-files/minify-file.js @@ -5,7 +5,7 @@ var babelPresetEnv = require('babel-preset-env'); var CleanCss = require('clean-css'); var uglifyJs = require('uglify-js'); -module.exports = function(fileType, fileContent, ocOptions){ +module.exports = function(fileType, fileContent){ if(fileType === '.js'){ @@ -24,7 +24,7 @@ module.exports = function(fileType, fileContent, ocOptions){ return uglifyJs.minify(es5, { fromString: true }).code; } else if(fileType === '.css'){ - + return new CleanCss().minify(fileContent).styles; } diff --git a/test/integration/cli-domain-package-static-files-minify-file.js b/test/integration/cli-domain-package-static-files-minify-file.js new file mode 100644 index 000000000..a317284e6 --- /dev/null +++ b/test/integration/cli-domain-package-static-files-minify-file.js @@ -0,0 +1,39 @@ +'use strict'; + +var expect = require('chai').expect; + +describe('cli : domain : package-static-files : minify-file', function(){ + var minifyFile = require('../../src/cli/domain/package-static-files/minify-file'); + + describe('when minifying .js file', function(){ + + describe('when file contains es6', function(){ + + var content = 'const hi = (name) => `hello ${name}`;'; + var minified; + + before(function(){ + minified = minifyFile('.js', content); + }); + + it('should minify it', function(){ + expect(minified).to.be.a('string'); + expect(minified).not.to.contain('const'); + expect(minified).to.contain('var'); + expect(minified).not.to.contain('name'); + }); + }); + + describe('when file contains not valid js', function(){ + + var content = 'const a=notvalid('; + var execute = function(){ + minifyFile('.js', content); + }; + + it('should throw an exception', function(){ + expect(execute).to.throw('Unexpected token'); + }); + }); + }); +}); From 6c08f08d545e2376720c34295bfa711dc3af8a93 Mon Sep 17 00:00:00 2001 From: Matteo Figus Date: Mon, 27 Mar 2017 13:24:55 +0100 Subject: [PATCH 7/8] Requested changes --- src/cli/domain/package-static-files/minify-file.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/cli/domain/package-static-files/minify-file.js b/src/cli/domain/package-static-files/minify-file.js index a5424eac6..a89adc2ba 100644 --- a/src/cli/domain/package-static-files/minify-file.js +++ b/src/cli/domain/package-static-files/minify-file.js @@ -5,9 +5,9 @@ var babelPresetEnv = require('babel-preset-env'); var CleanCss = require('clean-css'); var uglifyJs = require('uglify-js'); -module.exports = function(fileType, fileContent){ +module.exports = function(fileExt, fileContent){ - if(fileType === '.js'){ + if(fileExt === '.js'){ var presetOptions = { targets: { @@ -23,10 +23,8 @@ module.exports = function(fileType, fileContent){ return uglifyJs.minify(es5, { fromString: true }).code; - } else if(fileType === '.css'){ - + } else if(fileExt === '.css'){ + return new CleanCss().minify(fileContent).styles; } - - return fileContent; }; From d63c6e0b3c8f313770e25cbfc16220386bc80704 Mon Sep 17 00:00:00 2001 From: Matteo Figus Date: Mon, 27 Mar 2017 17:07:19 +0100 Subject: [PATCH 8/8] Simplified test --- .../cli-domain-package-static-files-minify-file.js | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/test/integration/cli-domain-package-static-files-minify-file.js b/test/integration/cli-domain-package-static-files-minify-file.js index a317284e6..e3bae6ad6 100644 --- a/test/integration/cli-domain-package-static-files-minify-file.js +++ b/test/integration/cli-domain-package-static-files-minify-file.js @@ -10,17 +10,10 @@ describe('cli : domain : package-static-files : minify-file', function(){ describe('when file contains es6', function(){ var content = 'const hi = (name) => `hello ${name}`;'; - var minified; - - before(function(){ - minified = minifyFile('.js', content); - }); it('should minify it', function(){ - expect(minified).to.be.a('string'); - expect(minified).not.to.contain('const'); - expect(minified).to.contain('var'); - expect(minified).not.to.contain('name'); + var minified = minifyFile('.js', content); + expect(minified).to.equal('var hi=function(n){return"hello "+n};'); }); });