Candemiralp patch 1

.github/workflows/e2e-test.yml

@@ -1,18 +1,40 @@
-name: Magento 2 E2E Pipeline
-run-name: Adyen Magento 2 Payment Plugin E2E tests
-on: [pull_request, pull_request_target]
+name: Adyen Magento 2 E2E test workflow
+run-name: E2E tests against Test Repository ${{inputs.testBranch || 'main'}} with test group ${{inputs.testGroup || 'standard'}} and express branch ${{inputs.expressBranch || 'none'}}
+
+on:
+  pull_request:
+  pull_request_target:
+  workflow_dispatch:
+    inputs:
+      testBranch:
+        description: "Integration Test Repository Pipeline"
+        required: true
+        default: "develop"
+      testGroup:
+        description: "Test group"
+        required: true
+        default: "standard"
+        type: choice
+        options:
+          - all
+          - standard
+          - express-checkout
+      expressBranch:
+        description: "Express Checkout Repository Pipeline"
+        required: true
+        default: "main"
 
 jobs:
   build:
-    if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || (github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository)
-    environment: ${{ (github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository) && 'external' || 'internal' }}
+#    if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || (github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository)
+#    environment: ${{ (github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository) && 'external' || 'internal' }}
     strategy:
       matrix:
         php-version: ["8.3"]
         magento-version: ["2.4.7-p2"]
-    runs-on:
-      group: larger-runners
-      labels: ubuntu-latest-8-cores
+    runs-on: ubuntu-latest
+#      group: larger-runners
+#      labels: ubuntu-latest-8-cores
     timeout-minutes: 25
     env:
       PHP_VERSION: ${{ matrix.php-version }}
@@ -45,35 +67,44 @@ jobs:
       - name: Kill Cron Jobs
         run: docker exec magento2-container /etc/init.d/cron stop
 
-      - name: Checkout developer module
-        uses: actions/checkout@v3
-        with:
-          repository: Adyen/adyen-magento2-dev
-          ref: "main"
-          token: ${{ secrets.ADYEN_AUTOMATION_BOT_TEST_ACCESS_TOKEN }}
-          path: Developer
-
-      - name: Make the folder for dev module
-        run: docker exec -u www-data magento2-container mkdir -p /var/www/html/app/code/Adyen
+#      - name: Checkout developer module
+#        uses: actions/checkout@v3
+#        with:
+#          repository: Adyen/adyen-magento2-dev
+#          ref: "main"
+#          token: ${{ secrets.ADYEN_AUTOMATION_BOT_TEST_ACCESS_TOKEN }}
+#          path: Developer
+#
+#      - name: Make the folder for dev module
+#        run: docker exec -u www-data magento2-container mkdir -p /var/www/html/app/code/Adyen
+#
+#      - name: Copy dev module into Docker container
+#        run: docker cp ./Developer magento2-container:/var/www/html/app/code/Adyen
+#
+#      - name: Change ownership of developer module folder
+#        run: docker exec magento2-container chown -R www-data:www-data /var/www/html/app/code/Adyen/Developer
+#
+#      - name: Enable developer module
+#        run: docker exec -u www-data magento2-container make dev-module
 
-      - name: Copy dev module into Docker container
-        run: docker cp ./Developer magento2-container:/var/www/html/app/code/Adyen
+      - name: Install Express module
+        if: ${{contains(fromJSON('["all", "express-checkout"]'), inputs.testGroup)}}
+        run: docker exec -u www-data magento2-container composer require adyen/adyen-magento2-expresscheckout:dev-${{inputs.expressBranch}}
 
-      - name: Change ownership of developer module folder
-        run: docker exec magento2-container chown -R www-data:www-data /var/www/html/app/code/Adyen/Developer
+      - name: Enable Express module
+        if: ${{contains(fromJSON('["all", "express-checkout"]'), inputs.testGroup)}}
+        run: docker exec -u www-data magento2-container make enable-express
 
-      - name: Enable developer module
-        run: docker exec -u www-data magento2-container make dev-module
       - name: Switch to production mode
         run: docker exec -u www-data magento2-container make production
 
       - name: Setup permissions
         run: docker exec magento2-container make fs
 
       - name: Run E2E tests
-        run: docker compose -f .github/docker-compose.e2e.yml run --rm playwright /e2e.sh standard
+        run: docker compose -f .github/docker-compose.e2e.yml run --rm playwright /e2e.sh ${{inputs.testGroup || 'standard'}}
         env:
-          INTEGRATION_TESTS_BRANCH: develop
+          INTEGRATION_TESTS_BRANCH: ${{inputs.testBranch || 'develop'}}
           MAGENTO_ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}}
           MAGENTO_ADMIN_PASSWORD: ${{secrets.MAGENTO_ADMIN_PASSWORD}}
           MAGENTO_BASE_URL: ${{secrets.MAGENTO_BASE_URL}}

Controller/Return/Index.php

@@ -12,6 +12,8 @@
 // phpcs:ignore
 namespace Adyen\Payment\Controller\Return;
 
+// This is a test line
+
 use Adyen\Payment\Helper\PaymentResponseHandler;
 use Adyen\Payment\Helper\PaymentsDetails;
 use Adyen\Payment\Helper\Quote;