Merge pull request #590 from serlo/move-legal-to-frontend

refactor(legal): move legal pages to frontend, simplify `ui`

__tests__/__utils__/expect-helper.ts

@@ -17,9 +17,7 @@ export async function expectIsNotFoundResponse(
   response: Response,
 ): Promise<void> {
   expect(response.status).toBe(404)
-  expect(await response.text()).toEqual(
-    expect.stringContaining('Page not found'),
-  )
+  await expectContainsText(response, ['Page Not Found'])
 }
 
 export async function expectIsJsonResponse(

__tests__/__utils__/test-environment.ts

@@ -1,3 +1,4 @@
+import { CfProperties } from '@cloudflare/workers-types'
 import TOML from '@iarna/toml'
 import fs from 'fs'
 import path from 'path'
@@ -63,8 +64,8 @@ export abstract class TestEnvironment {
 
   public abstract fetchRequest(request: Request): Promise<Response>
 
-  public createRequest(spec: UrlSpec, init?: RequestInit) {
-    return new Request(this.createUrl(spec), init)
+  public createRequest(spec: UrlSpec, init?: RequestInit<CfProperties>) {
+    return new Request<unknown, CfProperties>(this.createUrl(spec), init)
   }
 
   public createUrl({

__tests__/index.ts

@@ -14,7 +14,7 @@ describe('Enforce HTTPS', () => {
   test('HTTP URL', async () => {
     const response = await env.fetch({ subdomain: 'en', protocol: 'http' })
 
-    expectToBeRedirectTo(response, env.createUrl({ subdomain: 'en' }), 302)
+    expectToBeRedirectTo(response, env.createUrl({ subdomain: 'en' }), 301)
   })
 
   test('HTTPS URL', async () => {

__tests__/redirects.ts

@@ -1,5 +1,4 @@
 import {
-  expectIsNotFoundResponse,
   expectToBeRedirectTo,
   givenApi,
   givenUuid,
@@ -37,7 +36,8 @@ describe('meet.serlo.org', () => {
       pathname: '/foo',
     })
 
-    await expectIsNotFoundResponse(response)
+    const target = `https://serlo.org/___cf_not_found`
+    expectToBeRedirectTo(response, target, 302)
   })
 })
 
@@ -57,7 +57,17 @@ test('de.serlo.org/impressum', async () => {
     pathname: '/impressum',
   })
 
-  const target = 'https://de.serlo.org/imprint'
+  const target = 'https://de.serlo.org/legal'
+  expectToBeRedirectTo(response, target, 301)
+})
+
+test('de.serlo.org/impressum', async () => {
+  const response = await env.fetch({
+    subdomain: 'de',
+    pathname: '/imprint',
+  })
+
+  const target = 'https://de.serlo.org/legal'
   expectToBeRedirectTo(response, target, 301)
 })
 
@@ -85,7 +95,7 @@ test('*.serlo.org/user/public -> *serlo.org/user/me', async () => {
   })
 
   const target = env.createUrl({ subdomain: 'hi', pathname: '/user/me' })
-  expectToBeRedirectTo(response, target, 302)
+  expectToBeRedirectTo(response, target, 301)
 })
 
 test.each(['/neuerechtsform', '/neuerechtsform/'])(
@@ -164,7 +174,7 @@ test('serlo.org/* redirects to de.serlo.org/*', async () => {
   const response = await env.fetch({ pathname: '/foo' })
 
   const target = env.createUrl({ subdomain: 'de', pathname: '/foo' })
-  expectToBeRedirectTo(response, target, 302)
+  expectToBeRedirectTo(response, target, 301)
 })
 
 test('www.serlo.org/* redirects to de.serlo.org/*', async () => {
@@ -174,7 +184,7 @@ test('www.serlo.org/* redirects to de.serlo.org/*', async () => {
   })
 
   const target = env.createUrl({ subdomain: 'de', pathname: '/foo' })
-  expectToBeRedirectTo(response, target, 302)
+  expectToBeRedirectTo(response, target, 301)
 })
 
 test('/page/view/:id redirects to /:id', async () => {