Skip to content

Commit

Permalink
Don't minify assets on test
Browse files Browse the repository at this point in the history
  • Loading branch information
Vitaly Puzrin committed Mar 17, 2014
1 parent a329a34 commit 889de09
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions Makefile
Expand Up @@ -120,9 +120,8 @@ setup:


test: cleanup lint
#node ./fontello.js server --test
@NODECA_ENV=test node ./fontello.js migrate --all
@NODECA_ENV=test ./fontello.js test
@NODECA_ENV=test NODECA_NOMINIFY=1 ./fontello.js test


todo:
Expand Down
2 changes: 1 addition & 1 deletion lib/system/init/bundle/bundles.js
Expand Up @@ -350,7 +350,7 @@ module.exports = function (sandbox) {

// XXX Set Mincer compression here, to avoid double compression on creating
// package files (client.js).
if ('development' !== N.runtime.env) {
if ('development' !== N.runtime.env && process.env.NODECA_NOMINIFY !== '1') {
sandbox.assets.environment.jsCompressor = 'uglify';
sandbox.assets.environment.cssCompressor = 'csso';
}
Expand Down
2 changes: 1 addition & 1 deletion test/server/ping.js
Expand Up @@ -12,7 +12,7 @@ describe('HTTP alive', function () {
it('/ GET', function (done) {
request
.get('/')
.expect(/fontello/)
.expect(/<!DOCTYPE html>/)
.expect(200, done);
});

Expand Down

0 comments on commit 889de09

Please sign in to comment.