Merge pull request #5779 from github/repo-sync

repo sync

Author: Octomerger

script/fix-translation-errors.js

@@ -17,7 +17,7 @@ const fm = require('../lib/frontmatter')
 const matter = require('gray-matter')
 const chalk = require('chalk')
 const yaml = require('js-yaml')
-const ghesReleaseNotesSchema = require('../lib/release-notes-schema')
+const ghesReleaseNotesSchema = require('../tests/helpers/schemas/release-notes-schema')
 const revalidator = require('revalidator')
 
 const fixableFmProps = Object.keys(fm.schema.properties)

tests/content/lint-files.js

@@ -10,7 +10,7 @@ const readFileAsync = require('../../lib/readfile-async')
 const frontmatter = require('../../lib/frontmatter')
 const languages = require('../../lib/languages')
 const { tags } = require('../../lib/liquid-tags/extended-markdown')
-const ghesReleaseNotesSchema = require('../../lib/release-notes-schema')
+const ghesReleaseNotesSchema = require('../helpers/schemas/release-notes-schema')
 const renderContent = require('../../lib/render-content')
 const { execSync } = require('child_process')
 

tests/content/site-tree.js

@@ -1,5 +1,5 @@
 const revalidator = require('revalidator')
-const schema = require('../../lib/site-tree-schema')
+const schema = require('../helpers/schemas/site-tree-schema')
 const latestEnterpriseRelease = require('../../lib/enterprise-server-releases').latest
 const { getJSON } = require('../helpers/supertest')
 const flat = require('flat')

lib/languages-schema.js renamed to tests/helpers/schemas/languages-schema.js

@@ -1,6 +1,6 @@
 const revalidator = require('revalidator')
 const languages = require('../../lib/languages')
-const schema = require('../../lib/languages-schema')
+const schema = require('../helpers/schemas/languages-schema')
 
 describe('languages module', () => {
   test('is an object with language codes as keys', () => {

lib/products-schema.js renamed to tests/helpers/schemas/products-schema.js

@@ -1,6 +1,6 @@
 const revalidator = require('revalidator')
 const { productMap } = require('../../lib/all-products')
-const schema = require('../../lib/products-schema')
+const schema = require('../helpers/schemas/products-schema')
 const { getDOM, getJSON } = require('../helpers/supertest')
 const nonEnterpriseDefaultVersion = require('../../lib/non-enterprise-default-version')
 

lib/release-notes-schema.js renamed to tests/helpers/schemas/release-notes-schema.js

@@ -1,7 +1,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 schema = require('../helpers/schemas/versions-schema')
 const { getJSON } = require('../helpers/supertest')
 const nonEnterpriseDefaultVersion = require('../../lib/non-enterprise-default-version')