Skip to content

Commit

Permalink
EMA-145 - Security findings
Browse files Browse the repository at this point in the history
  • Loading branch information
Sanyi committed Feb 26, 2024
1 parent 68262b7 commit 5125908
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions dev/testv2/cypress.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ const { defineConfig } = require('cypress');
module.exports = defineConfig({
video: false,
trashAssetsBeforeRuns: false,
requestTimeout: 30000,
defaultCommandTimeout: 30000,
pageLoadTimeout: 30000,
requestTimeout: 60000,
defaultCommandTimeout: 60000,
pageLoadTimeout: 60000,
blockHosts: ['*snippet.url.com', '*scarabresearch.com'],
env: {
snippetUrl: 'http://snippet.url.com/main.js'
Expand Down
4 changes: 2 additions & 2 deletions dev/testv2/tools/scripts/run-e2e-local.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ echo "\n|--- Running tests on Magento $VERSION"
echo "\n|--- Pulling newest image version"
docker pull registry.itg.cloud/itg-commerce/emarsys-magento2-extension-test/ems-integration-magento-sampledata:$VERSION
echo "\n|--- Starting containers"
docker compose -p mage_e2e_$project_version -f $composefile up -d
docker compose -p mage_e2e_$project_version -f $composefile up --build -d
echo "\n|--- Waiting for containers to initialize"
sh ./wait.sh e2e >>/dev/null 2>&1
echo "\n|--- Running frontend tests"
Expand All @@ -39,4 +39,4 @@ exitcode=$?
echo "\n\n|--- All tests passed"

docker compose -p mage_e2e_$project_version -f $composefile down
exit $exitcode
exit $exitcode
2 changes: 1 addition & 1 deletion dev/testv2/tools/scripts/run-unit-local.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ echo "\n|--- Running tests on Magento $VERSION"
echo "\n|--- Pulling newest image version"
docker pull registry.itg.cloud/itg-commerce/emarsys-magento2-extension-test/ems-integration-magento-sampledata:$VERSION
echo "\n|--- Starting containers"
docker compose -p mage_unit_$project_version -f $composefile up -d
docker compose -p mage_unit_$project_version -f $composefile up --build -d
echo "\n|--- Waiting for containers to initialize"
sh ./wait.sh unit >>/dev/null 2>&1

Expand Down

0 comments on commit 5125908

Please sign in to comment.