kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 17:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch '1.11'

Browse source 
* 1.11:
  Fix @javascript scenarios about channels menu taxon
This commit is contained in:
Łukasz Chruściel 2022-06-22 15:11:10 +02:00
commit d058f34449
No known key found for this signature in database
GPG key ID: 049A1D51AA3B039C
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Sylius/Behat/Page/Admin/Channel/UpdatePage.php
View file

@ -13,7 +13,9 @@ declare(strict_types=1);
namespace Sylius\Behat\Page\Admin\Channel; namespace Sylius\Behat\Page\Admin\Channel;
use Behat\Mink\Driver\Selenium2Driver;
use Behat\Mink\Element\NodeElement; use Behat\Mink\Element\NodeElement;
use DMore\ChromeDriver\ChromeDriver;
use Sylius\Behat\Behaviour\ChecksCodeImmutability; use Sylius\Behat\Behaviour\ChecksCodeImmutability;
use Sylius\Behat\Behaviour\Toggles; use Sylius\Behat\Behaviour\Toggles;
use Sylius\Behat\Page\Admin\Crud\UpdatePage as BaseUpdatePage; use Sylius\Behat\Page\Admin\Crud\UpdatePage as BaseUpdatePage;
@ -97,7 +99,18 @@ class UpdatePage extends BaseUpdatePage implements UpdatePageInterface
public function getMenuTaxon(): string public function getMenuTaxon(): string
{ {
return $this->getElement('menu_taxon')->getParent()->find('css', '.search > .text')->getText(); $element = $this->getElement('menu_taxon');
if (
$this->getDriver() instanceof Selenium2Driver ||
$this->getDriver() instanceof ChromeDriver
) {
$this->getDocument()->waitFor(1, function () use ($element) {
return $element->getText() !== '';
});
}
return $element->getText();
} }
public function getUsedTheme(): string public function getUsedTheme(): string
@ -125,7 +138,7 @@ class UpdatePage extends BaseUpdatePage implements UpdatePageInterface
'default_tax_zone' => '#sylius_channel_defaultTaxZone', 'default_tax_zone' => '#sylius_channel_defaultTaxZone',
'enabled' => '#sylius_channel_enabled', 'enabled' => '#sylius_channel_enabled',
'locales' => '#sylius_channel_locales', 'locales' => '#sylius_channel_locales',
'menu_taxon' => '#sylius_channel_menuTaxon', 'menu_taxon' => '#sylius_channel_menuTaxon ~ .text',
'name' => '#sylius_channel_name', 'name' => '#sylius_channel_name',
'tax_calculation_strategy' => '#sylius_channel_taxCalculationStrategy', 'tax_calculation_strategy' => '#sylius_channel_taxCalculationStrategy',
]); ]);