Merge pull request #6 from companieshouse/root-path

fixed root path in paths.ts and docker-compose
companieshouse · Jun 4, 2020 · d80fb54 · d80fb54
2 parents 0068a4a + 83f07e0
commit d80fb54
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
     build: .
     image: dissolution-web:1.0
     labels:
-      - traefik.http.routers.dissolution-web.rule=Host(`chs-dev`) && PathPrefix(`/dissolution-web/`)
+      - traefik.http.routers.dissolution-web.rule=Host(`chs-dev`) && PathPrefix(`/close-a-company/`)
     ports:
       - 3000:3000
     networks:

diff --git a/src/paths.ts b/src/paths.ts
@@ -1,6 +1,6 @@
-export const ROOT_URI = ''
+export const ROOT_URI = '/close-a-company'
 
 export const HEALTHCHECK_URI = `${ROOT_URI}/healthcheck`
 
 // Pages
-export const FORM_PAGE_URI = `${ROOT_URI}/form`
+export const FORM_PAGE_URI = `${ROOT_URI}/form`
diff --git a/test/controllers/form.controller.test.ts b/test/controllers/form.controller.test.ts
@@ -36,7 +36,7 @@ describe('FormController', () => {
 
       const res = await request(app).post(FORM_PAGE_URI).send(testObject).expect(MOVED_TEMPORARILY)
 
-      assert.include(res.text, 'Found. Redirecting to /form')
+      assert.include(res.text, 'Found. Redirecting to /close-a-company/form')
     })
   })
 

diff --git a/test/controllers/landing.controller.test.ts b/test/controllers/landing.controller.test.ts
@@ -12,7 +12,7 @@ const app: Application = createApp()
 
 describe('LandingController', () => {
   it('should render the landing page', async () => {
-    const res = await request(app).get('/').expect(OK)
+    const res = await request(app).get('/close-a-company').expect(OK)
 
     assert.include(res.text, 'Use this service to get your NodeJS application up and running.')
   })
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,7 +36,7 @@ describe('FormController', () => { @@
           const res = await request(app).post(FORM_PAGE_URI).send(testObject).expect(MOVED_TEMPORARILY)
-          assert.include(res.text, 'Found. Redirecting to /form')
+          assert.include(res.text, 'Found. Redirecting to /close-a-company/form')
         })
       })
@@ Expand Down @@