update references to old helpers.js

sarahs · sarahs · commit 18d25f612936 · 2020-11-24T15:42:11.000-05:00
diff --git a/tests/content/featured-links.js b/tests/content/featured-links.js
@@ -1,4 +1,4 @@
-const { getDOM, getJSON } = require('../helpers')
+const { getDOM, getJSON } = require('../helpers/supertest')
 const enterpriseServerReleases = require('../../lib/enterprise-server-releases')
 const japaneseCharacters = require('japanese-characters')
 const nonEnterpriseDefaultVersion = require('../../lib/non-enterprise-default-version')
diff --git a/tests/content/site-tree.js b/tests/content/site-tree.js
@@ -1,7 +1,7 @@
 const revalidator = require('revalidator')
 const schema = require('../../lib/site-tree-schema')
 const latestEnterpriseRelease = require('../../lib/enterprise-server-releases').latest
-const { getJSON } = require('../helpers')
+const { getJSON } = require('../helpers/supertest')
 const flat = require('flat')
 const japaneseCharacters = require('japanese-characters')
 const nonEnterpriseDefaultVersion = require('../../lib/non-enterprise-default-version')
diff --git a/tests/content/webhooks.js b/tests/content/webhooks.js
@@ -1,5 +1,5 @@
 const { difference } = require('lodash')
-const { getJSON } = require('../helpers')
+const { getJSON } = require('../helpers/supertest')
 const { latest } = require('../../lib/enterprise-server-releases')
 const allVersions = Object.values(require('../../lib/all-versions'))
 const payloadVersions = allVersions.map(v => v.miscVersionName)
diff --git a/tests/meta/orphan-tests.js b/tests/meta/orphan-tests.js
@@ -4,7 +4,7 @@ const path = require('path')
 describe('check for orphan tests', () => {
   test('all tests are in sub-directories', () => {
     // A known list of exceptions that can live outside of directories
-    const EXCEPTIONS = ['README.md', 'helpers.js']
+    const EXCEPTIONS = ['README.md']
     const pathToTests = path.join(process.cwd(), 'tests')
 
     // Get a list of files/directories in `/tests`
diff --git a/tests/rendering/breadcrumbs.js b/tests/rendering/breadcrumbs.js
@@ -1,4 +1,4 @@
-const { getDOM, getJSON } = require('../helpers')
+const { getDOM, getJSON } = require('../helpers/supertest')
 const nonEnterpriseDefaultVersion = require('../../lib/non-enterprise-default-version')
 
 describe('breadcrumbs', () => {
diff --git a/tests/rendering/curated-homepage-links.js b/tests/rendering/curated-homepage-links.js
@@ -1,4 +1,4 @@
-const { getDOM } = require('../helpers')
+const { getDOM } = require('../helpers/supertest')
 
 describe('curated homepage links', () => {
   jest.setTimeout(5 * 60 * 1000)
diff --git a/tests/rendering/footer.js b/tests/rendering/footer.js
@@ -1,4 +1,4 @@
-const { getDOM } = require('../helpers')
+const { getDOM } = require('../helpers/supertest')
 const enterpriseServerReleases = require('../../lib/enterprise-server-releases')
 const nonEnterpriseDefaultVersion = require('../../lib/non-enterprise-default-version')
 
diff --git a/tests/rendering/head.js b/tests/rendering/head.js
@@ -1,4 +1,4 @@
-const { getDOM } = require('../helpers')
+const { getDOM } = require('../helpers/supertest')
 const languages = require('../../lib/languages')
 
 describe('<head>', () => {
diff --git a/tests/rendering/header.js b/tests/rendering/header.js
@@ -1,4 +1,4 @@
-const { getDOM } = require('../helpers')
+const { getDOM } = require('../helpers/supertest')
 const { oldestSupported, latest } = require('../../lib/enterprise-server-releases')
 const nonEnterpriseDefaultVersion = require('../../lib/non-enterprise-default-version')
 
diff --git a/tests/rendering/page-titles.js b/tests/rendering/page-titles.js
@@ -1,5 +1,5 @@
 const enterpriseServerReleases = require('../../lib/enterprise-server-releases')
-const { getDOM } = require('../helpers')
+const { getDOM } = require('../helpers/supertest')
 
 describe('page titles', () => {
   jest.setTimeout(300 * 1000)
diff --git a/tests/rendering/rest.js b/tests/rendering/rest.js
@@ -1,7 +1,7 @@
 const fs = require('fs')
 const path = require('path')
 const { difference, isPlainObject } = require('lodash')
-const { getJSON } = require('../helpers')
+const { getJSON } = require('../helpers/supertest')
 const enterpriseServerReleases = require('../../lib/enterprise-server-releases')
 // list of REST markdown files that do not correspond to REST API resources
 // TODO could we get this list dynamically, say via page frontmatter?
diff --git a/tests/rendering/robots-txt.js b/tests/rendering/robots-txt.js
@@ -1,7 +1,7 @@
 const languages = require('../../lib/languages')
 const robotsParser = require('robots-parser')
 const robotsMiddleware = require('../../middleware/robots')
-const { get } = require('../helpers')
+const { get } = require('../helpers/supertest')
 const MockExpressResponse = require('mock-express-response')
 const products = require('../../lib/all-products')
 const enterpriseServerReleases = require('../../lib/enterprise-server-releases')
diff --git a/tests/rendering/server.js b/tests/rendering/server.js
@@ -1,6 +1,6 @@
 const lodash = require('lodash')
 const enterpriseServerReleases = require('../../lib/enterprise-server-releases')
-const { get, getDOM, head } = require('../helpers')
+const { get, getDOM, head } = require('../helpers/supertest')
 const path = require('path')
 const nonEnterpriseDefaultVersion = require('../../lib/non-enterprise-default-version')
 
diff --git a/tests/rendering/sidebar.js b/tests/rendering/sidebar.js
@@ -1,4 +1,4 @@
-const { getDOM } = require('../helpers')
+const { getDOM } = require('../helpers/supertest')
 const nonEnterpriseDefaultVersion = require('../../lib/non-enterprise-default-version')
 
 describe('sidebar', () => {
diff --git a/tests/routing/deprecated-enterprise-versions.js b/tests/routing/deprecated-enterprise-versions.js
@@ -1,6 +1,6 @@
 const app = require('../../server')
 const enterpriseServerReleases = require('../../lib/enterprise-server-releases')
-const { get, getDOM } = require('../helpers')
+const { get, getDOM } = require('../helpers/supertest')
 const supertest = require('supertest')
 
 describe('enterprise deprecation', () => {
diff --git a/tests/routing/developer-site-redirects.js b/tests/routing/developer-site-redirects.js
@@ -1,6 +1,6 @@
 const { eachOfLimit } = require('async')
 const enterpriseServerReleases = require('../../lib/enterprise-server-releases')
-const { get } = require('../helpers')
+const { get } = require('../helpers/supertest')
 const { getEnterpriseVersionNumber } = require('../../lib/patterns')
 const nonEnterpriseDefaultVersion = require('../../lib/non-enterprise-default-version')
 const restRedirectFixtures = require('../fixtures/rest-redirects')
diff --git a/tests/routing/enterprise-release-notes.js b/tests/routing/enterprise-release-notes.js
@@ -1,4 +1,4 @@
-const { get } = require('../helpers')
+const { get } = require('../helpers/supertest')
 
 describe('enterprise release notes', () => {
   jest.setTimeout(60 * 1000)
diff --git a/tests/routing/language-code-redirects.js b/tests/routing/language-code-redirects.js
@@ -1,4 +1,4 @@
-const { get } = require('../helpers')
+const { get } = require('../helpers/supertest')
 
 describe('language code redirects', () => {
   jest.setTimeout(5 * 60 * 1000)
diff --git a/tests/routing/redirects.js b/tests/routing/redirects.js
@@ -5,7 +5,7 @@ const app = require('../../server')
 const enterpriseServerReleases = require('../../lib/enterprise-server-releases')
 const nonEnterpriseDefaultVersion = require('../../lib/non-enterprise-default-version')
 const Page = require('../../lib/page')
-const { get } = require('../helpers')
+const { get } = require('../helpers/supertest')
 
 describe('redirects', () => {
   jest.setTimeout(5 * 60 * 1000)
diff --git a/tests/routing/top-developer-site-path-redirects.js b/tests/routing/top-developer-site-path-redirects.js
@@ -1,4 +1,4 @@
-const { head } = require('../helpers')
+const { head } = require('../helpers/supertest')
 
 describe('developer.github.com redirects', () => {
   jest.setTimeout(30 * 60 * 1000)
diff --git a/tests/unit/products.js b/tests/unit/products.js
@@ -1,7 +1,7 @@
 const revalidator = require('revalidator')
 const products = require('../../lib/all-products')
 const schema = require('../../lib/products-schema')
-const { getDOM, getJSON } = require('../helpers')
+const { getDOM, getJSON } = require('../helpers/supertest')
 const nonEnterpriseDefaultVersion = require('../../lib/non-enterprise-default-version')
 
 describe('products module', () => {
diff --git a/tests/unit/versions.js b/tests/unit/versions.js
@@ -2,7 +2,7 @@ const revalidator = require('revalidator')
 const allVersions = require('../../lib/all-versions')
 const { latest } = require('../../lib/enterprise-server-releases')
 const schema = require('../../lib/versions-schema')
-const { getJSON } = require('../helpers')
+const { getJSON } = require('../helpers/supertest')
 const nonEnterpriseDefaultVersion = require('../../lib/non-enterprise-default-version')
 
 describe('versions module', () => {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const { getDOM, getJSON } = require('../helpers')`
	`1`	`+const { getDOM, getJSON } = require('../helpers/supertest')`
`2`	`2`	`const enterpriseServerReleases = require('../../lib/enterprise-server-releases')`
`3`	`3`	`const japaneseCharacters = require('japanese-characters')`
`4`	`4`	`const nonEnterpriseDefaultVersion = require('../../lib/non-enterprise-default-version')`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const { getDOM } = require('../helpers')`
	`1`	`+const { getDOM } = require('../helpers/supertest')`
`2`	`2`
`3`	`3`	`describe('curated homepage links', () => {`
`4`	`4`	`jest.setTimeout(5 * 60 * 1000)`