Merge pull request #33 from ibexa/merge-ibx-1070-added-fix-for-conten…

…tintegration

Merge IBX-1070 added fix for contentintegration

README.md

@@ -1,30 +1,22 @@
-# eZ Platform Admin UI
+# Ibexa Admin UI
 
-[![Build Status](https://img.shields.io/travis/ezsystems/ezplatform-admin-ui.svg?style=flat-square&branch=master)](https://travis-ci.org/ezsystems/ezplatform-admin-ui)
-[![Latest version](https://img.shields.io/github/release/ezsystems/ezplatform-admin-ui.svg?style=flat-square)](https://github.com/ezsystems/ezplatform-admin-ui/releases)
-[![License](https://img.shields.io/github/license/ezsystems/ezplatform-admin-ui.svg?style=flat-square)](LICENSE)
+This repository is dedicated to the Ibexa Admin UI Bundle, which contains all the necessary
+parts to run the [Ibexa DXP](https://developers.ibexa.co/) Back Office interface.
 
-This repository is dedicated to the eZ Platform Admin UI Bundle, which contains all the necessary
-parts to run the [eZ Platform](https://www.ezplatform.com/) administration interface (a.k.a. "back office").
+This package is part of [Ibexa DXP](https://ibexa.co).
+To use this package, [install Ibexa DXP](https://doc.ibexa.co/en/latest/install/).
 
-## Installation
+## Extending Back Office:
 
-This package is a part of [eZ Platform](https://github.com/ezsystems/ezplatform).
-Please see [the online docs](https://doc.ezplatform.com/en/latest/getting_started/install_ez_platform/) for the installation instructions.
-
-## How to extend Admin UI:
-- [General extensibility](https://doc.ezplatform.com/en/latest/guide/extending_ez_platform/).
-- [Extending Admin UI tutorial](https://doc.ezplatform.com/en/latest/tutorials/extending_admin_ui/extending_admin_ui/).
-
-## Issue tracker
-
-Submitting bugs, improvements and stories is possible on https://jira.ez.no/browse/EZP.
-If you discover a security issue, please see how to responsibly report such issues on https://doc.ezplatform.com/en/latest/guide/reporting_issues/.
+- [General extensibility](https://doc.ibexa.co/en/latest/extending/extending_back_office/).
+- [Extending Back Office tutorial](https://doc.ibexa.co/en/latest/tutorials/extending_admin_ui/extending_admin_ui//).
 
 ## COPYRIGHT
+
 Copyright (C) 1999-2021 Ibexa AS (formerly eZ Systems AS). All rights reserved.
 
 ## LICENSE
+
 This source code is available separately under the following licenses:
 
 A - Ibexa Business Use License Agreement (Ibexa BUL),
@@ -38,5 +30,4 @@ AND
 
 B - GNU General Public License, version 2
 Grants an copyleft open source license with ABSOLUTELY NO WARRANTY. For the full GPL license text, please see:
-https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-
+https://www.gnu.org/licenses/old-licenses/gpl-2.0.html

src/lib/Behat/Page/ContentTypeUpdatePage.php

@@ -12,7 +12,6 @@
 use Ibexa\Behat\Browser\Element\Criterion\ElementTextCriterion;
 use Ibexa\Behat\Browser\Element\Mapper\ElementTextMapper;
 use Ibexa\Behat\Browser\Locator\VisibleCSSLocator;
-use Ibexa\Behat\Browser\Locator\XPathLocator;
 
 class ContentTypeUpdatePage extends AdminUpdateItemPage
 {
@@ -49,8 +48,7 @@ public function specifyLocators(): array
             new VisibleCSSLocator('workspace', '#content_collapse > div.ibexa-collapse__body-content > div'),
             new VisibleCSSLocator('fieldDefinitionToggle', '.ibexa-collapse:nth-last-child(2) > div.ibexa-collapse__header > button:last-child:not([data-bs-target="#content_collapse"])'),
             new VisibleCSSLocator('fieldDefinitionOpenContainer', '[data-collapsed="false"] .ibexa-content-type-edit__field-definition-content'),
-            new XPathLocator('selectBlocksDropdown', '//div[contains(@class,"ez-page-select-items")]/a[contains(text(),"Select blocks")]'),
-            new XPathLocator('selectBlocksDropdownDefault', '//div[contains(@class,"ez-page-select-items__group")]/a[contains(text(),"default")]'),
+            new VisibleCSSLocator('selectBlocksDropdown', '.ez-page-select-items__toggler'),
         ]);
     }
 
@@ -105,8 +103,11 @@ public function selectContentTypeCategory(string $categoryName): void
 
     public function expandDefaultBlocksOption(): void
     {
-        $this->getHTMLPage()->find($this->getLocator('selectBlocksDropdown'))->click();
-        $this->getHTMLPage()->find($this->getLocator('selectBlocksDropdownDefault'))->click();
+        $dropdownLocator = $this->getLocator('selectBlocksDropdown');
+        $this->getHTMLPage()
+            ->findAll($dropdownLocator)->getByCriterion(new ElementTextCriterion('Select blocks'))->click();
+        $this->getHTMLPage()
+            ->findAll($dropdownLocator)->getByCriterion(new ElementTextCriterion('default'))->click();
     }
 
     public function selectBlock(string $blockName): void