Skip to content
This repository has been archived by the owner on Feb 2, 2024. It is now read-only.

fix unit tests, replace pem with self-cert #72

Merged
merged 6 commits into from
Dec 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
"mocha": "^10.0.0",
"nock": "^13.1.3",
"nyc": "^15.1.0",
"pem": "^1.14.4",
"restana": "^4.9.1",
"self-cert": "^2.0.0",
"standard": "^17.0.0",
"supertest": "^6.1.6"
},
Expand Down
52 changes: 26 additions & 26 deletions test/2.https.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ const request = require('supertest')
const bodyParser = require('body-parser')
const expect = require('chai').expect
let gateway, service, close, proxy, gHttpServer
const pem = require('pem')
const {
certificate: cert,
privateKey: key
} = require('self-cert')({
expires: new Date(Date.now() + 24 * 60 * 60 * 1000)
})

describe('https', () => {
it('init', async () => {
Expand Down Expand Up @@ -37,34 +42,29 @@ describe('https', () => {

it('init & start remote service', (done) => {
// init remote service
pem.createCertificate({
days: 1,
selfSigned: true
}, (_, keys) => {
service = require('restana')({
server: require('https').createServer({
key: keys.serviceKey,
cert: keys.certificate
})
})
service.use(bodyParser.json())

service.get('/service/get', (req, res) => res.send('Hello World!'))
service.get('/service/longop', (req, res) => {
setTimeout(() => {
res.send('Hello World!')
}, 500)
})
service.post('/service/post', (req, res) => {
res.send(req.body)
})
service.get('/service/headers', (req, res) => {
res.setHeader('x-agent', 'fast-proxy')
res.send()
service = require('restana')({
server: require('https').createServer({
key,
cert
})
})
service.use(bodyParser.json())

service.start(3000).then(() => done())
service.get('/service/get', (req, res) => res.send('Hello World!'))
service.get('/service/longop', (req, res) => {
setTimeout(() => {
res.send('Hello World!')
}, 500)
})
service.post('/service/post', (req, res) => {
res.send(req.body)
})
service.get('/service/headers', (req, res) => {
res.setHeader('x-agent', 'fast-proxy')
res.send()
})

service.start(3000).then(() => done())
})

it('should 200 on GET to valid remote endpoint', async () => {
Expand Down
84 changes: 40 additions & 44 deletions test/3.http2.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,13 @@ const h2url = require('h2url')
const bodyParser = require('body-parser')
const expect = require('chai').expect
let gateway, service, close, proxy
const pem = require('pem')
const pump = require('pump')
const {
certificate: cert,
privateKey: key
} = require('self-cert')({
expires: new Date(Date.now() + 24 * 60 * 60 * 1000)
})

describe('http2', () => {
it('init should fail if base is missing', (done) => {
Expand Down Expand Up @@ -36,64 +41,55 @@ describe('http2', () => {

it('init & start gateway', (done) => {
// init gateway
pem.createCertificate({
days: 1,
selfSigned: true
}, (_, keys) => {
gateway = require('restana')({
server: require('http2').createSecureServer({
key: keys.serviceKey,
cert: keys.certificate
})
})

gateway.all('/service/*', function (req, res) {
proxy(req, res, req.url, {
request: {
timeout: 100
}
})
gateway = require('restana')({
server: require('http2').createSecureServer({
key,
cert
})
})

gateway.start(8080).then(server => {
done()
gateway.all('/service/*', function (req, res) {
proxy(req, res, req.url, {
request: {
timeout: 100
}
})
})

gateway.start(8080).then(server => {
done()
})
})

it('init & start remote service', (done) => {
// init remote service
pem.createCertificate({
days: 1,
selfSigned: true
}, (_, keys) => {
service = require('restana')({
server: require('http2').createSecureServer({
key: keys.serviceKey,
cert: keys.certificate
})
})
service.use(bodyParser.text())

service.post('/service/post', (req, res) => {
pump(req, res)
service = require('restana')({
server: require('http2').createSecureServer({
key,
cert
})
})
service.use(bodyParser.text())

service.get('/service/longop', (req, res) => {
setTimeout(() => {
res.send('Hello World!')
}, 500)
})
service.post('/service/post', (req, res) => {
pump(req, res)
})

service.get('/service/headers', (req, res) => {
res.setHeader('x-agent', 'fast-proxy')
res.setHeader('x-forwarded-host', req.headers['x-forwarded-host'])
service.get('/service/longop', (req, res) => {
setTimeout(() => {
res.send('Hello World!')
}, 500)
})

res.send()
})
service.get('/service/headers', (req, res) => {
res.setHeader('x-agent', 'fast-proxy')
res.setHeader('x-forwarded-host', req.headers['x-forwarded-host'])

service.start(3000).then(() => done())
res.send()
})

service.start(3000).then(() => done())
})

it('should 200 on GET headers', async () => {
Expand Down