diff --git a/lib/test.js b/lib/test.js index cadabdff..1de54d75 100644 --- a/lib/test.js +++ b/lib/test.js @@ -6,6 +6,7 @@ var request = require('superagent') , util = require('util') , http = require('http') + , https = require('https') , assert = require('assert') , Request = request.Request; @@ -39,7 +40,8 @@ function Test(app, method, path) { var addr = app.address(); var portno = addr ? addr.port : port++; if (!addr) app.listen(portno); - this.url = 'http://127.0.0.1:' + portno + path; + var protocol = app instanceof https.Server ? 'https' : 'http'; + this.url = protocol + '://127.0.0.1:' + portno + path; } /** diff --git a/test/fixtures/test_cert.pem b/test/fixtures/test_cert.pem new file mode 100644 index 00000000..6ff9b127 --- /dev/null +++ b/test/fixtures/test_cert.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE----- +MIICjzCCAfgCCQCduAjYszOZ3DANBgkqhkiG9w0BAQUFADCBizELMAkGA1UEBhMC +Q04xEzARBgNVBAgTCkd1YW5nIERvbmcxFDASBgNVBAcTC0d1YW5nIFpob3VlMQ4w +DAYDVQQKEwVUQkVEUDENMAsGA1UECxMEVEVTVDEQMA4GA1UEAxMHZmVuZ21rMjEg +MB4GCSqGSIb3DQEJARYRZmVuZ21rMkBnbWFpbC5jb20wHhcNMTIwOTIzMTQxMDI5 +WhcNMTIxMDIzMTQxMDI5WjCBizELMAkGA1UEBhMCQ04xEzARBgNVBAgTCkd1YW5n +IERvbmcxFDASBgNVBAcTC0d1YW5nIFpob3VlMQ4wDAYDVQQKEwVUQkVEUDENMAsG +A1UECxMEVEVTVDEQMA4GA1UEAxMHZmVuZ21rMjEgMB4GCSqGSIb3DQEJARYRZmVu +Z21rMkBnbWFpbC5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALOEtchk +KBK8WTqwXR2Aov2mc0+igyQTGbxBDSyyULHPiecMqOBHs5bV4DL1pc/01hLKIp4T +2j2KNTTmeivrtKd3wMQL7A+IgyqdmeqRi98pYUylFZrHxb9Kiwm7mpHanodmgnTT +zOluEpi/K9h9zM0DbIOynsOh9/w4E2Aq6JvrAgMBAAEwDQYJKoZIhvcNAQEFBQAD +gYEAnPd0JvCKQQBrm9jI6TkJKmfBa4NH0wUpMQv/bo2NWw1tA8fTQYb0S4aTep5Q +JdYctLQeE7abY1fpXFIwFY/FC0rE3alkEK+4PlCXvHGTYMiq90oH0JtlEqYTdTWJ +i99gtHarMEfzejyY3VDa2XFGmZrQCP6Co5NGDjAEr2A4ECg= +-----END CERTIFICATE----- diff --git a/test/fixtures/test_key.pem b/test/fixtures/test_key.pem new file mode 100644 index 00000000..dc4cb729 --- /dev/null +++ b/test/fixtures/test_key.pem @@ -0,0 +1,15 @@ +-----BEGIN RSA PRIVATE KEY----- +MIICXQIBAAKBgQCzhLXIZCgSvFk6sF0dgKL9pnNPooMkExm8QQ0sslCxz4nnDKjg +R7OW1eAy9aXP9NYSyiKeE9o9ijU05nor67Snd8DEC+wPiIMqnZnqkYvfKWFMpRWa +x8W/SosJu5qR2p6HZoJ008zpbhKYvyvYfczNA2yDsp7Doff8OBNgKuib6wIDAQAB +AoGAAp2tdHUZLGS4PCWzxalJNr8FMSTiGlV464hbI8qZaG3oyYgisdn5oPoO4U85 +ElW0BOQTKxCI/pqT+ehd4WP25u+RXBqOSfpIRQvY2RjXmeyrkDEZWATP/BUa/Oqa +0YitEsAXvt3pQli+LVc9GZSFZQECgwDVdAs4n7DdQlkLwIECQQDmFL9rIE/6wF3h +fJkvPFs67MJgMF/T4omLnv/FGSH7KBpjFHts9AbPIGjD1dadRpmHxk7ahbSTKMxu +uoZ1R1irAkEAx73MW4fJDQZDdJHwskYyGXuL99Fcr8xz6YZv75tm5O3eF2a/UvoO +UIgDGpTIWFrm+gli27p3J0rJhhOiI4JJwQJAYOjUR3bwuRlVcahdjTvK4WLf7Evz +0PdWH+z0pjwTyAn4M0tpQVb3lz57YiErqEsYV8v7Yqd2i5VfpjQCdlt6yQJBAIpm +7kph/SLEO0tzsGenEiHsJKFT9bhun8ape7h4YsSwOdrXPC0fzXlptVTe0S+/1Rpe +FJ0SSGv2e0snIYsfRUECQQCP8VOp3IIE8beytDoqn3QbWvobx94NVhHKUX5UB6C+ +bhY0LpTTFb8VMfSkICZXhbpcKf5zIdRjOh0ZLDeZJl5v +-----END RSA PRIVATE KEY----- diff --git a/test/supertest.js b/test/supertest.js index 32382001..5b871039 100644 --- a/test/supertest.js +++ b/test/supertest.js @@ -1,5 +1,8 @@ var request = require('..') + , https = require('https') + , fs = require('fs') + , path = require('path') , express = require('express'); describe('request(app)', function(){ @@ -37,6 +40,28 @@ describe('request(app)', function(){ }); }) + it('should work with a https server', function(done){ + var app = express(); + + app.get('/', function(req, res){ + res.send('hey'); + }); + + var fixtures = path.join(__dirname, 'fixtures'); + var server = https.createServer({ + key: fs.readFileSync(path.join(fixtures, 'test_key.pem')), + cert: fs.readFileSync(path.join(fixtures, 'test_cert.pem')) + }, app); + + request(server) + .get('/') + .end(function(err, res){ + res.should.have.status(200); + res.text.should.equal('hey'); + done(); + }); + }) + it('should work with .send() etc', function(done){ var app = express();