diff --git a/features/checkout/prices_get_updated_throughout_checkout.feature b/features/checkout/prices_get_updated_throughout_checkout.feature index 0e40e4bd21..72df3782c3 100644 --- a/features/checkout/prices_get_updated_throughout_checkout.feature +++ b/features/checkout/prices_get_updated_throughout_checkout.feature @@ -27,7 +27,7 @@ Feature: Prices get updated when exchange rate changes during the whole checkout And I specified the shipping address as "Ankh Morpork", "Frost Alley", "90210", "United States" for "Jon Snow" Then the subtotal of "The Pug Mug" item should be "£50.00" - @ui @javascript + @ui Scenario: Prices get updated on readdressing Given I specified the shipping address as "Ankh Morpork", "Frost Alley", "90210", "United States" for "Jon Snow" When the exchange rate for currency "GBP" was changed to 3.00 @@ -42,7 +42,7 @@ Feature: Prices get updated when exchange rate changes during the whole checkout And I complete the shipping step Then the subtotal of "The Pug Mug" item should be "£20.00" - @ui @javascript + @ui Scenario: Prices get updated on re-selecting shipping step Given I specified the shipping address as "Ankh Morpork", "Frost Alley", "90210", "United States" for "Jon Snow" And I have selected "Pigeon Mail" shipping method @@ -62,7 +62,7 @@ Feature: Prices get updated when exchange rate changes during the whole checkout Then the "The Pug Mug" product should have unit price "£20.00" And my order shipping should be "£10.00" - @ui @javascript + @ui Scenario: Prices get updated on re-selecting payment method step Given I specified the shipping address as "Ankh Morpork", "Frost Alley", "90210", "United States" for "Jon Snow" And I proceed order with "Pigeon Mail" shipping method and "Offline" payment diff --git a/features/promotion/applying_promotion_rules/reapplying_promotion_on_cart_change.feature b/features/promotion/applying_promotion_rules/reapplying_promotion_on_cart_change.feature index 0408723491..cf910dcc87 100644 --- a/features/promotion/applying_promotion_rules/reapplying_promotion_on_cart_change.feature +++ b/features/promotion/applying_promotion_rules/reapplying_promotion_on_cart_change.feature @@ -21,7 +21,7 @@ Feature: Reapplying promotion on cart change And there should be no shipping fee And there should be no discount - @ui @javascript + @ui Scenario: Receiving discount on shipping after shipping method change Given the store has "DHL" shipping method with "$10.00" fee And the store has "FedEx" shipping method with "$30.00" fee diff --git a/features/shipping/applying_shipping_fee/applying_correct_shipping_fee_on_order.feature b/features/shipping/applying_shipping_fee/applying_correct_shipping_fee_on_order.feature index 76df3144c5..a5a17b3a46 100644 --- a/features/shipping/applying_shipping_fee/applying_correct_shipping_fee_on_order.feature +++ b/features/shipping/applying_shipping_fee/applying_correct_shipping_fee_on_order.feature @@ -18,7 +18,7 @@ Feature: Apply correct shipping fee on order Then my cart total should be "$110.00" And my cart shipping total should be "$10.00" - @ui @javascript + @ui Scenario: Changing shipping fee after shipping method change Given I have product "PHP T-Shirt" in the cart And I chose "DHL" shipping method diff --git a/tests/Controller/CheckoutReaddressingApiTest.php b/tests/Controller/CheckoutReaddressingApiTest.php deleted file mode 100644 index 3b3e7b65b9..0000000000 --- a/tests/Controller/CheckoutReaddressingApiTest.php +++ /dev/null @@ -1,77 +0,0 @@ - - */ -final class CheckoutReaddressingApiTest extends CheckoutApiTestCase -{ - /** - * @test - */ - public function it_denies_order_readdressing_for_non_authenticated_user() - { - $this->client->request('PUT', '/api/checkouts/readdress/1'); - - $response = $this->client->getResponse(); - $this->assertResponse($response, 'authentication/access_denied_response', Response::HTTP_UNAUTHORIZED); - } - - /** - * @test - */ - public function it_does_not_allow_to_readdress_unexisting_order() - { - $this->loadFixturesFromFile('authentication/api_administrator.yml'); - - $this->client->request('PUT', '/api/checkouts/readdress/1', [], [], static::$authorizedHeaderWithContentType); - - $response = $this->client->getResponse(); - $this->assertResponseCode($response, Response::HTTP_NOT_FOUND); - } - - /** - * @test - */ - public function it_does_not_allow_to_readdress_order_that_is_not_addressed() - { - $this->loadFixturesFromFile('authentication/api_administrator.yml'); - $checkoutData = $this->loadFixturesFromFile('resources/checkout.yml'); - - $url = sprintf('/api/checkouts/readdress/%d', $checkoutData['order1']->getId()); - $this->client->request('PUT', $url, [], [], static::$authorizedHeaderWithContentType); - - $response = $this->client->getResponse(); - $this->assertResponseCode($response, Response::HTTP_BAD_REQUEST); - } - - /** - * @test - */ - public function it_allows_to_readdress_addressed_order() - { - $this->loadFixturesFromFile('authentication/api_administrator.yml'); - $checkoutData = $this->loadFixturesFromFile('resources/checkout.yml'); - - $orderId = $checkoutData['order1']->getId(); - $this->addressOrder($orderId); - - $url = sprintf('/api/checkouts/readdress/%d', $orderId); - $this->client->request('PUT', $url, [], [], static::$authorizedHeaderWithContentType); - - $response = $this->client->getResponse(); - $this->assertResponse($response, 'checkout/readdressing_response', Response::HTTP_OK); - } -} diff --git a/tests/Controller/CheckoutReselectingPaymentApiTest.php b/tests/Controller/CheckoutReselectingPaymentApiTest.php deleted file mode 100644 index 182dabf48d..0000000000 --- a/tests/Controller/CheckoutReselectingPaymentApiTest.php +++ /dev/null @@ -1,82 +0,0 @@ - - */ -final class CheckoutPaymentShippingApiTest extends CheckoutApiTestCase -{ - /** - * @test - */ - public function it_denies_reselecting_order_payment_for_non_authenticated_user() - { - $this->client->request('PUT', '/api/checkouts/reselect-payment/1'); - - $response = $this->client->getResponse(); - $this->assertResponse($response, 'authentication/access_denied_response', Response::HTTP_UNAUTHORIZED); - } - - /** - * @test - */ - public function it_does_not_allow_to_reselect_paymeny_of_unexisting_order() - { - $this->loadFixturesFromFile('authentication/api_administrator.yml'); - - $this->client->request('PUT', '/api/checkouts/reselect-payment/1', [], [], static::$authorizedHeaderWithContentType); - - $response = $this->client->getResponse(); - $this->assertResponseCode($response, Response::HTTP_NOT_FOUND); - } - - /** - * @test - */ - public function it_does_not_allow_to_reselect_payment_of_order_that_has_no_payment_method_selected() - { - $this->loadFixturesFromFile('authentication/api_administrator.yml'); - $checkoutData = $this->loadFixturesFromFile('resources/checkout.yml'); - - $orderId = $checkoutData['order1']->getId(); - $this->addressOrder($orderId); - - $url = sprintf('/api/checkouts/reselect-payment/%d', $orderId); - $this->client->request('PUT', $url, [], [], static::$authorizedHeaderWithContentType); - - $response = $this->client->getResponse(); - $this->assertResponseCode($response, Response::HTTP_BAD_REQUEST); - } - - /** - * @test - */ - public function it_allows_to_reselect_paymeny_of_order_with_paymeny_method_selected() - { - $this->loadFixturesFromFile('authentication/api_administrator.yml'); - $checkoutData = $this->loadFixturesFromFile('resources/checkout.yml'); - - $orderId = $checkoutData['order1']->getId(); - $this->addressOrder($orderId); - $this->selectOrderShippingMethod($orderId, $checkoutData['ups']->getId()); - $this->selectOrderPaymentMethod($orderId, $checkoutData['cash_on_delivery']->getId()); - - $url = sprintf('/api/checkouts/reselect-payment/%d', $orderId); - $this->client->request('PUT', $url, [], [], static::$authorizedHeaderWithContentType); - - $response = $this->client->getResponse(); - $this->assertResponse($response, 'checkout/reselect_payment_response', Response::HTTP_OK); - } -} diff --git a/tests/Controller/CheckoutReselectingShippingApiTest.php b/tests/Controller/CheckoutReselectingShippingApiTest.php deleted file mode 100644 index 19a83bc4b2..0000000000 --- a/tests/Controller/CheckoutReselectingShippingApiTest.php +++ /dev/null @@ -1,81 +0,0 @@ - - */ -final class CheckoutReselectingShippingApiTest extends CheckoutApiTestCase -{ - /** - * @test - */ - public function it_denies_reselecting_order_shipping_for_non_authenticated_user() - { - $this->client->request('PUT', '/api/checkouts/reselect-shipping/1'); - - $response = $this->client->getResponse(); - $this->assertResponse($response, 'authentication/access_denied_response', Response::HTTP_UNAUTHORIZED); - } - - /** - * @test - */ - public function it_does_not_allow_to_reselect_shipping_of_unexisting_order() - { - $this->loadFixturesFromFile('authentication/api_administrator.yml'); - - $this->client->request('PUT', '/api/checkouts/reselect-shipping/1', [], [], static::$authorizedHeaderWithContentType); - - $response = $this->client->getResponse(); - $this->assertResponseCode($response, Response::HTTP_NOT_FOUND); - } - - /** - * @test - */ - public function it_does_not_allow_to_reselect_shipping_of_order_that_has_no_shipment_method_selected() - { - $this->loadFixturesFromFile('authentication/api_administrator.yml'); - $checkoutData = $this->loadFixturesFromFile('resources/checkout.yml'); - - $orderId = $checkoutData['order1']->getId(); - $this->addressOrder($orderId); - - $url = sprintf('/api/checkouts/reselect-shipping/%d', $orderId); - $this->client->request('PUT', $url, [], [], static::$authorizedHeaderWithContentType); - - $response = $this->client->getResponse(); - $this->assertResponseCode($response, Response::HTTP_BAD_REQUEST); - } - - /** - * @test - */ - public function it_allows_to_reselect_shipping_of_order_with_shipment_method_selected() - { - $this->loadFixturesFromFile('authentication/api_administrator.yml'); - $checkoutData = $this->loadFixturesFromFile('resources/checkout.yml'); - - $orderId = $checkoutData['order1']->getId(); - $this->addressOrder($orderId); - $this->selectOrderShippingMethod($orderId, $checkoutData['ups']->getId()); - - $url = sprintf('/api/checkouts/reselect-shipping/%d', $orderId); - $this->client->request('PUT', $url, [], [], static::$authorizedHeaderWithContentType); - - $response = $this->client->getResponse(); - $this->assertResponse($response, 'checkout/reselect_shipping_response', Response::HTTP_OK); - } -}