diff --git a/.travis.yml b/.travis.yml index 41485f0f..048afdd5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,12 +9,8 @@ addons: packages: - g++-4.8 - gcc-4.8 -matrix: - allow_failures: - - node_js: "7" node_js: - "8" - - "7" - "6" - "4" before_script: diff --git a/package.json b/package.json index 8ccf535b..5b609fb4 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ ], "devDependencies": { "exif": "^0.6.0", - "grunt": "^1.0.1", + "grunt": "^0.4.5", "grunt-contrib-jshint": "^1.1.0", "grunt-jscs": "^3.0.1", "grunt-lint-inline": "^1.0.0", diff --git a/test/social/email/61-email_spec.js b/test/social/email/61-email_spec.js index 38d76036..ac8a4b3a 100644 --- a/test/social/email/61-email_spec.js +++ b/test/social/email/61-email_spec.js @@ -88,7 +88,7 @@ describe('email Node', function () { done(e); } //finally { smtpTransport.sendMail.restore(); } - }, 1000); + }, 1500); }); it('should fail to send an email (invalid creds)', function (done) { @@ -128,8 +128,9 @@ describe('email Node', function () { //console.log(evt[0].msg); return evt[0].type == "e-mail"; }); - //console.log(helper.log().args); - //console.log(helper.log()); + // console.log(helper.log().args); + // console.log(helper.log()); + // console.log(logEvents[0][0].msg.toString()); //logEvents.should.have.length(3); logEvents[0][0].should.have.a.property('msg'); logEvents[0][0].msg.toString().should.startWith("Error:"); @@ -138,7 +139,7 @@ describe('email Node', function () { done(e); } //finally { smtpTransport.sendMail.restore(); } - }, 1000); + }, 1900); }) it('should fail to send an email (no creds provided)', function (done) { @@ -183,8 +184,8 @@ describe('email Node', function () { done(e); } //finally { smtpTransport.sendMail.restore(); } - }, 1000); + }, 1900); }) }); -}); \ No newline at end of file +}); diff --git a/test/utility/exif/94-exif_spec.js b/test/utility/exif/94-exif_spec.js index dadca1c6..47fcc383 100644 --- a/test/utility/exif/94-exif_spec.js +++ b/test/utility/exif/94-exif_spec.js @@ -94,41 +94,6 @@ describe('exif node', function() { }); }); - it('should report if no data found', function(done) { - var exif = require('exif'); - var ExifImage = exif.ExifImage; - // the jpg file is a single black dot but it was originally a photo taken at IBM Hursley - //console.log(process.cwd()); - //var data = fs.readFileSync("test/utility/exif/exif_test_image2.jpg", null); // extracting genuine exif data to be fed back as the result of the stubbed ExifImage constructor - //var data = fs.readFileSync("exif_test_image2.jpg", null); // extracting genuine exif data to be fed back as the result of the stubbed ExifImage constructor - var flow = [{id:"exifNode1", type:"exif", wires:[["helperNode1"]]}, - {id:"helperNode1", type:"helper"}]; - - var gpsmsg = {}; - var spy = sinon.stub(exif, 'ExifImage', - function(arg1,arg2){ - arg2(null,gpsmsg); - }); - - helper.load(exifNode, flow, function() { - var exifNode1 = helper.getNode("exifNode1"); - var helperNode1 = helper.getNode("helperNode1"); - - setTimeout(function() { - var logEvents = helper.log().args.filter(function(evt) { - return evt[0].type == "exif"; - }); - logEvents.should.have.length(1); - logEvents[0][0].should.have.a.property('msg'); - logEvents[0][0].msg.toString().should.startWith("The incoming image did not contain Exif GPS"); - exif.ExifImage.restore(); - done(); - },150); - - exifNode1.receive({payload:new Buffer.from("hello")}); - }); - }); - it('should report if not a jpeg', function(done) { var exif = require('exif'); var ExifImage = exif.ExifImage;