Merge branch 'next-17697/support-recovery-e2e-env' into 'trunk'

NEXT-17697 - Support recovery e2e env

See merge request shopware/6/product/development!311

.gitignore

@@ -70,3 +70,4 @@ chromedriver.log
 ### misc
 .DS_Store
 /composer.lock
+.uniqueid.txt

dev-ops/common/actions/init-composer.sh

@@ -6,5 +6,6 @@ rm -rf dev-ops/analyze/vendor
 
 composer update --no-interaction --optimize-autoloader --no-scripts
 composer install --no-interaction --optimize-autoloader --working-dir=dev-ops/analyze
+if [ -e platform/src/Recovery ]; then composer install --no-interaction --optimize-autoloader --working-dir=platform/src/Recovery; fi
 
 if grep -q static-analyze platform/composer.json; then composer update --working-dir=platform; fi

dev-ops/e2e/actions/prepare-environment.sh

@@ -1,6 +1,6 @@
 #DESCRIPTION: Install dependencies and prepare database for Cypress usage
 
-npm install --prefix vendor/shopware/platform/src/"__CYPRESS_ENV__"/Resources/app/"$(echo "__CYPRESS_ENV__" | tr '[:upper:]' '[:lower:]')"/test/e2e
+if [ "__CYPRESS_ENV__" = "Recovery" ]; then cd platform/src/Recovery/Test/e2e; pwd; ls -las; npm install; else npm install --prefix platform/src/"__CYPRESS_ENV__"/Resources/app/"$(echo "__CYPRESS_ENV__" | tr '[:upper:]' '[:lower:]')"/test/e2e; fi
 ./psh.phar init-test-databases
 ./psh.phar e2e:dump-db
 

dev-ops/e2e/scripts/open-local.sh

@@ -10,7 +10,11 @@ export APP_ENV=e2e
 printf "\nCypress environment: ${CYPRESS_ENV}\n"
 printf "App-URL: ${CYPRESS_baseUrl}\n"
 
-# Start Cypress test runner
-cd "./platform/src/$CYPRESS_ENV/Resources/app/$(echo $CYPRESS_ENV | tr '[:upper:]' '[:lower:]')/test/e2e" || exit
+if [ $CYPRESS_ENV == "Recovery" ]; then
+    cd "./platform/src/Recovery/Test/e2e"
+else
+    cd "./platform/src/$CYPRESS_ENV/Resources/app/$(echo $CYPRESS_ENV | tr '[:upper:]' '[:lower:]')/test/e2e" || exit
+fi
 
+# Start Cypress test runner
 npm run open "${CYPRESS_PARAMS}"

dev-ops/e2e/scripts/run-local.sh

@@ -17,5 +17,10 @@ bin/console cache:clear
 bin/console e2e:dump-db
 
 # Start Cypress in CLI
-cd "./platform/src/$CYPRESS_ENV/Resources/app/$(echo $CYPRESS_ENV | tr '[:upper:]' '[:lower:]')/test/e2e" || exit
+if [ $CYPRESS_ENV == "Recovery" ]; then
+    cd "./platform/src/Recovery/Test/e2e"
+else
+    cd "./platform/src/$CYPRESS_ENV/Resources/app/$(echo $CYPRESS_ENV | tr '[:upper:]' '[:lower:]')/test/e2e" || exit
+fi
+
 ./node_modules/.bin/cypress run $CYPRESS_PARAMS