Merge pull request #825 from mollie/e2efix-6.0.x

E2Efix 6.0.x
mollie · Oct 9, 2023 · ab19779 · ab19779
2 parents 65b3671 + 924879f
commit ab19779
Show file tree

Hide file tree

Showing 16 changed files with 1,227 additions and 1,038 deletions.
diff --git a/.docker/.htaccess1785 b/.docker/.htaccess1785
@@ -10,60 +10,60 @@ SetEnv HTTP_MOD_REWRITE On
 RewriteEngine on
 
 
-#Domain: demoshop1785debug.ngrok.io
+#Domain: demoshop1785.ngrok.io
 RewriteRule . - [E=REWRITEBASE:/]
 RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L]
 
 # Images
-RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$
 RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L]
-RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$
 RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L]
-RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$
 RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L]
-RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$
 RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L]
-RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$
 RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L]
-RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$
 RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L]
-RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$
 RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L]
-RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$
 RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L]
-RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$
 RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L]
 # AlphaImageLoader for IE and fancybox
 RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L]
 
 
-#Domain: demoshop1785debug.ngrok.io
+#Domain: demoshop1785.ngrok.io
 RewriteRule . - [E=REWRITEBASE:/]
 RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L]
 
-RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$
 RewriteRule ^SHOP2$ /SHOP2/ [L,R]
-RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$
 RewriteRule ^SHOP2/(.*) /$1 [L]
 
 # Images
-RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$
 RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L]
-RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$
 RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L]
-RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$
 RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L]
-RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$
 RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L]
-RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$
 RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L]
-RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$
 RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L]
-RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$
 RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L]
-RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$
 RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L]
-RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$
 RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L]
 # AlphaImageLoader for IE and fancybox
 RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L]

diff --git a/.docker/.htaccess8 b/.docker/.htaccess8
@@ -10,29 +10,29 @@ SetEnv HTTP_MOD_REWRITE On
 RewriteEngine on
 
 
-#Domain: demoshop8debug.ngrok.io
+#Domain: demoshop8.ngrok.io
 RewriteRule . - [E=REWRITEBASE:/]
 RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L]
 RewriteRule ^upload/.+$ %{ENV:REWRITEBASE}index.php [QSA,L]
 
 # Images
-RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
 RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L]
-RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
 RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L]
-RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
 RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L]
-RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
 RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L]
-RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
 RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L]
-RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
 RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L]
-RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
 RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L]
-RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
 RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L]
-RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$
+RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
 RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L]
 # AlphaImageLoader for IE and fancybox
 RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L]

diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml
@@ -17,18 +17,18 @@ jobs:
         include:
           - prestashop: 'PS1785'
             make: 'make e2eh1785'
-            subdomain: 'demoshop1785debug'
+            subdomain: 'demoshop1785'
             port: '8002'
             yml: 'docker-compose.1785.yml'
-            url: 'https://demoshop1785debug.ngrok.io'
+            url: 'https://demoshop1785.ngrok.io'
             test_spec: '**/cypress/e2e/ps1785/**'
             TestRailID: R4954
           - prestashop: 'PS8'
             make: 'make e2eh8'
-            subdomain: 'demoshop8debug'
+            subdomain: 'demoshop8'
             port: '8142'
             yml: 'docker-compose.8.yml'
-            url: 'https://demoshop8debug.ngrok.io'
+            url: 'https://demoshop8.ngrok.io'
             test_spec: '**/cypress/e2e/ps8/**'
             TestRailID: R6470
     env: