Merge branch 'b-7.1.x-add-tests-OXDEV-7520' into b-7.1.x

OXID-eSales · Nov 6, 2023 · 9d46f2a · 9d46f2a
2 parents 568280a + 2580e4e
commit 9d46f2a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 23 deletions.
diff --git a/.github/testplans/oe_vcmsexamples.yml b/.github/testplans/oe_vcmsexamples.yml
@@ -54,11 +54,7 @@ deprecated_tests:
   skip: true
 
 sonarcloud:
-  matrix: *matrix
-  target_branch: *git_shop_ref
-  project_key: 'OXID-eSales_vcms-examples'
-  project_name: *package_name
-  internal_project_name: ''
+  skip: true
 
 phpcs_tests:
   skip: true

diff --git a/.github/workflows/dispatch_dev_module.yml b/.github/workflows/dispatch_dev_module.yml
@@ -8,7 +8,7 @@ on:
         type: string
         required: true
         description: 'URL/PATH of the testplan to run'
-        default: '../testplans/oe_vcmsexamples.yml'
+        default: 'https://raw.githubusercontent.com/OXID-eSales/vcms-examples/b-7.1.x/.github/testplans/oe_vcmsexamples.yml'
       runs_on:
         type: string
         description: 'JSON string/array describing the runner'
@@ -29,4 +29,4 @@ jobs:
       CACHE_SECRET_KEY: ${{ secrets.CACHE_SECRET_KEY }}
       enterprise_github_token: ${{ secrets.enterprise_github_token }}
       SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
diff --git a/tests/Codeception/Acceptance/GoogleMapWidgetCest.php b/tests/Codeception/Acceptance/GoogleMapWidgetCest.php
@@ -14,7 +14,7 @@
 
 /**
  * @group oe_vcmsexamples
- * @group oe_vcmsexamples_widget_text
+ * @group oe_vcmsexamples_widget_googlemaps
  */
 final class GoogleMapWidgetCest
 {
@@ -30,9 +30,9 @@ public function testGoogleMapWidgetAdd(AdminAcceptanceTester $I): void
 
         $cmsTitle = 'Google Map Widget';
 
-		// @codingStandardsIgnoreStart
-		$link = 'https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d341751.4640925346!2d7.2344488890625!3d47.995675900000016!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x47911b61e3aab3d3%3A0x2739f5134e70bd9e!2sOXID%20eSales%20AG!5e0!3m2!1sen!2sde!4v1697029847015!5m2!1sen!2sde';
-		// @codingStandardsIgnoreEnd
+        // @codingStandardsIgnoreStart
+        $link = 'https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d341751.4640925346!2d7.2344488890625!3d47.995675900000016!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x47911b61e3aab3d3%3A0x2739f5134e70bd9e!2sOXID%20eSales%20AG!5e0!3m2!1sen!2sde!4v1697029847015!5m2!1sen!2sde';
+        // @codingStandardsIgnoreEnd
         $widgetData = [
             'height' => 400,
             'width' => 500,

diff --git a/tests/Codeception/Page/Widget/BaseWidget.php b/tests/Codeception/Page/Widget/BaseWidget.php
@@ -45,16 +45,4 @@ public function addContent(string $element, string $content): self
         return $this;
     }
 
-    /**
-     * @param string|array<string, string> $selector
-     */
-    protected function getSelectorByTheme($selector): string
-    {
-        return is_array($selector) ? $selector[$this->getTheme()] : $selector;
-    }
-
-    protected function getTheme(): string
-    {
-        return getenv('THEME_ID') ?: 'apex';
-    }
 }