Skip to content

Commit 5445a98

Browse files
sarahssarahs
committed
revert to main
1 parent 35b938a commit 5445a98

3 files changed

Lines changed: 94 additions & 15 deletions

File tree

‎tests/fixtures/graphql-redirects.json‎

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,18 @@
7575
"/en/enterprise/2.19/v4/union": "/en/enterprise-server@2.19/graphql/reference/unions",
7676
"/en/enterprise/2.19/v4/union/assignee": "/en/enterprise-server@2.19/graphql/reference/unions#assignee",
7777
"/en/enterprise/2.19/v4/union/auditentryactor": "/en/enterprise-server@2.19/graphql/reference/unions#auditentryactor",
78+
"/en/enterprise/2.20/user/v4/enum": "/en/enterprise-server@2.20/graphql/reference/enums",
79+
"/en/enterprise/2.20/user/v4/guides": "/en/enterprise-server@2.20/graphql/guides",
80+
"/en/enterprise/2.20/user/v4/input_object": "/en/enterprise-server@2.20/graphql/reference/input-objects",
81+
"/en/enterprise/2.20/user/v4/interface": "/en/enterprise-server@2.20/graphql/reference/interfaces",
82+
"/en/enterprise/2.20/user/v4/mutation": "/en/enterprise-server@2.20/graphql/reference/mutations",
83+
"/en/enterprise/2.20/user/v4/object": "/en/enterprise-server@2.20/graphql/reference/objects",
84+
"/en/enterprise/2.20/user/v4/previews": "/en/enterprise-server@2.20/graphql/overview/schema-previews",
85+
"/en/enterprise/2.20/user/v4/public_schema": "/en/enterprise-server@2.20/graphql/overview/public-schema",
86+
"/en/enterprise/2.20/user/v4/query": "/en/enterprise-server@2.20/graphql/reference/queries",
87+
"/en/enterprise/2.20/user/v4/reference": "/en/enterprise-server@2.20/graphql/reference",
88+
"/en/enterprise/2.20/user/v4/scalar": "/en/enterprise-server@2.20/graphql/reference/scalars",
89+
"/en/enterprise/2.20/user/v4/union": "/en/enterprise-server@2.20/graphql/reference/unions",
7890
"/en/enterprise/2.20/v4/enum": "/en/enterprise-server@2.20/graphql/reference/enums",
7991
"/en/enterprise/2.20/v4/enum/auditlogorderfield": "/en/enterprise-server@2.20/graphql/reference/enums#auditlogorderfield",
8092
"/en/enterprise/2.20/v4/enum/checkannotationlevel": "/en/enterprise-server@2.20/graphql/reference/enums#checkannotationlevel",
@@ -97,6 +109,18 @@
97109
"/en/enterprise/2.20/v4/union": "/en/enterprise-server@2.20/graphql/reference/unions",
98110
"/en/enterprise/2.20/v4/union/assignee": "/en/enterprise-server@2.20/graphql/reference/unions#assignee",
99111
"/en/enterprise/2.20/v4/union/auditentryactor": "/en/enterprise-server@2.20/graphql/reference/unions#auditentryactor",
112+
"/en/enterprise/2.21/user/v4/enum": "/en/enterprise-server@2.21/graphql/reference/enums",
113+
"/en/enterprise/2.21/user/v4/guides": "/en/enterprise-server@2.21/graphql/guides",
114+
"/en/enterprise/2.21/user/v4/input_object": "/en/enterprise-server@2.21/graphql/reference/input-objects",
115+
"/en/enterprise/2.21/user/v4/interface": "/en/enterprise-server@2.21/graphql/reference/interfaces",
116+
"/en/enterprise/2.21/user/v4/mutation": "/en/enterprise-server@2.21/graphql/reference/mutations",
117+
"/en/enterprise/2.21/user/v4/object": "/en/enterprise-server@2.21/graphql/reference/objects",
118+
"/en/enterprise/2.21/user/v4/previews": "/en/enterprise-server@2.21/graphql/overview/schema-previews",
119+
"/en/enterprise/2.21/user/v4/public_schema": "/en/enterprise-server@2.21/graphql/overview/public-schema",
120+
"/en/enterprise/2.21/user/v4/query": "/en/enterprise-server@2.21/graphql/reference/queries",
121+
"/en/enterprise/2.21/user/v4/reference": "/en/enterprise-server@2.21/graphql/reference",
122+
"/en/enterprise/2.21/user/v4/scalar": "/en/enterprise-server@2.21/graphql/reference/scalars",
123+
"/en/enterprise/2.21/user/v4/union": "/en/enterprise-server@2.21/graphql/reference/unions",
100124
"/en/enterprise/2.21/v4/enum": "/en/enterprise-server@2.21/graphql/reference/enums",
101125
"/en/enterprise/2.21/v4/enum/auditlogorderfield": "/en/enterprise-server@2.21/graphql/reference/enums#auditlogorderfield",
102126
"/en/enterprise/2.21/v4/enum/checkannotationlevel": "/en/enterprise-server@2.21/graphql/reference/enums#checkannotationlevel",
@@ -253,6 +277,18 @@
253277
"/enterprise/2.19/v4/union": "/en/enterprise-server@2.19/graphql/reference/unions",
254278
"/enterprise/2.19/v4/union/assignee": "/en/enterprise-server@2.19/graphql/reference/unions#assignee",
255279
"/enterprise/2.19/v4/union/auditentryactor": "/en/enterprise-server@2.19/graphql/reference/unions#auditentryactor",
280+
"/enterprise/2.20/user/v4/enum": "/en/enterprise-server@2.20/graphql/reference/enums",
281+
"/enterprise/2.20/user/v4/guides": "/en/enterprise-server@2.20/graphql/guides",
282+
"/enterprise/2.20/user/v4/input_object": "/en/enterprise-server@2.20/graphql/reference/input-objects",
283+
"/enterprise/2.20/user/v4/interface": "/en/enterprise-server@2.20/graphql/reference/interfaces",
284+
"/enterprise/2.20/user/v4/mutation": "/en/enterprise-server@2.20/graphql/reference/mutations",
285+
"/enterprise/2.20/user/v4/object": "/en/enterprise-server@2.20/graphql/reference/objects",
286+
"/enterprise/2.20/user/v4/previews": "/en/enterprise-server@2.20/graphql/overview/schema-previews",
287+
"/enterprise/2.20/user/v4/public_schema": "/en/enterprise-server@2.20/graphql/overview/public-schema",
288+
"/enterprise/2.20/user/v4/query": "/en/enterprise-server@2.20/graphql/reference/queries",
289+
"/enterprise/2.20/user/v4/reference": "/en/enterprise-server@2.20/graphql/reference",
290+
"/enterprise/2.20/user/v4/scalar": "/en/enterprise-server@2.20/graphql/reference/scalars",
291+
"/enterprise/2.20/user/v4/union": "/en/enterprise-server@2.20/graphql/reference/unions",
256292
"/enterprise/2.20/v4/enum": "/en/enterprise-server@2.20/graphql/reference/enums",
257293
"/enterprise/2.20/v4/enum/auditlogorderfield": "/en/enterprise-server@2.20/graphql/reference/enums#auditlogorderfield",
258294
"/enterprise/2.20/v4/enum/checkannotationlevel": "/en/enterprise-server@2.20/graphql/reference/enums#checkannotationlevel",
@@ -275,6 +311,18 @@
275311
"/enterprise/2.20/v4/union": "/en/enterprise-server@2.20/graphql/reference/unions",
276312
"/enterprise/2.20/v4/union/assignee": "/en/enterprise-server@2.20/graphql/reference/unions#assignee",
277313
"/enterprise/2.20/v4/union/auditentryactor": "/en/enterprise-server@2.20/graphql/reference/unions#auditentryactor",
314+
"/enterprise/2.21/user/v4/enum": "/en/enterprise-server@2.21/graphql/reference/enums",
315+
"/enterprise/2.21/user/v4/guides": "/en/enterprise-server@2.21/graphql/guides",
316+
"/enterprise/2.21/user/v4/input_object": "/en/enterprise-server@2.21/graphql/reference/input-objects",
317+
"/enterprise/2.21/user/v4/interface": "/en/enterprise-server@2.21/graphql/reference/interfaces",
318+
"/enterprise/2.21/user/v4/mutation": "/en/enterprise-server@2.21/graphql/reference/mutations",
319+
"/enterprise/2.21/user/v4/object": "/en/enterprise-server@2.21/graphql/reference/objects",
320+
"/enterprise/2.21/user/v4/previews": "/en/enterprise-server@2.21/graphql/overview/schema-previews",
321+
"/enterprise/2.21/user/v4/public_schema": "/en/enterprise-server@2.21/graphql/overview/public-schema",
322+
"/enterprise/2.21/user/v4/query": "/en/enterprise-server@2.21/graphql/reference/queries",
323+
"/enterprise/2.21/user/v4/reference": "/en/enterprise-server@2.21/graphql/reference",
324+
"/enterprise/2.21/user/v4/scalar": "/en/enterprise-server@2.21/graphql/reference/scalars",
325+
"/enterprise/2.21/user/v4/union": "/en/enterprise-server@2.21/graphql/reference/unions",
278326
"/enterprise/2.21/v4/enum": "/en/enterprise-server@2.21/graphql/reference/enums",
279327
"/enterprise/2.21/v4/enum/auditlogorderfield": "/en/enterprise-server@2.21/graphql/reference/enums#auditlogorderfield",
280328
"/enterprise/2.21/v4/enum/checkannotationlevel": "/en/enterprise-server@2.21/graphql/reference/enums#checkannotationlevel",
@@ -345,4 +393,4 @@
345393
"/v4/union": "/en/graphql/reference/unions",
346394
"/v4/union/assignee": "/en/graphql/reference/unions#assignee",
347395
"/v4/union/auditentryactor": "/en/graphql/reference/unions#auditentryactor"
348-
}
396+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ describe('enterprise deprecation', () => {
2424
expect(res.headers.location).toBe('/en/enterprise/2.13')
2525
})
2626

27-
test.only('workaround for lost frontmatter redirects works in deprecated enterprise content >=2.13', async () => {
27+
test('workaround for lost frontmatter redirects works in deprecated enterprise content >=2.13', async () => {
2828
const res = await get('/en/enterprise/2.15/user/articles/viewing-contributions-on-your-profile-page')
2929
expect(res.statusCode).toBe(301)
3030
expect(res.headers.location).toBe('/en/enterprise/2.15/user/articles/viewing-contributions-on-your-profile')

‎tests/routing/redirects.js‎

Lines changed: 44 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ describe('redirects', () => {
4040
expect(page.redirects[`/en/${nonEnterpriseDefaultVersion}/articles`]).toBe('/en/github')
4141
expect(page.redirects['/common-issues-and-questions']).toBe('/en/github')
4242
expect(page.redirects['/en/common-issues-and-questions']).toBe('/en/github')
43-
expect(page.redirects[`/en/enterprise/${enterpriseServerReleases.latest}/articles`]).toBe(`/en/enterprise-server@${enterpriseServerReleases.latest}/github`)
44-
expect(page.redirects[`/en/enterprise/${enterpriseServerReleases.latest}/common-issues-and-questions`]).toBe(`/en/enterprise-server@${enterpriseServerReleases.latest}/github`)
43+
expect(page.redirects[`/en/enterprise/${enterpriseServerReleases.latest}/user/articles`]).toBe(`/en/enterprise-server@${enterpriseServerReleases.latest}/github`)
44+
expect(page.redirects[`/en/enterprise/${enterpriseServerReleases.latest}/user/common-issues-and-questions`]).toBe(`/en/enterprise-server@${enterpriseServerReleases.latest}/github`)
4545
})
4646

4747
test('converts single `redirect_from` strings values into arrays', async () => {
@@ -205,6 +205,18 @@ describe('redirects', () => {
205205
expect(res.headers.location).toBe(enterpriseAdmin)
206206
})
207207

208+
test('admin/guides redirects to admin', async () => {
209+
const res = await get(`/en/enterprise/${enterpriseServerReleases.latest}/admin/guides`)
210+
expect(res.statusCode).toBe(301)
211+
expect(res.headers.location).toBe(enterpriseAdmin)
212+
})
213+
214+
test('no version plus admin/guides redirects to admin on latest version', async () => {
215+
const res = await get('/en/enterprise/admin/guides')
216+
expect(res.statusCode).toBe(301)
217+
expect(res.headers.location).toBe(enterpriseAdmin)
218+
})
219+
208220
test('admin/guides redirects to admin in redirects', async () => {
209221
const res = await get(`/en/enterprise/${enterpriseServerReleases.latest}/admin/guides/installation/upgrading-github-enterprise`)
210222
expect(res.statusCode).toBe(301)
@@ -219,6 +231,12 @@ describe('redirects', () => {
219231
expect(res.statusCode).toBe(301)
220232
expect(res.headers.location).toBe(japaneseEnterpriseAdmin)
221233
})
234+
235+
test('admin/guides redirects to admin (japanese)', async () => {
236+
const res = await get(`/ja/enterprise/${enterpriseServerReleases.latest}/admin/guides`)
237+
expect(res.statusCode).toBe(301)
238+
expect(res.headers.location).toBe(japaneseEnterpriseAdmin)
239+
})
222240
})
223241

224242
describe('enterprise user homepage', () => {
@@ -232,19 +250,19 @@ describe('redirects', () => {
232250
})
233251

234252
test('no language code redirects to english', async () => {
235-
const res = await get(`/enterprise/${enterpriseServerReleases.latest}/github`)
253+
const res = await get(`/enterprise/${enterpriseServerReleases.latest}/user/github`)
236254
expect(res.statusCode).toBe(301)
237255
expect(res.headers.location).toBe(enterpriseUser)
238256
})
239257

240258
test('no version redirects to latest version', async () => {
241-
const res = await get('/en/enterprise/github')
259+
const res = await get('/en/enterprise/user/github')
242260
expect(res.statusCode).toBe(301)
243261
expect(res.headers.location).toBe(enterpriseUser)
244262
})
245263

246264
test('no version redirects to latest version (japanese)', async () => {
247-
const res = await get('/ja/enterprise/github')
265+
const res = await get('/ja/enterprise/user/github')
248266
expect(res.statusCode).toBe(301)
249267
expect(res.headers.location).toBe(japaneseEnterpriseUser)
250268
})
@@ -255,7 +273,7 @@ describe('redirects', () => {
255273
const japaneseUserArticle = userArticle.replace('/en/', '/ja/')
256274

257275
test('no product redirects to GitHub.com product on the latest version', async () => {
258-
const res = await get(`/en/enterprise/${enterpriseServerReleases.latest}/articles/set-up-git`)
276+
const res = await get(`/en/enterprise/${enterpriseServerReleases.latest}/user/articles/set-up-git`)
259277
expect(res.statusCode).toBe(301)
260278
expect(res.headers.location).toBe(userArticle)
261279
})
@@ -267,19 +285,19 @@ describe('redirects', () => {
267285
})
268286

269287
test('no language code redirects to english', async () => {
270-
const res = await get(`/enterprise/${enterpriseServerReleases.latest}/github/getting-started-with-github/set-up-git`)
288+
const res = await get(`/enterprise/${enterpriseServerReleases.latest}/user/github/getting-started-with-github/set-up-git`)
271289
expect(res.statusCode).toBe(301)
272290
expect(res.headers.location).toBe(userArticle)
273291
})
274292

275293
test('no version redirects to latest version', async () => {
276-
const res = await get('/en/enterprise/github/getting-started-with-github/set-up-git')
294+
const res = await get('/en/enterprise/user/github/getting-started-with-github/set-up-git')
277295
expect(res.statusCode).toBe(301)
278296
expect(res.headers.location).toBe(userArticle)
279297
})
280298

281299
test('no version redirects to latest version (japanese)', async () => {
282-
const res = await get('/ja/enterprise/github/getting-started-with-github/set-up-git')
300+
const res = await get('/ja/enterprise/user/github/getting-started-with-github/set-up-git')
283301
expect(res.statusCode).toBe(301)
284302
expect(res.headers.location).toBe(japaneseUserArticle)
285303
})
@@ -291,37 +309,50 @@ describe('redirects', () => {
291309
const japaneseUserArticle = userArticle.replace('/en/', '/ja/')
292310

293311
test('redirects to expected article', async () => {
294-
const res = await get(`/en/enterprise/${enterpriseServerReleases.latest}${redirectFromPath}`)
312+
const res = await get(`/en/enterprise/${enterpriseServerReleases.latest}/user${redirectFromPath}`)
295313
expect(res.statusCode).toBe(301)
296314
expect(res.headers.location).toBe(userArticle)
297315
})
298316

299317
test('no language code redirects to english', async () => {
300-
const res = await get(`/enterprise/${enterpriseServerReleases.latest}${redirectFromPath}`)
318+
const res = await get(`/enterprise/${enterpriseServerReleases.latest}/user${redirectFromPath}`)
301319
expect(res.statusCode).toBe(301)
302320
expect(res.headers.location).toBe(userArticle)
303321
})
304322

305323
test('no version redirects to latest version', async () => {
306-
const res = await get(`/en/enterprise${redirectFromPath}`)
324+
const res = await get(`/en/enterprise/user${redirectFromPath}`)
307325
expect(res.statusCode).toBe(301)
308326
expect(res.headers.location).toBe(userArticle)
309327
})
310328

311329
test('no version redirects to latest version (japanese)', async () => {
312-
const res = await get(`/ja/enterprise${redirectFromPath}`)
330+
const res = await get(`/ja/enterprise/user${redirectFromPath}`)
313331
expect(res.statusCode).toBe(301)
314332
expect(res.headers.location).toBe(japaneseUserArticle)
315333
})
316334
})
317335

318336
describe('desktop guide', () => {
319337
const desktopGuide = '/en/desktop/contributing-and-collaborating-using-github-desktop/creating-an-issue-or-pull-request'
338+
const japaneseDesktopGuides = desktopGuide.replace('/en/', '/ja/')
320339

321340
test('no language code redirects to english', async () => {
322341
const res = await get('/desktop/contributing-and-collaborating-using-github-desktop/creating-an-issue-or-pull-request')
323342
expect(res.statusCode).toBe(301)
324343
expect(res.headers.location).toBe(desktopGuide)
325344
})
345+
346+
test('desktop/guides redirects to desktop', async () => {
347+
const res = await get('/en/desktop/guides/contributing-and-collaborating-using-github-desktop/creating-an-issue-or-pull-request')
348+
expect(res.statusCode).toBe(301)
349+
expect(res.headers.location).toBe(desktopGuide)
350+
})
351+
352+
test('desktop/guides redirects to desktop (japanese)', async () => {
353+
const res = await get('/ja/desktop/guides/contributing-and-collaborating-using-github-desktop/creating-an-issue-or-pull-request')
354+
expect(res.statusCode).toBe(301)
355+
expect(res.headers.location).toBe(japaneseDesktopGuides)
356+
})
326357
})
327358
})

0 commit comments

Comments
 (0)