diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json index 3567ec530f437996c0ed28d792ebd929d2188e0c..cfa06fbf60402c808778035c4b321f1404c384d3 100644 --- a/dev/tests/functional/composer.json +++ b/dev/tests/functional/composer.json @@ -1,6 +1,6 @@ { "require": { - "magento/mtf": "1.0.0-rc51", + "magento/mtf": "1.0.0-rc52", "php": "~5.6.5|7.0.2|~7.0.6", "phpunit/phpunit": "~4.8.0|~5.5.0", "phpunit/phpunit-selenium": ">=1.2" diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWithPaypalStep.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWithPaypalStep.php index 93b4ae77e7cbfcff418d7e186bfffc7a5fd266b6..f538052808a80dde216fb37f620b898933e31460 100644 --- a/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWithPaypalStep.php +++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/PlaceOrderWithPaypalStep.php @@ -81,7 +81,7 @@ class PlaceOrderWithPaypalStep implements TestStepInterface * @param CheckoutOnepageSuccess $checkoutOnepageSuccess * @param FixtureFactory $fixtureFactory * @param array $products - * @param array|null $prices + * @param array $prices * @param OrderInjectable|null $order */ public function __construct( diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/PlaceOrderStep.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/PlaceOrderStep.php index 7da3383014c28479e5a9b42b09c195343f2f74c6..a56f98b802306f1b8cad202bc07278d96c9a99e6 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/PlaceOrderStep.php +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/PlaceOrderStep.php @@ -72,26 +72,26 @@ class PlaceOrderStep implements TestStepInterface * @param AssertGrandTotalOrderReview $assertGrandTotalOrderReview * @param CheckoutOnepageSuccess $checkoutOnepageSuccess * @param FixtureFactory $fixtureFactory + * @param array $products + * @param array $prices * @param OrderInjectable|null $order - * @param array|null $products - * @param array|null $prices */ public function __construct( CheckoutOnepage $checkoutOnepage, AssertGrandTotalOrderReview $assertGrandTotalOrderReview, CheckoutOnepageSuccess $checkoutOnepageSuccess, FixtureFactory $fixtureFactory, - OrderInjectable $order = null, array $products = [], - array $prices = [] + array $prices = [], + OrderInjectable $order = null ) { $this->checkoutOnepage = $checkoutOnepage; $this->assertGrandTotalOrderReview = $assertGrandTotalOrderReview; $this->checkoutOnepageSuccess = $checkoutOnepageSuccess; $this->fixtureFactory = $fixtureFactory; - $this->order = $order; $this->products = $products; $this->prices = $prices; + $this->order = $order; } /** diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Repository/OrderInjectable/Price.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Repository/OrderInjectable/Price.xml index 8c3f31343a9184e05cb5c26f490b8807b417a06b..be727952f420ba35c47b51b98d2f8bb777fefc33 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/Repository/OrderInjectable/Price.xml +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Repository/OrderInjectable/Price.xml @@ -66,8 +66,12 @@ </dataset> <dataset name="full_flow"> + <field name="refund" xsi:type="array"> + <item name="0" xsi:type="array"> + <item name="grand_creditmemo_total" xsi:type="string">565</item> + </item> + </field> <field name="0" xsi:type="array"> - <item name="grand_creditmemo_total" xsi:type="string">565</item> <item name="grand_invoice_total" xsi:type="string">565</item> <item name="grand_order_total" xsi:type="string">565</item> </field> diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php index 3390d579cc3a712fb283ecc95717f64df71abbf9..3967b6571baa6fb2255b4629db9b89ada1e5d04c 100644 --- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php +++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php @@ -61,6 +61,7 @@ class SubmitOrderStep implements TestStepInterface private $products; /** + * @constructor * @param OrderCreateIndex $orderCreateIndex * @param SalesOrderView $salesOrderView * @param FixtureFactory $fixtureFactory @@ -80,7 +81,6 @@ class SubmitOrderStep implements TestStepInterface $this->salesOrderView = $salesOrderView; $this->fixtureFactory = $fixtureFactory; $this->customer = $customer; - $this->products = $products; $this->billingAddress = $billingAddress; $this->products = $products; }