frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixes for grunt files tests on Windows

This commit is contained in:
Dave Conway-Jones 2017-03-06 15:28:23 +00:00
parent c6436f47eb
commit 2db65b9d1f
3 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/red/runtime/nodes/registry/installer_spec.js
View File

@ -128,8 +128,14 @@ describe('nodes/registry/installer', function() {
installer.installModule(resourcesDir).then(function() { installer.installModule(resourcesDir).then(function() {
done(new Error("Unexpected success")); done(new Error("Unexpected success"));
}).otherwise(function(err) { }).otherwise(function(err) {
err.code.should.eql(404); if (err.hasOwnProperty("code")) {
done(); err.code.should.eql(404);
done();
}
else {
err.message.should.eql("Install failed");
done();
}
}); });
}); });
it("succeeds when path is valid node-red module", function(done) { it("succeeds when path is valid node-red module", function(done) {

35
test/red/runtime/storage/index_spec.js
View File

@ -15,6 +15,7 @@
**/ **/
var when = require("when"); var when = require("when");
var should = require("should"); var should = require("should");
var paff = require('path');
var storage = require("../../../../red/runtime/storage/index"); var storage = require("../../../../red/runtime/storage/index");
describe("red/storage/index", function() { describe("red/storage/index", function() {
@ -27,17 +28,17 @@ describe("red/storage/index", function() {
} }
}; };
storage.init(wrongModule).then( function() { storage.init(wrongModule).then( function() {
var one = 1; var one = 1;
var zero = 0; var zero = 0;
try { try {
zero.should.equal(one, "The initialization promise should never get resolved"); zero.should.equal(one, "The initialization promise should never get resolved");
} catch(err) { } catch(err) {
done(err); done(err);
} }
}).catch(function(e) { }).catch(function(e) {
done(); //successfully rejected promise done(); //successfully rejected promise
}); });
}); });
it('non-string storage module', function(done) { it('non-string storage module', function(done) {
@ -169,11 +170,11 @@ describe("red/storage/index", function() {
}, },
getLibraryEntry : function(type, path) { getLibraryEntry : function(type, path) {
if (type === "flows") { if (type === "flows") {
if (path == "/") { if (path === "/" || path === "\\") {
return when.resolve(["a",{fn:"test.json"}]); return when.resolve(["a",{fn:"test.json"}]);
} else if (path == "/a") { } else if (path == "/a" || path == "\\a") {
return when.resolve([{fn:"test2.json"}]); return when.resolve([{fn:"test2.json"}]);
} else if (path == "/a/test2.json") { } else if (path == paff.join("","a","test2.json")) {
return when.resolve("test content"); return when.resolve("test content");
} }
} }
@ -207,7 +208,7 @@ describe("red/storage/index", function() {
}); });
it('getFlow',function(done) { it('getFlow',function(done) {
storage.getFlow("/a/test2.json").then(function(res) { storage.getFlow(paff.join("a","test2.json")).then(function(res) {
try { try {
res.should.eql("test content"); res.should.eql("test content");
done(); done();
@ -218,9 +219,9 @@ describe("red/storage/index", function() {
}); });
it ('saveFlow', function (done) { it ('saveFlow', function (done) {
storage.saveFlow("/a/test2.json","new content").then(function(res) { storage.saveFlow(paff.join("a","test2.json"),"new content").then(function(res) {
try { try {
savePath.should.eql("/a/test2.json"); savePath.should.eql(paff.join("a","test2.json"));
saveContent.should.eql("new content"); saveContent.should.eql("new content");
saveMeta.should.eql({}); saveMeta.should.eql({});
saveType.should.eql("flows"); saveType.should.eql("flows");

7
test/red/runtime/storage/localfilesystem_spec.js
View File

@ -587,10 +587,11 @@ describe('LocalFileSystem', function() {
createObjectLibrary(); createObjectLibrary();
localfilesystem.getLibraryEntry('object','B').then(function(flows) { localfilesystem.getLibraryEntry('object','B').then(function(flows) {
flows.should.eql([ 'C', { ghi: 'jkl', fn: 'file2.js' }, {fn:'flow.json'} ]); flows.should.eql([ 'C', { ghi: 'jkl', fn: 'file2.js' }, {fn:'flow.json'} ]);
localfilesystem.saveLibraryEntry('object','B/D/file3.js',{mno:'pqr'},"// another non meta line\n\n Hi There").then(function() { var ft = path.join("B","D","file3.js");
localfilesystem.getLibraryEntry('object','B/D').then(function(flows) { localfilesystem.saveLibraryEntry('object',ft,{mno:'pqr'},"// another non meta line\n\n Hi There").then(function() {
localfilesystem.getLibraryEntry('object',path.join("B","D")).then(function(flows) {
flows.should.eql([ { mno: 'pqr', fn: 'file3.js' } ]); flows.should.eql([ { mno: 'pqr', fn: 'file3.js' } ]);
localfilesystem.getLibraryEntry('object','B/D/file3.js').then(function(body) { localfilesystem.getLibraryEntry('object',ft).then(function(body) {
body.should.eql("// another non meta line\n\n Hi There"); body.should.eql("// another non meta line\n\n Hi There");
done(); done();
}).otherwise(function(err) { }).otherwise(function(err) {