@@ -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 } /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` )
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` )
4545 } )
4646
4747 test ( 'converts single `redirect_from` strings values into arrays' , async ( ) => {
@@ -205,18 +205,6 @@ 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-
220208 test ( 'admin/guides redirects to admin in redirects' , async ( ) => {
221209 const res = await get ( `/en/enterprise/${ enterpriseServerReleases . latest } /admin/guides/installation/upgrading-github-enterprise` )
222210 expect ( res . statusCode ) . toBe ( 301 )
@@ -231,12 +219,6 @@ describe('redirects', () => {
231219 expect ( res . statusCode ) . toBe ( 301 )
232220 expect ( res . headers . location ) . toBe ( japaneseEnterpriseAdmin )
233221 } )
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- } )
240222 } )
241223
242224 describe ( 'enterprise user homepage' , ( ) => {
@@ -250,19 +232,19 @@ describe('redirects', () => {
250232 } )
251233
252234 test ( 'no language code redirects to english' , async ( ) => {
253- const res = await get ( `/enterprise/${ enterpriseServerReleases . latest } /user/ github` )
235+ const res = await get ( `/enterprise/${ enterpriseServerReleases . latest } /github` )
254236 expect ( res . statusCode ) . toBe ( 301 )
255237 expect ( res . headers . location ) . toBe ( enterpriseUser )
256238 } )
257239
258240 test ( 'no version redirects to latest version' , async ( ) => {
259- const res = await get ( '/en/enterprise/user/ github' )
241+ const res = await get ( '/en/enterprise/github' )
260242 expect ( res . statusCode ) . toBe ( 301 )
261243 expect ( res . headers . location ) . toBe ( enterpriseUser )
262244 } )
263245
264246 test ( 'no version redirects to latest version (japanese)' , async ( ) => {
265- const res = await get ( '/ja/enterprise/user/ github' )
247+ const res = await get ( '/ja/enterprise/github' )
266248 expect ( res . statusCode ) . toBe ( 301 )
267249 expect ( res . headers . location ) . toBe ( japaneseEnterpriseUser )
268250 } )
@@ -273,7 +255,7 @@ describe('redirects', () => {
273255 const japaneseUserArticle = userArticle . replace ( '/en/' , '/ja/' )
274256
275257 test ( 'no product redirects to GitHub.com product on the latest version' , async ( ) => {
276- const res = await get ( `/en/enterprise/${ enterpriseServerReleases . latest } /user/ articles/set-up-git` )
258+ const res = await get ( `/en/enterprise/${ enterpriseServerReleases . latest } /articles/set-up-git` )
277259 expect ( res . statusCode ) . toBe ( 301 )
278260 expect ( res . headers . location ) . toBe ( userArticle )
279261 } )
@@ -285,19 +267,19 @@ describe('redirects', () => {
285267 } )
286268
287269 test ( 'no language code redirects to english' , async ( ) => {
288- const res = await get ( `/enterprise/${ enterpriseServerReleases . latest } /user/ github/getting-started-with-github/set-up-git` )
270+ const res = await get ( `/enterprise/${ enterpriseServerReleases . latest } /github/getting-started-with-github/set-up-git` )
289271 expect ( res . statusCode ) . toBe ( 301 )
290272 expect ( res . headers . location ) . toBe ( userArticle )
291273 } )
292274
293275 test ( 'no version redirects to latest version' , async ( ) => {
294- const res = await get ( '/en/enterprise/user/ github/getting-started-with-github/set-up-git' )
276+ const res = await get ( '/en/enterprise/github/getting-started-with-github/set-up-git' )
295277 expect ( res . statusCode ) . toBe ( 301 )
296278 expect ( res . headers . location ) . toBe ( userArticle )
297279 } )
298280
299281 test ( 'no version redirects to latest version (japanese)' , async ( ) => {
300- const res = await get ( '/ja/enterprise/user/ github/getting-started-with-github/set-up-git' )
282+ const res = await get ( '/ja/enterprise/github/getting-started-with-github/set-up-git' )
301283 expect ( res . statusCode ) . toBe ( 301 )
302284 expect ( res . headers . location ) . toBe ( japaneseUserArticle )
303285 } )
@@ -309,50 +291,37 @@ describe('redirects', () => {
309291 const japaneseUserArticle = userArticle . replace ( '/en/' , '/ja/' )
310292
311293 test ( 'redirects to expected article' , async ( ) => {
312- const res = await get ( `/en/enterprise/${ enterpriseServerReleases . latest } /user ${ redirectFromPath } ` )
294+ const res = await get ( `/en/enterprise/${ enterpriseServerReleases . latest } ${ redirectFromPath } ` )
313295 expect ( res . statusCode ) . toBe ( 301 )
314296 expect ( res . headers . location ) . toBe ( userArticle )
315297 } )
316298
317299 test ( 'no language code redirects to english' , async ( ) => {
318- const res = await get ( `/enterprise/${ enterpriseServerReleases . latest } /user ${ redirectFromPath } ` )
300+ const res = await get ( `/enterprise/${ enterpriseServerReleases . latest } ${ redirectFromPath } ` )
319301 expect ( res . statusCode ) . toBe ( 301 )
320302 expect ( res . headers . location ) . toBe ( userArticle )
321303 } )
322304
323305 test ( 'no version redirects to latest version' , async ( ) => {
324- const res = await get ( `/en/enterprise/user ${ redirectFromPath } ` )
306+ const res = await get ( `/en/enterprise${ redirectFromPath } ` )
325307 expect ( res . statusCode ) . toBe ( 301 )
326308 expect ( res . headers . location ) . toBe ( userArticle )
327309 } )
328310
329311 test ( 'no version redirects to latest version (japanese)' , async ( ) => {
330- const res = await get ( `/ja/enterprise/user ${ redirectFromPath } ` )
312+ const res = await get ( `/ja/enterprise${ redirectFromPath } ` )
331313 expect ( res . statusCode ) . toBe ( 301 )
332314 expect ( res . headers . location ) . toBe ( japaneseUserArticle )
333315 } )
334316 } )
335317
336318 describe ( 'desktop guide' , ( ) => {
337319 const desktopGuide = '/en/desktop/contributing-and-collaborating-using-github-desktop/creating-an-issue-or-pull-request'
338- const japaneseDesktopGuides = desktopGuide . replace ( '/en/' , '/ja/' )
339320
340321 test ( 'no language code redirects to english' , async ( ) => {
341322 const res = await get ( '/desktop/contributing-and-collaborating-using-github-desktop/creating-an-issue-or-pull-request' )
342323 expect ( res . statusCode ) . toBe ( 301 )
343324 expect ( res . headers . location ) . toBe ( desktopGuide )
344325 } )
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- } )
357326 } )
358327} )
0 commit comments