Merge branch 'main' into phpunit-pre-symfony

Author: sreichel

.all-contributorsrc

@@ -1689,6 +1689,15 @@
         "code",
         "bug"
       ]
+    },
+    {
+      "login": "denisahac",
+      "name": "Den Isahac",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6700576?v=4",
+      "profile": "http://www.denisahac.xyz",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "commitType": "docs"

.cypress.config.js

@@ -1,8 +1,8 @@
 module.exports = {
-  e2e: {
-    setupNodeEvents(on, config) {
-      // implement node event listeners here
-    },
-    baseUrl: 'https://magento-lts.ddev.site'
-  },
+    e2e: {
+        setupNodeEvents(on, config) {
+            // implement node event listeners here
+        },
+        baseUrl: 'https://magento-lts.ddev.site',
+    }
 };

.github/labeler.yml

@@ -934,4 +934,10 @@
       - any-glob-to-any-file: [
         .rector.php,
         .github/workflows/rector.yml
-      ]
+      ]
+
+'cypress':
+  - changed-files:
+      - any-glob-to-any-file: [
+        cypress/*
+      ]

.github/workflows/check-files.yml

@@ -39,6 +39,9 @@ on:
       phpunit:
         description: "Count changed PHPUnit files"
         value: ${{ jobs.check.outputs.phpunit }}
+      cypress:
+        description: "Count changed Cypress files"
+        value: ${{ jobs.check.outputs.cypress }}
   # Allow manually triggering the workflow.
   workflow_dispatch:
 
@@ -59,6 +62,7 @@ jobs:
       phpstan: ${{ steps.changes-phpstan.outputs.phpstan }}
       phpunit-test: ${{ steps.changes-phpunit-test.outputs.phpunit-test }}
       phpunit: ${{ steps.changes-phpunit.outputs.phpunit }}
+      cypress: ${{ steps.changes-cypress.outputs.cypress }}
 
     steps:
       - name: Checkout code
@@ -194,3 +198,11 @@ jobs:
           count="$(grep -oE "**phpunit**" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
           echo "$count PHPUnit file(s) changed"
           echo "phpunit=$count" >> $GITHUB_OUTPUT
+
+      - name: Check if Cypress files changed
+        id: changes-cypress
+        if: steps.changed-files-specific.outputs.any_modified == 'true'
+        run: |
+          count="$(grep -oE "cypress/" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
+          echo "$count Cypress file(s) changed"
+          echo "cypress=$count" >> $GITHUB_OUTPUT

.github/workflows/cypress.yml

@@ -0,0 +1,39 @@
+name: Cypress
+
+on:
+  workflow_call:
+  # Allow manually triggering the workflow.
+  workflow_dispatch:
+
+jobs:
+  test:
+    name: Cypress
+    runs-on: [ubuntu-latest]
+    strategy:
+      matrix:
+        webserver: ['apache-fpm', 'nginx-fpm']
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup DDEV
+        uses: ddev/github-action-setup-ddev@v1
+        with:
+          autostart: false
+
+      # install DDEV configuration
+      - run: ddev config --project-type=magento --php-version=8.1 --webserver-type=${{ matrix.webserver }}
+
+      # install composer dependencies
+      - run: ddev composer install
+
+      # install openmage
+      - run: ddev openmage-install -q
+
+      # install cypress-addon
+      - run: ddev add-on get tyler36/ddev-cypress
+
+      # start ddev
+      - run: ddev start
+
+        # run cypress
+      - run: ddev cypress-run --config-file .cypress.config.js

.github/workflows/workflow.yml

@@ -136,3 +136,14 @@ jobs:
       needs.check.outputs.phpunit > 0 ||
       needs.check.outputs.workflow > 0
     uses: ./.github/workflows/phpunit.yml
+
+  cypress:
+    name: Cypress E2E Tests
+    needs: [check, php-cs-fixer]
+    if: |
+      needs.check.outputs.cypress > 0 ||
+      needs.check.outputs.php > 0 ||
+      needs.check.outputs.phtml > 0 ||
+      needs.check.outputs.xml > 0 ||
+      needs.check.outputs.workflow > 0
+    uses: ./.github/workflows/cypress.yml

.gitignore

@@ -114,5 +114,9 @@ app/etc/includes/ddev.xhgui.php
 # local development
 .localdev
 
+# cypress
+cypress/screenshots/
+cypress/videos/
+
 # rector
 .rector.result.cache

.rector.php

@@ -22,6 +22,7 @@
 
 try {
     return RectorConfig::configure()
+        ->withFileExtensions(['php', 'phtml'])
         ->withCache(
             cacheDirectory: '.rector.result.cache',
             cacheClass: FileCacheStorage::class,

README.md

@@ -273,6 +273,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Axepih"><img src="https://avatars.githubusercontent.com/u/95623175?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Axepih</b></sub></a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/gdemarsico"><img src="https://avatars.githubusercontent.com/u/2066819?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Gastón De Mársico</b></sub></a></td>
     </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="http://www.denisahac.xyz"><img src="https://avatars.githubusercontent.com/u/6700576?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Den Isahac</b></sub></a></td>
+    </tr>
   </tbody>
 </table>
 

app/code/core/Mage/Adminhtml/Block/Widget/Container.php

@@ -253,7 +253,7 @@ public function getHeaderText()
      */
     public function getHeaderCssClass()
     {
-        return 'head-' . strtr($this->_controller, '_', '-');
+        return 'icon-head head-' . strtr($this->_controller, '_', '-');
     }
 
     /**