mirror/cypress
1
0
Fork 0
mirror of https://github.com/cypress-io/cypress.git synced 2026-05-19 14:49:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

https-proxy decaf cleanup

Browse Source
This commit is contained in:
Zach Bloomquist
2020-02-20 12:15:05 -05:00
parent 900286b1fb
commit 433e6d4ed3
16 changed files with 37 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/https-proxy/test/helpers/certs.js
-2
View File
@@ -1,5 +1,3 @@
// TODO: This file was created by bulk-decaffeinate.
// Sanity-check the conversion and remove this comment.
const fs = require('fs')
const path = require('path')
const sslRootCas = require('ssl-root-cas')
packages/https-proxy/test/helpers/http_server.js
+4 -11
View File
@@ -1,13 +1,6 @@
/* eslint-disable
no-console,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
const http = require('http')
const Promise = require('bluebird')
@@ -18,7 +11,7 @@ const srv = http.createServer((req, res) => {
res.setHeader('Content-Type', 'text/html')
res.writeHead(200)
return res.end('<html><body>http server</body></html>')
res.end('<html><body>http server</body></html>')
})
module.exports = {
@@ -26,17 +19,17 @@ module.exports = {
start () {
return new Promise((resolve) => {
return srv.listen(8080, () => {
srv.listen(8080, () => {
console.log('server listening on port: 8080')
return resolve(srv)
resolve(srv)
})
})
},
stop () {
return new Promise((resolve) => {
return srv.close(resolve)
srv.close(resolve)
})
},
}
packages/https-proxy/test/helpers/https_server.js
+5 -13
View File
@@ -1,14 +1,6 @@
/* eslint-disable
no-console,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
* DS207: Consider shorter variations of null checks
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
const https = require('https')
const Promise = require('bluebird')
const { allowDestroy } = require('@packages/network')
@@ -21,7 +13,7 @@ const defaultOnRequest = function (req, res) {
res.setHeader('Content-Type', 'text/html')
res.writeHead(200)
return res.end('<html><head></head><body>https server</body></html>')
res.end('<html><head></head><body>https server</body></html>')
}
let servers = []
@@ -41,10 +33,10 @@ module.exports = {
servers.push(srv)
return srv.listen(port, () => {
srv.listen(port, () => {
console.log(`server listening on port: ${port}`)
return resolve(srv)
resolve(srv)
})
})
},
@@ -52,13 +44,13 @@ module.exports = {
stop () {
const stop = (srv) => {
return new Promise((resolve) => {
return srv.destroy(resolve)
srv.destroy(resolve)
})
}
return Promise.map(servers, stop)
.then(() => {
return servers = []
servers = []
})
},
}
packages/https-proxy/test/helpers/proxy.js
+5 -14
View File
@@ -1,14 +1,5 @@
/* eslint-disable
no-console,
no-undef,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
/* eslint-disable no-console */
const { request } = require('../spec_helper')
const { allowDestroy } = require('@packages/network')
const http = require('http')
const path = require('path')
@@ -22,7 +13,7 @@ const pipe = (req, res) => {
console.log('**ERROR**', req.url)
req.statusCode = 500
return res.end()
res.end()
}).pipe(res)
}
@@ -81,11 +72,11 @@ module.exports = {
})
return new Promise((resolve) => {
return prx.listen(port, () => {
prx.listen(port, () => {
prx.proxy = proxy
console.log(`server listening on port: ${port}`)
return resolve(proxy)
resolve(proxy)
})
})
})
packages/https-proxy/test/integration/proxy_spec.js
+5 -21
View File
@@ -1,26 +1,10 @@
/* eslint-disable
brace-style,
no-undef,
no-unused-vars,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
require('../spec_helper')
process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
const _ = require('lodash')
const { request, expect } = require('../spec_helper')
const DebugProxy = require('@cypress/debugging-proxy')
const fs = require('fs-extra')
const https = require('https')
const net = require('net')
const network = require('@packages/network')
const path = require('path')
const Promise = require('bluebird')
const proxy = require('../helpers/proxy')
const httpServer = require('../helpers/http_server')
@@ -105,9 +89,9 @@ describe('Proxy', () => {
})
})
it('can pass directly through', () => // this will fail due to dynamic cert
// this will fail due to dynamic cert
// generation when strict ssl is true
{
it('can pass directly through', () => {
return request({
strictSSL: false,
url: 'https://localhost:8444/replace',
@@ -320,7 +304,7 @@ describe('Proxy', () => {
return socket.on('close', () => {
expect(socket.destroyed).to.be.true
return resolve()
resolve()
})
})
})
@@ -355,7 +339,7 @@ describe('Proxy', () => {
delete process.env.HTTP_PROXY
delete process.env.HTTPS_PROXY
return delete process.env.NO_PROXY
delete process.env.NO_PROXY
})
})
})
packages/https-proxy/test/mocha.opts
+1 -1
View File
@@ -1,5 +1,5 @@
test/unit
test/integration
--reporter spec
--compilers ts:@packages/ts/register,coffee:@packages/coffee/register
--compilers ts:@packages/ts/register
--recursive
packages/https-proxy/test/spec_helper.js
+5 -16
View File
@@ -1,27 +1,14 @@
/* eslint-disable
no-unused-vars,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
const chai = require('chai')
const sinon = require('sinon')
const Promise = require('bluebird')
const sinonChai = require('sinon-chai')
const sinonPromise = require('sinon-as-promised')(Promise)
const request = require('request-promise')
const supertest = require('supertest')
global.request = require('request-promise')
global.sinon = sinon
global.supertest = require('supertest')
require('sinon-as-promised')(Promise)
chai.use(sinonChai)
global.expect = chai.expect
beforeEach(function () {
this.sandbox = sinon.sandbox.create()
})
@@ -29,3 +16,5 @@ beforeEach(function () {
afterEach(function () {
return this.sandbox.restore()
})
module.exports = { request, sinon, supertest, expect: chai.expect }
packages/https-proxy/test/unit/ca_spec.js
+1 -8
View File
@@ -1,11 +1,4 @@
// TODO: This file was created by bulk-decaffeinate.
// Sanity-check the conversion and remove this comment.
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
require('../spec_helper')
const { expect } = require('../spec_helper')
let fs = require('fs-extra')
const path = require('path')
packages/https-proxy/test/unit/server_spec.js
+8 -26
View File
@@ -1,18 +1,6 @@
/* eslint-disable
no-unused-vars,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
require('../spec_helper')
const { expect } = require('../spec_helper')
const EE = require('events')
const Promise = require('bluebird')
const proxy = require('../helpers/proxy')
const Server = require('../../lib/server')
describe('lib/server', () => {
@@ -28,7 +16,7 @@ describe('lib/server', () => {
afterEach(() => {
delete process.env.HTTPS_PROXY
return delete process.env.NO_PROXY
delete process.env.NO_PROXY
})
context('#listen', () => {
@@ -71,14 +59,12 @@ describe('lib/server', () => {
expect(socket.destroy).to.be.calledOnce
return done()
done()
}
this.setup({ onError })
.then((srv) => {
let conn
conn = srv._makeDirectConnection({ url: 'localhost:8444' }, socket, head)
srv._makeDirectConnection({ url: 'localhost:8444' }, socket, head)
})
})
@@ -98,14 +84,12 @@ describe('lib/server', () => {
expect(socket.destroy).to.be.calledOnce
return done()
done()
}
this.setup({ onError })
.then((srv) => {
let conn
conn = srv._makeDirectConnection({ url: '%7Balgolia_application_id%7D-dsn.algolia.net:443' }, socket, head)
srv._makeDirectConnection({ url: '%7Balgolia_application_id%7D-dsn.algolia.net:443' }, socket, head)
})
})
@@ -124,7 +108,7 @@ describe('lib/server', () => {
expect(socket.destroy).to.be.calledOnce
return done()
done()
}
process.env.HTTPS_PROXY = 'http://localhost:8444'
@@ -132,9 +116,7 @@ describe('lib/server', () => {
this.setup({ onError })
.then((srv) => {
let conn
conn = srv._makeDirectConnection({ url: 'should-not-reach.invalid:11111' }, socket, head)
srv._makeDirectConnection({ url: 'should-not-reach.invalid:11111' }, socket, head)
})
})
})