Fix merge conflict.

.github/workflows/tf-apply.yml

@@ -82,6 +82,40 @@ jobs:
           TF_VAR_app_cypresstest_secret : ${{ secrets.CYPRESS_TEST_SECRET }}
           TF_VAR_app_support_email: ${{ secrets.SUPPORT_EMAIL }}
 
+  run_tests:
+    needs: terraform-apply
+    if: ${{ github.event.inputs.environment != 'production' }}
+    permissions:
+      contents: read
+      packages: read
+
+    runs-on: ubuntu-latest
+    environment: ${{ github.event.inputs.environment == 'staging' && 'Staging' || 'Dev' }}
+    defaults:
+      run:
+        working-directory: end-to-end-tests
+
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v2
+
+      - name: setup node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: '18.x'
+
+      - name: Npm install
+        run: npm install
+
+      - name: Run tests
+        run: npm run cypress:run -- --key ${{ secrets.CYPRESS_KEY }} --env url='${{ secrets.ENDPOINT }}',authorizationHeader='${{ secrets.AUTH_HEADER_CYPRESS }}'
+
+      - uses: actions/upload-artifact@v1
+        if: failure()
+        with:
+          name: cypress-screenshots
+          path: end-to-end-tests/cypress/screenshots
+
   create-tag:
     needs: terraform-apply
     runs-on: ubuntu-latest