diff --git a/.travis.yml b/.travis.yml index 26fc028c4..a27fd222c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,6 @@ language: node_js node_js: - - "0.10" - - "0.11" - - "0.12" - 4 - - 5 - 6 script: "npm run coverage" sudo: false diff --git a/package.json b/package.json index f3a4f2c69..67b0fc1a4 100644 --- a/package.json +++ b/package.json @@ -159,7 +159,7 @@ "url": "http://github.com/node-nock/nock/issues" }, "engines": [ - "node >= 0.10.0" + "node >= 4.0" ], "main": "./index", "dependencies": { diff --git a/tests/test_browserify.js b/tests/test_browserify.js index 31c6e4700..06946dc39 100644 --- a/tests/test_browserify.js +++ b/tests/test_browserify.js @@ -1,56 +1,54 @@ 'use strict'; -if (process.versions.node >= '0.11' ) { - var fs = require('fs'); - var path = require('path'); - var http = require('http'); - var browserify = require('browserify'); - var Static = require('node-static'); - var Browser = require('zombie'); - - var test = require('tap').test; - var before = test; - var after = test; - - var nock = require('../.'); - - nock.enableNetConnect(); - - var server; - - before('prepare bundle', {timeout: 10000}, function(t) { - var b = browserify(); - b.add(path.join(__dirname, 'fixtures', 'browserify-script.js')); - b.bundle().pipe(fs.createWriteStream(path.join(__dirname, 'browserify-public', 'browserify-bundle.js'))).once('finish', function() { - t.end(); - }); - }); - - before('start server', function(t) { - var file = new Static.Server(path.join(__dirname, 'browserify-public')); - server = http.createServer(function(req, res) { - file.serve(req, res); - }); - - server.listen(8080, t.end.bind(t)); - }); - - test('run bundle', function(t) { - Browser.localhost('server.com', 8080); - - var browser = new Browser(); - - browser.on('error', function(err) { - console.error('BROWSER ERROR: ' + err.stack); - }); - - browser.visit('/', function() { - browser.assert.text('#content', 'boop'); - t.end(); - }); - }); - - after('stop server', function(t) { - server.close(t.end.bind(t)); - }); -} +var fs = require('fs'); +var path = require('path'); +var http = require('http'); +var browserify = require('browserify'); +var Static = require('node-static'); +var Browser = require('zombie'); + +var test = require('tap').test; +var before = test; +var after = test; + +var nock = require('../.'); + +nock.enableNetConnect(); + +var server; + +before('prepare bundle', {timeout: 10000}, function(t) { + var b = browserify(); + b.add(path.join(__dirname, 'fixtures', 'browserify-script.js')); + b.bundle().pipe(fs.createWriteStream(path.join(__dirname, 'browserify-public', 'browserify-bundle.js'))).once('finish', function() { + t.end(); + }); +}); + +before('start server', function(t) { + var file = new Static.Server(path.join(__dirname, 'browserify-public')); + server = http.createServer(function(req, res) { + file.serve(req, res); + }); + + server.listen(8080, t.end.bind(t)); +}); + +test('run bundle', function(t) { + Browser.localhost('server.com', 8080); + + var browser = new Browser(); + + browser.on('error', function(err) { + console.error('BROWSER ERROR: ' + err.stack); + }); + + browser.visit('/', function() { + browser.assert.text('#content', 'boop'); + t.end(); + }); +}); + +after('stop server', function(t) { + server.close(t.end.bind(t)); +}); diff --git a/tests/test_isomorphic_fetch.js b/tests/test_isomorphic_fetch.js index 10ad86f50..b9734aabc 100644 --- a/tests/test_isomorphic_fetch.js +++ b/tests/test_isomorphic_fetch.js @@ -1,53 +1,51 @@ 'use strict'; -if (process.versions.node >= '0.11' ) { - var nock = require('../'); - var test = require('tap').test; - var fetch = require('isomorphic-fetch'); +var nock = require('../'); +var test = require('tap').test; +var fetch = require('isomorphic-fetch'); - test("basic match works", function(t) { - var scope = nock('http://isomorphicfetchland.com'). - get('/path'). - reply(200, 'somedata'); +test("basic match works", function(t) { + var scope = nock('http://isomorphicfetchland.com'). + get('/path'). + reply(200, 'somedata'); - fetch('http://isomorphicfetchland.com/path'). - then(function(res) { - return res.text(); - }). - then(function(text) { - scope.done(); - t.equal(text, 'somedata', "response should match"); - t.end(); - }). - catch(function(err) { - throw err; - }); + fetch('http://isomorphicfetchland.com/path'). + then(function(res) { + return res.text(); + }). + then(function(text) { + scope.done(); + t.equal(text, 'somedata', "response should match"); + t.end(); + }). + catch(function(err) { + throw err; }); +}); - test("string-based reqheaders match works", function(t) { - var scope = nock('http://isomorphicfetchland.com', { - reqheaders: { - 'header': 'header value', - } - }). - get('/path2'). - reply(200, 'somemoardata'); +test("string-based reqheaders match works", function(t) { + var scope = nock('http://isomorphicfetchland.com', { + reqheaders: { + 'header': 'header value', + } + }). + get('/path2'). + reply(200, 'somemoardata'); - fetch('http://isomorphicfetchland.com/path2', { - headers: { - 'header': 'header value', - } - }). - then(function(res) { - return res.text(); - }). - then(function(text) { - scope.done(); - t.equal(text, 'somemoardata', "response should match"); - t.end(); - }). - catch(function(err) { - throw err; - }); + fetch('http://isomorphicfetchland.com/path2', { + headers: { + 'header': 'header value', + } + }). + then(function(res) { + return res.text(); + }). + then(function(text) { + scope.done(); + t.equal(text, 'somemoardata', "response should match"); + t.end(); + }). + catch(function(err) { + throw err; }); -} +});