2
0
Fork 0

Upped versions and fixed lint warnings

This commit is contained in:
Willem 2015-06-28 17:44:01 +02:00
parent 7217f8617a
commit f1e8e001d9
6 changed files with 52 additions and 34 deletions

View file

@ -1,9 +1,8 @@
'use strict';
var u = require('underscore');
var fs = require('fs-extra');
var assert = require("assert");
var assets = require("../lib/node-ff-assets");
var assert = require('assert');
var assets = require('../lib/node-ff-assets');
function createTestAssembler(suite, readFile) {
var assetAssembler = new assets.AssetAssembler({
@ -40,7 +39,8 @@ describe('lib/asset-assembler.js', function() {
describe('config-null', function() {
this.timeout(10000);
try {
new assets.AssetAssembler();
var result = new assets.AssetAssembler();
assert.ok(result);
assert.ok(false);
} catch (err) {
assert.ok(err !== undefined);
@ -53,6 +53,7 @@ describe('lib/asset-assembler.js', function() {
var assetAssembler = createTestAssembler(this);
it('run builder and check output', function (done) {
assetAssembler.run(function (err) {
assert.ok(err === undefined);
try {
assert.ok(true);
assert.equal(true, fs.existsSync(outputFile));
@ -71,13 +72,14 @@ describe('lib/asset-assembler.js', function() {
describe('aggregate-two-and-remote', function() {
this.timeout(10000);
var remoteFile = 'test/data/'+this.title+'/fonts-sans-pro.css'
var remoteFile = 'test/data/'+this.title+'/fonts-sans-pro.css';
var outputFile = createTestData(this);
var assetAssembler = createTestAssembler(this);
assetAssembler.config.linkSources.push('/static-test/fonts-sans-pro.css@http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700');
it('run builder and check output', function (done) {
assetAssembler.run(function (err) {
assert.ok(err === undefined);
try {
assert.ok(true);
assert.equal(true, fs.existsSync(outputFile));
@ -90,7 +92,7 @@ describe('lib/asset-assembler.js', function() {
done();
} catch (err) {
console.log('sdf: '+Object.keys(err));
//console.log('sdf: '+Object.keys(err));
done(err);
}
});
@ -106,8 +108,8 @@ describe('lib/asset-assembler.js', function() {
it('run builder and check output', function (done) {
assetAssembler.run(function (err) {
assert.ok(err !== undefined);
try {
assert.ok(err !== undefined);
assert.equal(true, err.message.indexOf('404') >= 0);
assert.equal(true, fs.existsSync(outputFile));
assert.equal(true, fs.existsSync(remoteFile));
@ -131,7 +133,7 @@ describe('lib/asset-assembler.js', function() {
describe('remote-closed', function() {
this.timeout(10000);
var remoteFile = 'test/data/'+this.title+'/font-closed.css'
var remoteFile = 'test/data/'+this.title+'/font-closed.css';
var outputFile = createTestData(this);
var assetAssembler = createTestAssembler(this);
assetAssembler.config.linkSources.push('/static-test/font-closed.css@http://localhost:12345/closed');
@ -166,6 +168,7 @@ describe('lib/asset-assembler.js', function() {
var assetAssembler = createTestAssembler(this,assets.factory.assembler.constructor.readFileRegex());
it('run builder and check output', function (done) {
assetAssembler.run(function (err) {
assert.ok(err === undefined);
try {
assert.ok(true);
assert.equal(true, fs.existsSync(outputFile));
@ -184,7 +187,7 @@ describe('lib/asset-assembler.js', function() {
});
});
});
describe('aggregate-no-comments', function() {
this.timeout(10000);
var outputFile = createTestData(this);
@ -194,6 +197,7 @@ describe('lib/asset-assembler.js', function() {
assetAssembler.config.assetSeperator = null;
it('run builder and check output', function (done) {
assetAssembler.run(function (err) {
assert.ok(err === undefined);
try {
assert.ok(true);
assert.equal(true, fs.existsSync(outputFile));

View file

@ -1,9 +1,8 @@
'use strict';
var u = require('underscore');
var fs = require('fs-extra');
var assert = require("assert");
var assets = require("../lib/node-ff-assets");
var assert = require('assert');
var assets = require('../lib/node-ff-assets');
function createTestConfig(suite,type) {
@ -26,13 +25,14 @@ function createTestConfig(suite,type) {
],
assetType: type,
});
}
};
}
function createTestBuilder(suite) {
var testConfig = {
assemblerFill: function (assembler, callback) {
var serverResultKey = 'ff_assets_'+assembler.config.assetType;
assert.ok(serverResultKey);
assembler.on ('log',function (logMessage) {
console.log(' ' + ' ' + suite.title + ' assembler ' +logMessage); // == -2 space from asm
});
@ -55,7 +55,8 @@ describe('lib/assets-builder.js', function() {
describe('config-null', function() {
this.timeout(10000);
try {
new assets.AssetsBuilder();
var result = new assets.AssetsBuilder();
assert.ok(result);
assert.ok(false);
} catch (err) {
assert.ok(err !== undefined);

View file

@ -4,6 +4,12 @@ var u = require('underscore');
var assert = require('assert');
var asserts = require('../lib/node-ff-assets');
var checkResult = function(result) {
return function() {
assert.equal(true, u.isFunction(result));
};
};
var checkFunctionResult = function(node,prefixParent) {
var nodeKeys = Object.keys(node);
for (var i = 0; i < nodeKeys.length; i++) {
@ -17,15 +23,13 @@ var checkFunctionResult = function(node,prefixParent) {
} catch (err) {
result = function() {};
}
it(prefix+' should return function', function() {
assert.equal(true, u.isFunction(result));
});
it(prefix+' should return function', checkResult(result));
} else if (u.isObject(nodeValue)) {
checkFunctionResult(nodeValue,prefix);
}
}
}
};
describe('lib/factory.js', function() {
describe('check function paths', function() {

View file

@ -1,7 +1,7 @@
'use strict';
var assert = require("assert");
var assets = require("../lib/node-ff-assets");
var assert = require('assert');
var assets = require('../lib/node-ff-assets');
describe('lib/node-ff-assets.js', function() {
describe('check exports', function() {