[Behat] Adapted tests

features/personas/AddLocation.feature

@@ -7,6 +7,7 @@ Feature: Verify that an Editor with Content Type limitation on content/create po
     And I log in as "Add" with password "Passw0rd-42"
     And I go to "Content structure" in "Content" tab
     And I navigate to content "NewArticle" of type "Article" in root
+    And I am using the DXP in "Expert" mode
     When I switch to "Locations" tab in Content structure
     And I add a new Location under "root/Destination"
     Then there exists Content view Page for "root/Destination/NewArticle"

phpstan-baseline.neon

@@ -1750,11 +1750,6 @@ parameters:
 			count: 1
 			path: src/lib/Behat/BrowserContext/ContentViewContext.php
 
-		-
-			message: "#^Property Ibexa\\\\AdminUi\\\\Behat\\\\BrowserContext\\\\ContentViewContext\\:\\:\\$universalDiscoveryWidget is never read, only written\\.$#"
-			count: 1
-			path: src/lib/Behat/BrowserContext/ContentViewContext.php
-
 		-
 			message: "#^Method Ibexa\\\\AdminUi\\\\Behat\\\\BrowserContext\\\\LanguageContext\\:\\:deleteLanguageNamed\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -3035,21 +3030,11 @@ parameters:
 			count: 1
 			path: src/lib/Behat/Page/ContentViewPage.php
 
-		-
-			message: "#^Property Ibexa\\\\AdminUi\\\\Behat\\\\Page\\\\ContentViewPage\\:\\:\\$contentUpdatePage is never read, only written\\.$#"
-			count: 1
-			path: src/lib/Behat/Page/ContentViewPage.php
-
 		-
 			message: "#^Property Ibexa\\\\AdminUi\\\\Behat\\\\Page\\\\ContentViewPage\\:\\:\\$route has no type specified\\.$#"
 			count: 1
 			path: src/lib/Behat/Page/ContentViewPage.php
 
-		-
-			message: "#^Property Ibexa\\\\AdminUi\\\\Behat\\\\Page\\\\ContentViewPage\\:\\:\\$userUpdatePage is never read, only written\\.$#"
-			count: 1
-			path: src/lib/Behat/Page/ContentViewPage.php
-
 		-
 			message: "#^Method Ibexa\\\\AdminUi\\\\Behat\\\\Page\\\\DashboardPage\\:\\:editDraft\\(\\) has no return type specified\\.$#"
 			count: 1

src/lib/Behat/BrowserContext/ContentViewContext.php

@@ -11,33 +11,27 @@
 use Behat\Behat\Context\Context;
 use Behat\Gherkin\Node\TableNode;
 use Ibexa\AdminUi\Behat\Component\DraftConflictDialog;
-use Ibexa\AdminUi\Behat\Component\UniversalDiscoveryWidget;
 use Ibexa\AdminUi\Behat\Page\ContentViewPage;
 use Ibexa\Behat\Core\Behat\ArgumentParser;
 use PHPUnit\Framework\Assert;
 
-class ContentViewContext implements Context
+final class ContentViewContext implements Context
 {
     private $argumentParser;
 
     /** @var \Ibexa\AdminUi\Behat\Page\ContentViewPage */
     private $contentViewPage;
 
-    /** @var \Ibexa\AdminUi\Behat\Component\UniversalDiscoveryWidget */
-    private $universalDiscoveryWidget;
-
     /** @var \Ibexa\AdminUi\Behat\Component\DraftConflictDialog */
     private $draftConflictDialog;
 
     public function __construct(
         ArgumentParser $argumentParser,
         ContentViewPage $contentViewPage,
-        UniversalDiscoveryWidget $universalDiscoveryWidget,
         DraftConflictDialog $draftConflictDialog
     ) {
         $this->argumentParser = $argumentParser;
         $this->contentViewPage = $contentViewPage;
-        $this->universalDiscoveryWidget = $universalDiscoveryWidget;
         $this->draftConflictDialog = $draftConflictDialog;
     }
 
@@ -50,6 +44,15 @@ public function startCreatingContent(string $contentType, string $language = nul
         $this->contentViewPage->startCreatingContent($contentType, $language);
     }
 
+    /**
+     * @Given I am using the DXP in :mode mode
+     */
+    public function switchToUserMode(string $mode): void
+    {
+        $this->contentViewPage->switchToUserMode($mode);
+        $this->contentViewPage->verifyIsLoaded();
+    }
+
     /**
      * @Given I switch to :tab tab in Content structure
      */

src/lib/Behat/Component/UpperMenu.php

@@ -11,9 +11,12 @@
 use Ibexa\Behat\Browser\Component\Component;
 use Ibexa\Behat\Browser\Element\Criterion\ElementTextCriterion;
 use Ibexa\Behat\Browser\Locator\VisibleCSSLocator;
+use PHPUnit\Framework\Assert;
 
 class UpperMenu extends Component
 {
+    private const USER_MODES = ['Smart', 'Expert'];
+
     public function goToDashboard(): void
     {
         $this->getHTMLPage()->find($this->getLocator('dashboardLink'))->click();
@@ -44,6 +47,37 @@ public function chooseFromUserDropdown(string $option): void
         $this->getHTMLPage()->findAll($this->getLocator('userSettingsItem'))->getByCriterion(new ElementTextCriterion($option))->click();
     }
 
+    public function switchToUserMode(string $newMode): void
+    {
+        $this->getHTMLPage()->find($this->getLocator('userSettingsToggle'))->click();
+
+        $currentMode = explode(
+            ' ',
+            $this->getHTMLPage()->find($this->getLocator('userMode'))->getText()
+        )[0];
+
+        if (strtolower($newMode) === strtolower($currentMode)) {
+            $this->getHTMLPage()->find($this->getLocator('userMode'))->click();
+        } else {
+            $this->getHTMLPage()->find($this->getLocator('userSettingsToggle'))->click();
+        }
+    }
+
+    public function getCurrentUserMode(): string
+    {
+        $this->getHTMLPage()->find($this->getLocator('userSettingsToggle'))->click();
+
+        $mode = explode(
+            ' ',
+            $this->getHTMLPage()->find($this->getLocator('userMode'))->getText()
+        )[0];
+        Assert::assertContains($mode, self::USER_MODES);
+
+        $this->getHTMLPage()->find($this->getLocator('userSettingsToggle'))->click();
+
+        return $mode;
+    }
+
     public function verifyIsLoaded(): void
     {
         $this->getHTMLPage()->find($this->getLocator('userSettingsToggle'))->assert()->isVisible();
@@ -59,6 +93,7 @@ protected function specifyLocators(): array
             new VisibleCSSLocator('userSettingsItem', '.ibexa-popup-menu__item'),
             new VisibleCSSLocator('searchInput', '.ibexa-main-header #search_query'),
             new VisibleCSSLocator('searchButton', '.ibexa-main-header .ibexa-input-text-wrapper__action-btn--search'),
+            new VisibleCSSLocator('userMode', '[name="user_mode_change"] .ibexa-toggle__label'),
         ];
     }
 }

src/lib/Behat/Page/ContentViewPage.php

@@ -19,6 +19,7 @@
 use Ibexa\AdminUi\Behat\Component\SubItemsList;
 use Ibexa\AdminUi\Behat\Component\TranslationDialog;
 use Ibexa\AdminUi\Behat\Component\UniversalDiscoveryWidget;
+use Ibexa\AdminUi\Behat\Component\UpperMenu;
 use Ibexa\Behat\Browser\Element\Condition\ElementExistsCondition;
 use Ibexa\Behat\Browser\Element\Criterion\ElementTextCriterion;
 use Ibexa\Behat\Browser\Locator\VisibleCSSLocator;
@@ -44,9 +45,6 @@ class ContentViewPage extends Page
     /** @var \Ibexa\AdminUi\Behat\Component\ContentTypePicker */
     private $contentTypePicker;
 
-    /** @var ContentUpdateItemPage */
-    private $contentUpdatePage;
-
     /** @var string */
     private $expectedContentType;
 
@@ -70,9 +68,6 @@ class ContentViewPage extends Page
     /** @var \Ibexa\AdminUi\Behat\Component\ContentItemAdminPreview */
     private $contentItemAdminPreview;
 
-    /** @var \Ibexa\AdminUi\Behat\Page\UserUpdatePage */
-    private $userUpdatePage;
-
     /** @var \Ibexa\Contracts\Core\Repository\Repository */
     private $repository;
 
@@ -85,40 +80,39 @@ class ContentViewPage extends Page
     /** @var \Ibexa\AdminUi\Behat\Component\IbexaDropdown */
     private $ibexaDropdown;
 
+    private UpperMenu $upperMenu;
+
     public function __construct(
         Session $session,
         Router $router,
         ContentActionsMenu $contentActionsMenu,
         SubItemsList $subItemList,
         ContentTypePicker $contentTypePicker,
-        ContentUpdateItemPage $contentUpdatePage,
         LanguagePicker $languagePicker,
         Dialog $dialog,
         TranslationDialog $translationDialog,
         Repository $repository,
         Breadcrumb $breadcrumb,
         ContentItemAdminPreview $contentItemAdminPreview,
-        UserUpdatePage $userUpdatePage,
         ArgumentParser $argumentParser,
         UniversalDiscoveryWidget $universalDiscoveryWidget,
-        IbexaDropdown $ibexaDropdown
+        IbexaDropdown $ibexaDropdown,
+        UpperMenu $upperMenu
     ) {
         parent::__construct($session, $router);
-
         $this->contentActionsMenu = $contentActionsMenu;
         $this->subItemList = $subItemList;
         $this->contentTypePicker = $contentTypePicker;
-        $this->contentUpdatePage = $contentUpdatePage;
         $this->languagePicker = $languagePicker;
         $this->dialog = $dialog;
         $this->translationDialog = $translationDialog;
         $this->breadcrumb = $breadcrumb;
         $this->contentItemAdminPreview = $contentItemAdminPreview;
-        $this->userUpdatePage = $userUpdatePage;
         $this->repository = $repository;
         $this->argumentParser = $argumentParser;
         $this->universalDiscoveryWidget = $universalDiscoveryWidget;
         $this->ibexaDropdown = $ibexaDropdown;
+        $this->upperMenu = $upperMenu;
     }
 
     public function startCreatingContent(string $contentTypeName, string $language = null)
@@ -188,6 +182,29 @@ public function choosePreview(string $language): void
         $this->verifyIsLoaded();
     }
 
+    public function switchToUserMode(string $mode): void
+    {
+        $this->upperMenu->switchToUserMode($mode);
+
+        $expertModeTab = 'Technical Details';
+
+        if (strtolower($mode) === 'expert') {
+            $this->getHTMLPage()
+                ->setTimeout(3)
+                ->findAll($this->getLocator('tab'))
+                ->getByCriterion(new ElementTextCriterion($expertModeTab))
+                ->assert()
+                ->isVisible();
+        } else {
+            $this->getHTMLPage()
+                ->setTimeout(3)
+                ->findAll($this->getLocator('tab'))
+                ->filterBy(new ElementTextCriterion($expertModeTab))
+                ->assert()
+                ->isEmpty();
+        }
+    }
+
     public function goToSubItem(string $contentItemName): void
     {
         $this->switchToTab('Sub-items');