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 5

Revert "[Behat] Remove js requirement for bulk delete scenarios"

Browse source 
This reverts commit 4013e51dfd.
This commit is contained in:
Destiny 2020-08-02 22:11:42 +02:00 • committed by Łukasz Chruściel
parent 4f4f6fe580
commit cb044e3115
No known key found for this signature in database
GPG key ID: 428B9D810DB2ACDF
20 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
features/channel/managing_channels/deleting_multiple_channels.feature
View file

@ -10,7 +10,7 @@ Feature: Deleting multiple channels
And the store operates on another channel named "DE Store"
And I am logged in as an administrator
@ui
@ui @javascript
Scenario: Deleting multiple channels at once
When I browse channels
And I check the "PL Store" channel

2
features/currency/managing_exchange_rates/deleting_multiple_exchange_rates.feature
View file

@ -11,7 +11,7 @@ Feature: Deleting multiple exchange rates
And the exchange rate of "Polish Zloty" to "Euro" is 0.22
And I am logged in as an administrator
@ui
@ui @javascript
Scenario: Deleting multiple exchange rates at once
When I browse exchange rates
And I check the exchange rate between "Euro" and "British Pound"

2
features/payment/managing_payment_methods/deleting_multiple_payment_methods.feature
View file

@ -10,7 +10,7 @@ Feature: Deleting multiple payment methods
And the store has also a payment method "PayPal Express Checkout" with a code "paypal" and Paypal Express Checkout gateway
And I am logged in as an administrator
@ui
@ui @javascript
Scenario: Deleting multiple payment methods at once
When I browse payment methods
And I check the "Offline" payment method

2
features/product/managing_product_attributes/deleting_multiple_product_attributes.feature
View file

@ -10,7 +10,7 @@ Feature: Deleting multiple product attributes
And the store has a integer product attribute "Pages"
And I am logged in as an administrator
@ui
@ui @javascript
Scenario: Deleting multiple product attributes at once
When I browse product attributes
And I check the "Publisher" product attribute

2
features/product/managing_product_options/deleting_multiple_product_options.feature
View file

@ -10,7 +10,7 @@ Feature: Deleting multiple product options
And the store has also a product option "T-Shirt brand"
And I am logged in as an administrator
@ui
@ui @javascript
Scenario: Deleting multiple product options at once
When I browse product options
And I check the "T-Shirt size" product option

2
features/product/managing_product_reviews/deleting_multiple_product_reviews.feature
View file

@ -11,7 +11,7 @@ Feature: Deleting multiple product reviews
And this product has also a review titled "Cool" and rated 4 with a comment "Quite cool" added by customer "aquaman@dc.com"
And I am logged in as an administrator
@ui
@ui @javascript
Scenario: Deleting multiple product reviews at once
When I browse product reviews
And I check the "Awesome" product review

2
features/product/managing_product_variants/deleting_multiple_product_variants.feature
View file

@ -10,7 +10,7 @@ Feature: Deleting multiple product variants
And this product has "Small PHP Mug", "Medium PHP Mug" and "Big PHP Mug" variants
And I am logged in as an administrator
@ui
@ui @javascript
Scenario: Deleting multiple product variants at once
When I browse variants of this product
And I check the "Small PHP Mug" product variant

2
features/product/managing_products/deleting_multiple_products.feature
View file

@ -8,7 +8,7 @@ Feature: Deleting multiple products
Given the store has "Audi RS5 model", "Audi RS6 model" and "Audi RS7 model" products
And I am logged in as an administrator
@ui
@ui @javascript
Scenario: Deleting multiple products at once
When I browse products
And I check the "Audi RS5 model" product

2
features/promotion/managing_coupons/deleting_multiple_coupons.feature
View file

@ -10,7 +10,7 @@ Feature: Deleting multiple coupons
And this promotion has "SANTA1", "SANTA2" and "SANTA3" coupons
And I am logged in as an administrator
@ui
@ui @javascript
Scenario: Deleting multiple coupons at once
When I browse coupons of this promotion
And I check the "SANTA1" coupon

2
features/promotion/managing_promotions/deleting_multiple_promotions.feature
View file

@ -11,7 +11,7 @@ Feature: Deleting multiple promotions
And there is also a promotion "Easter sale"
And I am logged in as an administrator
@ui
@ui @javascript
Scenario: Deleting multiple promotions at once
When I browse promotions
And I check the "Christmas sale" promotion

2
features/shipping/managing_shipping_categories/deleting_multiple_shipping_categories.feature
View file

@ -9,7 +9,7 @@ Feature: Deleting multiple shipping categories
And the store has "Big" and "Small" shipping category
And I am logged in as an administrator
@ui
@ui @javascript
Scenario: Deleting multiple shipping categories at once
When I browse shipping categories
And I check the "Big" shipping category

2
features/shipping/managing_shipping_methods/deleting_multiple_shipping_methods.feature
View file

@ -9,7 +9,7 @@ Feature: Deleting multiple shipping methods
And the store allows shipping with "UPS", "FedEx" and "DHL"
And I am logged in as an administrator
@ui
@ui @javascript
Scenario: Deleting multiple shipping methods at once
When I browse shipping methods
And I check the "UPS" shipping method

2
features/taxation/managing_tax_categories/deleting_multiple_tax_categories.feature
View file

@ -8,7 +8,7 @@ Feature: Deleting multiple tax categories
Given the store has tax categories "Alcohol", "Food" and "Books"
And I am logged in as an administrator
@ui
@ui @javascript
Scenario: Deleting multiple tax categories at once
When I browse tax categories
And I check the "Alcohol" tax category

2
features/taxation/managing_tax_rates/deleting_multiple_tax_rates.feature
View file

@ -11,7 +11,7 @@ Feature: Deleting multiple tax rates
And the store has "High VAT" tax rate of 40% for "Food" for the rest of the world
And I am logged in as an administrator
@ui
@ui @javascript
Scenario: Deleting multiple tax rates at once
When I browse tax rates
And I check the "Low VAT" tax rate

2
features/user/managing_administrators/deleting_multiple_administrators.feature
View file

@ -10,7 +10,7 @@ Feature: Deleting multiple administrators
And there is also an administrator "watermelon@example.com"
And I am logged in as "watermelon@example.com" administrator
@ui
@ui @javascript
Scenario: Deleting multiple administrators at once
Given I browse administrators
And I check the "banana@example.com" administrator

2
features/user/managing_customer_groups/deleting_multiple_customer_groups.feature
View file

@ -8,7 +8,7 @@ Feature: Deleting multiple customer groups
Given the store has customer groups "Retail", "Wholesale" and "General"
And I am logged in as an administrator
@ui
@ui @javascript
Scenario: Deleting multiple customer groups at once
When I browse customer groups
And I check the "Retail" customer group

5
src/Sylius/Behat/Page/Admin/Crud/IndexPage.php
View file

@ -13,7 +13,6 @@ declare(strict_types=1);
namespace Sylius\Behat\Page\Admin\Crud;
use Behat\Mink\Driver\Selenium2Driver;
use Behat\Mink\Element\NodeElement;
use Behat\Mink\Exception\ElementNotFoundException;
use Behat\Mink\Session;
@ -138,9 +137,7 @@ class IndexPage extends SymfonyPage implements IndexPageInterface
public function bulkDelete(): void
{
$this->getElement('bulk_actions')->pressButton('Delete');
if ($this->getDriver() instanceof Selenium2Driver || $this->getDriver() instanceof ChromeDriver) {
$this->getElement('confirmation_button')->click();
}
$this->getElement('confirmation_button')->click();
}
public function sort(string $order): void

4
src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-bulk-action-require-confirmation.js
View file

@ -27,6 +27,10 @@ $.fn.extend({
event.preventDefault();
const form = actionButton.closest('form');
$('input.bulk-select-checkbox:checked').each((index, element) => {
$(`<input type="hidden" name="ids[]" value="${element.value}">`).appendTo(form);
});
form.submit();
});
}

2
src/Sylius/Bundle/UiBundle/Resources/views/Macro/buttons.html.twig
View file

@ -62,7 +62,7 @@
{% endmacro %}
{% macro bulkDelete(url, message, labeled = true) %}
<form action="{{ url }}" method="post" id="bulk-delete">
<form action="{{ url }}" method="post">
<input type="hidden" name="_method" value="DELETE">
<button class="ui red {% if labeled %}labeled {% endif %}icon button" type="submit" data-bulk-action-requires-confirmation disabled>
<i class="icon trash"></i> {{ ((message is empty and labeled) ? 'sylius.ui.delete' : message)|trans }}

2
src/Sylius/Bundle/UiBundle/Resources/views/Macro/table.html.twig
View file

@ -24,7 +24,7 @@
{% macro row(grid, definition, row) %}
<tr class="item" {{ sylius_test_html_attribute('row') }}>
{% if definition.actionGroups.bulk is defined and definition.getEnabledActions('bulk')|length > 0 %}
<td class="center aligned"><input class="bulk-select-checkbox" form="bulk-delete" type="checkbox" name="ids[]" value="{{ row.id }}" /></td>
<td class="center aligned"><input class="bulk-select-checkbox" type="checkbox" value="{{ row.id }}" /></td>
{% endif %}
{% for field in definition.enabledFields|sort_by('position') %}
<td>{{ sylius_grid_render_field(grid, field, row) }}</td>