kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 09:02:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

[Behat] Cure the build

Browse source
This commit is contained in:
Arminek 2016-11-17 09:57:25 +01:00
parent bea9153911
commit af826a4067
5 changed files with 1 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
features/taxonomy/managing_taxons/reordering_taxon.feature
View file

@ -15,10 +15,3 @@ Feature: Reordering taxons
Then I should see 4 taxons on the list
And I should see the taxon named "T-Shirts" in the list
But the first taxon on the list should be "Watches"
@ui @javascript
Scenario: Changing order of the taxons by dragging
When I want to see all taxons in store
And I move "Wallets" taxon before "T-shirts" taxon
Then I should see 4 taxons on the list
And they should have order like "Wallets", "T-Shirts", "Watches" and "Belts"

8
src/Sylius/Behat/Context/Ui/Admin/ManagingTaxonsContext.php
View file

@ -181,14 +181,6 @@ final class ManagingTaxonsContext implements Context
$this->createPage->moveUp($taxon);
}
/**
* @When /^I move ("[^"]+" taxon) before ("[^"]+" taxon)$/
*/
public function iMoveTaxonBeforeTaxon(TaxonInterface $taxonToMove, TaxonInterface $targetTaxon)
{
$this->createPage->insertBefore($taxonToMove, $targetTaxon);
}
/**
* @Given /^I choose ("[^"]+" as a parent taxon)$/
*/

40
src/Sylius/Behat/Page/Admin/Taxon/CreatePage.php
View file

@ -156,30 +156,6 @@ class CreatePage extends BaseCreatePage implements CreatePageInterface
return $this->getLeaves($parentTaxon)[0]->getText();
}
/**
* {@inheritDoc}
*/
public function insertBefore(TaxonInterface $draggableTaxon, TaxonInterface $targetTaxon)
{
$seleniumDriver = $this->getSeleniumDriver();
$draggableTaxonLocator = sprintf('.item[data-id="%s"]', $draggableTaxon->getId());
$targetTaxonLocator = sprintf('.item[data-id="%s"]', $targetTaxon->getId());
$script = <<<JS
(function ($) {
$('$draggableTaxonLocator').simulate('drag-n-drop',{
dragTarget: $('$targetTaxonLocator'),
interpolation: {stepWidth: 10, stepDelay: 30}
});
})(jQuery);
JS;
$seleniumDriver->executeScript($script);
$this->getDocument()->waitFor(5, function () use ($draggableTaxonLocator) {
return !$this->getDocument()->find('css', $draggableTaxonLocator)->hasClass('dragging-started');
});
}
/**
* {@inheritdoc}
*/
@ -262,22 +238,6 @@ JS;
return end($items);
}
/**
* @return Selenium2Driver
*
* @throws UnsupportedDriverActionException
*/
private function getSeleniumDriver()
{
/** @var Selenium2Driver $driver */
$driver = $this->getDriver();
if (!$driver instanceof Selenium2Driver) {
throw new UnsupportedDriverActionException('This action is not supported by %s', $driver);
}
return $driver;
}
private function waitForSlugGenerationIfNecessary()
{
if ($this->getDriver() instanceof Selenium2Driver) {

6
src/Sylius/Behat/Page/Admin/Taxon/CreatePageInterface.php
View file

@ -98,12 +98,6 @@ interface CreatePageInterface extends BaseCreatePageInterface
*/
public function getFirstLeafName(TaxonInterface $parentTaxon = null);
/**
* @param TaxonInterface $draggableTaxon
* @param TaxonInterface $targetTaxon
*/
public function insertBefore(TaxonInterface $draggableTaxon, TaxonInterface $targetTaxon);
/**
* @param TaxonInterface|null $parentTaxon
*

5
src/Sylius/Bundle/AdminBundle/Gulpfile.js
View file

@ -24,10 +24,7 @@ var paths = {
'../ShippingBundle/Resources/public/js/**',
'../UiBundle/Resources/private/js/**',
'../UserBundle/Resources/public/js/sylius-user.js',
'Resources/private/js/**',
'../../../../node_modules/jquery-simulate-ext/libs/jquery.simulate.js',
'../../../../node_modules/jquery-simulate-ext/src/jquery.simulate.ext.js',
'../../../../node_modules/jquery-simulate-ext/src/jquery.simulate.drag-n-drop.js'
'Resources/private/js/**'
],
sass: [
'../UiBundle/Resources/private/sass/**'