Merge remote-tracking branch 'mavericks/MTA-3787' into develop
Conflicts: dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Login.php dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php
Showing
- dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/ConfigData.xml 15 additions, 0 deletions...ests/app/Magento/Braintree/Test/Repository/ConfigData.xml
- dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Login.php 4 additions, 2 deletions...l/tests/app/Magento/Checkout/Test/Block/Onepage/Login.php
- dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php 2 additions, 14 deletions...gento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php
- dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Invoices/Grid.php 4 additions, 1 deletion...les/Test/Block/Adminhtml/Order/View/Tab/Invoices/Grid.php
- dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceStatusInOrdersGrid.php 53 additions, 0 deletions...Sales/Test/Constraint/AssertInvoiceStatusInOrdersGrid.php
- dev/tests/functional/tests/app/Magento/Sales/Test/etc/di.xml 5 additions, 0 deletionsdev/tests/functional/tests/app/Magento/Sales/Test/etc/di.xml
Please register or sign in to comment