Skip to content

Commit fcf1fdd

Browse files
graceparkgracepark
committed
adding james feedback to add single app instance
1 parent cbed05a commit fcf1fdd

File tree

4 files changed

+19
-16
lines changed

4 files changed

+19
-16
lines changed

‎script/enterprise-server-deprecations/archive-version.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
const fs = require('fs')
44
const path = require('path')
55
const { execSync } = require('child_process')
6-
const app = require('../../lib/app')
6+
const createApp = require('../../lib/app')
77
const port = '4001'
88
const host = `http://localhost:${port}`
99
const scrape = require('website-scraper')
@@ -155,7 +155,7 @@ async function main () {
155155
plugins: [new RewriteAssetPathsPlugin(version, tempDirectory)]
156156
}
157157

158-
app().listen(port, async () => {
158+
createApp().listen(port, async () => {
159159
console.log(`started server on ${host}`)
160160

161161
await scrape(scraperOptions).catch(err => {

‎tests/helpers/supertest.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33

44
const cheerio = require('cheerio')
55
const supertest = require('supertest')
6-
const app = require('../../lib/app')
6+
const createApp = require('../../lib/app')
7+
const app = createApp()
78

89
const helpers = {}
910

10-
const request = (method, route) => supertest(app())[method](route)
11+
const request = (method, route) => supertest(app)[method](route)
1112

1213
helpers.get = async function (route, opts = { followRedirects: false, followAllRedirects: false, headers: {} }) {
1314
let res = (opts.headers) ? await request('get', route).set(opts.headers) : await request('get', route)

‎tests/rendering/events.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
const request = require('supertest')
22
const nock = require('nock')
33
const cheerio = require('cheerio')
4-
const app = require('../../lib/app')
4+
const createApp = require('../../lib/app')
55

66
describe('POST /events', () => {
77
jest.setTimeout(60 * 1000)
88

9+
const app = createApp()
910
let csrfToken = ''
1011
let agent
1112

@@ -14,7 +15,7 @@ describe('POST /events', () => {
1415
process.env.AIRTABLE_BASE_KEY = '$AIRTABLE_BASE_KEY$'
1516
process.env.HYDRO_SECRET = '$HYDRO_SECRET$'
1617
process.env.HYDRO_ENDPOINT = 'http://example.com/hydro'
17-
agent = request.agent(app())
18+
agent = request.agent(app)
1819
const csrfRes = await agent.get('/en')
1920
const $ = cheerio.load(csrfRes.text || '', { xmlMode: true })
2021
csrfToken = $('meta[name="csrf-token"]').attr('content')

‎tests/routing/deprecated-enterprise-versions.js‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const app = require('../../lib/app')
1+
const createApp = require('../../lib/app')
2+
const app = createApp()
23
const enterpriseServerReleases = require('../../lib/enterprise-server-releases')
34
const { get, getDOM } = require('../helpers/supertest')
45
const supertest = require('supertest')
@@ -126,7 +127,7 @@ describe('does not render survey prompt or contribution button', () => {
126127

127128
describe('JS and CSS assets', () => {
128129
it('returns the expected CSS file > 2.18', async () => {
129-
const result = await supertest(app())
130+
const result = await supertest(app)
130131
.get('/enterprise/2.18/dist/index.css')
131132
.set('Referrer', '/en/enterprise/2.18')
132133

@@ -136,7 +137,7 @@ describe('JS and CSS assets', () => {
136137
})
137138

138139
it('returns the expected CSS file', async () => {
139-
const result = await supertest(app())
140+
const result = await supertest(app)
140141
.get('/stylesheets/index.css')
141142
.set('Referrer', '/en/enterprise/2.13')
142143

@@ -146,7 +147,7 @@ describe('JS and CSS assets', () => {
146147
})
147148

148149
it('returns the expected JS file > 2.18', async () => {
149-
const result = await supertest(app())
150+
const result = await supertest(app)
150151
.get('/enterprise/2.18/dist/index.js')
151152
.set('Referrer', '/en/enterprise/2.18')
152153

@@ -156,7 +157,7 @@ describe('JS and CSS assets', () => {
156157
})
157158

158159
it('returns the expected JS file', async () => {
159-
const result = await supertest(app())
160+
const result = await supertest(app)
160161
.get('/javascripts/index.js')
161162
.set('Referrer', '/en/enterprise/2.13')
162163

@@ -166,7 +167,7 @@ describe('JS and CSS assets', () => {
166167
})
167168

168169
it('returns the expected image', async () => {
169-
const result = await supertest(app())
170+
const result = await supertest(app)
170171
.get('/assets/images/octicons/hamburger.svg')
171172
.set('Referrer', '/en/enterprise/2.17')
172173

@@ -176,7 +177,7 @@ describe('JS and CSS assets', () => {
176177
})
177178

178179
it('returns the expected node_modules', async () => {
179-
const result = await supertest(app())
180+
const result = await supertest(app)
180181
.get('/node_modules/algoliasearch/dist/algoliasearch.min.js')
181182
.set('Referrer', '/en/enterprise/2.17')
182183

@@ -186,7 +187,7 @@ describe('JS and CSS assets', () => {
186187
})
187188

188189
it('returns the expected favicon', async () => {
189-
const result = await supertest(app())
190+
const result = await supertest(app)
190191
.get('/assets/images/site/favicon.svg')
191192
.set('Referrer', '/en/enterprise/2.18')
192193

@@ -196,7 +197,7 @@ describe('JS and CSS assets', () => {
196197
})
197198

198199
it('returns the expected CSS file ( <2.13 )', async () => {
199-
const result = await supertest(app())
200+
const result = await supertest(app)
200201
.get('/assets/stylesheets/application.css')
201202
.set('Referrer', '/en/enterprise/2.12')
202203

@@ -206,7 +207,7 @@ describe('JS and CSS assets', () => {
206207
})
207208

208209
it('ignores invalid paths', async () => {
209-
const result = await supertest(app())
210+
const result = await supertest(app)
210211
.get('/pizza/index.css')
211212
.set('Referrer', '/en/enterprise/2.13')
212213

0 commit comments

Comments
 (0)