BC-5468 update main yml and cypress config files

hpi-schul-cloud · Nov 13, 2023 · bf31804 · bf31804
1 parent 036208c
commit bf31804
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -108,12 +108,14 @@ jobs:
           for key in "${!key_value_pairs[@]}"; do
               json_output+="\"$key\":\"${key_value_pairs[$key]}\","
           done
-          json_output="${json_output%,}"  # Remove the trailing comma
+          json_output="${json_output%,}"
           json_output+="}}"
 
-          # Save the combined JSON object to a file
           echo "$json_output" > ${{ github.workspace }}/e2e-system-tests/env_variables/combined_credentials.env.json
 
+      # - name: Set credentials as environment variable
+      #   run: echo "CREDENTIALS_JSON=$(jq -c . ${{ github.workspace }}/e2e-system-tests/env_variables/combined_credentials.env.json)" >> $GITHUB_ENV
+
       - name: Clean up previous report
         uses: cypress-io/github-action@v5
         with:
@@ -126,6 +128,10 @@ jobs:
           working-directory: e2e-system-tests
           command: npm run ${{ steps.read_variables.outputs.tag }}
           browser: chrome
+        env:
+          CYPRESS_BRB: $(jq -r '.CYPRESS_BRB' "${{ github.workspace }}/e2e-system-tests/env_variables/combined_credentials.env.json")
+          CYPRESS_DEFAULT: $(jq -r '.CYPRESS_DEFAULT' "${{ github.workspace }}/e2e-system-tests/env_variables/combined_credentials.env.json")
+          CYPRESS_NBC: $(jq -r '.CYPRESS_NBC' "${{ github.workspace }}/e2e-system-tests/env_variables/combined_credentials.env.json")
 
       - name: Generate Report
         if: always()

diff --git a/cypress.config.js b/cypress.config.js
@@ -21,7 +21,7 @@ async function setupNodeEvents (on, config) {
     }
   }
   console.log(config.env)
-  console.log('loaded settings for environment %s', environmentName)
+  console.log('loaded settings for environment %s', environmentFilename)
 
   // This is required for the preprocessor to be able to generate JSON reports after each run, and more,
   await preprocessor.addCucumberPreprocessorPlugin(on, config)