Address review comments

- moved to using a compound run statement in both yml files
- had to shift around the working directory a bit

.github/workflows/integrate-and-deploy.yml

@@ -58,13 +58,11 @@ jobs:
         name: Unit Tests
         run: make unit-tests-ci
       -
-        name: Setup Playwright E2E test environment
-        run: docker-compose up -d app-for-playwright
-        working-directory: docker
-      -
-        run: npx playwright install
-      -
-        run: npx playwright test
+        name: Playwright E2E Tests
+        run: |
+          docker-compose -f docker/docker-compose.yml up -d app-for-playwright
+          npx playwright install
+          npx playwright test
       -
         name: Log in to Docker Hub
         uses: docker/login-action@v1

.github/workflows/pull-request.yml

@@ -20,7 +20,7 @@ jobs:
       -
         uses: actions/checkout@v2
       -
-        name: Run Unit Tests
+        name: Unit Tests
         run: make unit-tests-ci
       -
         name: Publish Test Results
@@ -43,19 +43,18 @@ jobs:
           node-version: '16.14.0'
           cache: 'npm'
       -
-        run: npm ci
+        name: Build app
+        run: |
+          npm ci
+          docker-compose build app
       -
-        run: docker-compose build app
-      -
-        run: docker-compose up -d app-for-playwright
-
-        # see https://playwright.dev/docs/ci#github-actions
-      -
-        run: npx playwright install
-        working-directory: .
-      -
-        run: npx playwright test
+        name: Playwright E2E Tests
         working-directory: .
+        # see https://playwright.dev/docs/ci#github-actions
+        run: |
+          docker-compose -f docker/docker-compose.yml up -d app-for-playwright
+          npx playwright install
+          npx playwright test
 
   # protractor-tests:
   #   runs-on: ubuntu-latest