Skip to content

Commit

Permalink
Branch was updated using the 'autoupdate branch' Actions workflow.
Browse files Browse the repository at this point in the history
  • Loading branch information
Octomerger authored Nov 24, 2020
2 parents 42f13bd + 8146857 commit 3435035
Show file tree
Hide file tree
Showing 27 changed files with 27 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/allowed-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module.exports = [
'lee-dohm/close-matching-issues@22002609b2555fe18f52b8e2e7c07cbf5529e8a8',
'pascalgn/automerge-action@c9bd182',
'peter-evans/create-issue-from-file@a04ce672e3acedb1f8e416b46716ddfd09905326',
'peter-evans/create-or-update-project-card@80140aaeb9730972a83c626031250621fe8f6670v1',
'peter-evans/create-or-update-project-card@80140aaeb9730972a83c626031250621fe8f6670',
'peter-evans/create-pull-request@938e6aea6f8dbdaced2064e948cb806c77fe87b8',
'rachmari/actions-add-new-issue-to-column@1a459ef92308ba7c9c9dc2fcdd72f232495574a9',
'rachmari/labeler@832d42ec5523f3c6d46e8168de71cd54363e3e2e',
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-all-english-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
labels: broken link report
- if: ${{ failure() }}
name: Add issue to FR project board
uses: peter-evans/create-or-update-project-card@80140aaeb9730972a83c626031250621fe8f6670v1
uses: peter-evans/create-or-update-project-card@80140aaeb9730972a83c626031250621fe8f6670
with:
project-repository: 'github'
project-number: '1367'
Expand Down
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ module.exports = {
testPathIgnorePatterns: [
'node_modules/',
'vendor/',
'tests/helpers.js',
'tests/helpers/',
...isBrowser ? [] : ['tests/browser/browser.js']
],
testMatch: [
Expand Down
1 change: 1 addition & 0 deletions script/check-deps.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const path = require('path')
const main = async () => {
const data = await dependencyCheck({
entries: [
path.posix.join(__dirname, '..', '*.js'),
path.posix.join(__dirname, '..', '*', '*.js'),
path.posix.join('!', __dirname, '..', 'javascripts', '*.js'),
path.posix.join(__dirname, '..', 'script', 'graphql', '*.js')
Expand Down
2 changes: 1 addition & 1 deletion tests/content/featured-links.js
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
2 changes: 1 addition & 1 deletion tests/content/site-tree.js
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
2 changes: 1 addition & 1 deletion tests/content/webhooks.js
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tests/helpers.js → tests/helpers/supertest.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

const cheerio = require('cheerio')
const supertest = require('supertest')
const app = require('../server')
const app = require('../../server')

const helpers = {}

Expand Down
2 changes: 1 addition & 1 deletion tests/meta/orphan-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
2 changes: 1 addition & 1 deletion tests/rendering/breadcrumbs.js
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
2 changes: 1 addition & 1 deletion tests/rendering/curated-homepage-links.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { getDOM } = require('../helpers')
const { getDOM } = require('../helpers/supertest')

describe('curated homepage links', () => {
jest.setTimeout(5 * 60 * 1000)
Expand Down
2 changes: 1 addition & 1 deletion tests/rendering/footer.js
Original file line number Diff line number Diff line change
@@ -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')

Expand Down
2 changes: 1 addition & 1 deletion tests/rendering/head.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { getDOM } = require('../helpers')
const { getDOM } = require('../helpers/supertest')
const languages = require('../../lib/languages')

describe('<head>', () => {
Expand Down
2 changes: 1 addition & 1 deletion tests/rendering/header.js
Original file line number Diff line number Diff line change
@@ -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')

Expand Down
2 changes: 1 addition & 1 deletion tests/rendering/page-titles.js
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tests/rendering/rest.js
Original file line number Diff line number Diff line change
@@ -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?
Expand Down
2 changes: 1 addition & 1 deletion tests/rendering/robots-txt.js
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
2 changes: 1 addition & 1 deletion tests/rendering/server.js
Original file line number Diff line number Diff line change
@@ -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')

Expand Down
2 changes: 1 addition & 1 deletion tests/rendering/sidebar.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { getDOM } = require('../helpers')
const { getDOM } = require('../helpers/supertest')
const nonEnterpriseDefaultVersion = require('../../lib/non-enterprise-default-version')

describe('sidebar', () => {
Expand Down
2 changes: 1 addition & 1 deletion tests/routing/deprecated-enterprise-versions.js
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
2 changes: 1 addition & 1 deletion tests/routing/developer-site-redirects.js
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
2 changes: 1 addition & 1 deletion tests/routing/enterprise-release-notes.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { get } = require('../helpers')
const { get } = require('../helpers/supertest')

describe('enterprise release notes', () => {
jest.setTimeout(60 * 1000)
Expand Down
2 changes: 1 addition & 1 deletion tests/routing/language-code-redirects.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { get } = require('../helpers')
const { get } = require('../helpers/supertest')

describe('language code redirects', () => {
jest.setTimeout(5 * 60 * 1000)
Expand Down
2 changes: 1 addition & 1 deletion tests/routing/redirects.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tests/routing/top-developer-site-path-redirects.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { head } = require('../helpers')
const { head } = require('../helpers/supertest')

describe('developer.github.com redirects', () => {
jest.setTimeout(30 * 60 * 1000)
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/products.js
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/versions.js
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down

0 comments on commit 3435035

Please sign in to comment.