Merge pull request #70 from adhocteam/main

Fix deployed UI frontend issues (#39)
HHS · Sep 30, 2020 · a44a74d · a44a74d
2 parents aa97091 + 7b0a274
commit a44a74d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -106,7 +106,7 @@ parameters:
     default: "main"
     type: string
   sandbox_git_branch:  # change to feature branch to test deployment
-    default: "sj-add-callback-to-manifest"
+    default: "js-fix-deployed-ui-login"
     type: string
 jobs:
   build:

diff --git a/frontend/package.json b/frontend/package.json
@@ -22,8 +22,8 @@
   },
   "scripts": {
     "start": "react-scripts start",
-    "build:local": "react-scripts build",
-    "build": "react-scripts build && mv build/ ../build/server/client",
+    "build:local": "INLINE_RUNTIME_CHUNK=false react-scripts build",
+    "build": "INLINE_RUNTIME_CHUNK=false react-scripts build && mv build/ ../build/server/client",
     "eject": "react-scripts eject",
     "test": "react-scripts test",
     "test:ci": "cross-env JEST_JUNIT_OUTPUT_DIR=reports JEST_JUNIT_OUTPUT_NAME=unit.xml CI=true yarn test --coverage --reporters=default --reporters=jest-junit",

diff --git a/frontend/src/__tests__/App.js b/frontend/src/__tests__/App.js
@@ -37,7 +37,7 @@ describe('App', () => {
       render(<App />);
     });
 
-    it('displays the logout button', async () => {
+    it('displays the login button', async () => {
       expect(await waitFor(() => screen.getByText('HSES Login'))).toBeVisible();
     });
   });

diff --git a/src/index.js b/src/index.js
@@ -38,6 +38,10 @@ app.use(session({
   resave: false,
 }));
 
+if (process.env.NODE_ENV === 'production') {
+  app.use(express.static(path.join(__dirname, 'client')));
+}
+
 authMiddleware.unless = unless;
 // TODO: update unless to replace `oauth1CallbackPath with `join('/api', oauth2CallbackPath)`
 // once our oauth callback has been updated
@@ -86,10 +90,6 @@ app.get(oauth2CallbackPath, async (req, res) => {
 
 app.use('/api', router);
 
-if (process.env.NODE_ENV === 'production') {
-  app.use(express.static(path.join(__dirname, 'client')));
-}
-
 const server = app.listen(process.env.PORT || 8080, () => {
   logger.info('listening on 8080');
 });

diff --git a/src/index.test.js b/src/index.test.js
@@ -2,7 +2,7 @@ import request from 'supertest';
 import server from './index';
 
 describe('Root', () => {
-  test('Redirects to login if user is not logged in', async () => {
+  test('Responds with a 401 (Unauthorized) if user is not logged in', async () => {
     const response = await request(server).get('/');
     expect(response.status).toBe(401);
   });