diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote.php b/app/code/Magento/Quote/Model/ResourceModel/Quote.php
index 72172c128c58c2cc24b5852c30999e0ba78f6d0a..6113a1ba56ac184d59a6d0e37bd696455dce31cd 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote.php
@@ -173,7 +173,8 @@ class Quote extends AbstractDb
}
/**
- * Check is order increment id use in sales/order table
+ * Check if order increment ID is already used.
+ * Method can be used to avoid collisions of order IDs.
*
* @param int $orderIncrementId
* @return bool
diff --git a/app/code/Magento/Quote/Test/Unit/Model/ResourceModel/QuoteTest.php b/app/code/Magento/Quote/Test/Unit/Model/ResourceModel/QuoteTest.php
index 102e3471063f1352fa56001e8bc3f54b13d58ded..15c58073c2e26a4921f771e6c4097fafc9275c91 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/ResourceModel/QuoteTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/ResourceModel/QuoteTest.php
@@ -6,7 +6,6 @@
namespace Magento\Quote\Test\Unit\Model\ResourceModel;
-
class QuoteTest extends \PHPUnit_Framework_TestCase
{
/**
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.php
index a3eda5ea1b3c5a3d6b5be217df906ca69b67f742..d29bad980faca881468ae1cf3a58523e13f7ad83 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.php
@@ -13,5 +13,13 @@ use Magento\Mtf\Block\Form;
*/
class Shipping extends Form
{
- //
+ /**
+ * Returns form's required elements
+ *
+ * @return \Magento\Mtf\Client\ElementInterface[]
+ */
+ public function getRequiredFields()
+ {
+ return $this->_rootElement->getElements("div .field._required");
+ }
}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingAddressJsValidationMessagesIsAbsent.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingAddressJsValidationMessagesIsAbsent.php
new file mode 100644
index 0000000000000000000000000000000000000000..f4f46a1c2b7c2577a0f61882f9d707397b1c1a20
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingAddressJsValidationMessagesIsAbsent.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Checkout\Test\Constraint;
+
+use Magento\Checkout\Test\Page\CheckoutOnepage;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Class AssertShippingAddressJsValidationMessagesIsAbsent
+ * Assert js validation messages are absent for required fields.
+ */
+class AssertShippingAddressJsValidationMessagesIsAbsent extends AbstractConstraint
+{
+ /**
+ * Assert js validation messages are absent for required fields.
+ *
+ * @param CheckoutOnepage $checkoutOnepage
+ * @return void
+ */
+ public function processAssert(CheckoutOnepage $checkoutOnepage)
+ {
+ $requiredFields = $checkoutOnepage->getShippingBlock()->getRequiredFields();
+
+ /** @var \Magento\Mtf\Client\ElementInterface $field */
+ foreach ($requiredFields as $field) {
+ $errorContainer = $field->find("div .field-error");
+ \PHPUnit_Framework_Assert::assertFalse(
+ $errorContainer->isVisible(),
+ 'Js validation error messages must be absent for required fields after checkout start.'
+ );
+ }
+ }
+
+ /**
+ * Returns string representation of successful assertion
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Js validation messages are absent for required fields.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutJsValidationTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutJsValidationTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..5361ee6e3c127bafc03e53cd717ac067688f826a
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutJsValidationTest.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Checkout\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+/**
+ * Steps:
+ * 1. Go to Frontend as guest.
+ * 2. Add simple product to shopping cart
+ * 3. Go to shopping cart page
+ * 4. Proceed to checkout
+ * 5. Perform assertions.
+ *
+ * @group One_Page_Checkout
+ * @ZephyrId MAGETWO-59697
+ */
+class OnePageCheckoutJsValidationTest extends Scenario
+{
+ /**
+ * Runs one page checkout js validation test.
+ *
+ * @return void
+ */
+ public function test()
+ {
+ $this->executeScenario();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutJsValidationTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutJsValidationTest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e930ff29882ceed4e8f99947a6a6ef4b4acc1c7a
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutJsValidationTest.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+ <testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutJsValidationTest" summary="JS validation verification for Checkout flow" ticketId="MAGETWO-59697">
+ <variation name="OnePageCheckoutJsValidationTestVariation1" summary="JS validation is not applied for empty required checkout fields if customer did not fill them">
+ <data name="products/0" xsi:type="string">catalogProductSimple::default</data>
+ <data name="checkoutMethod" xsi:type="string">guest</data>
+ <constraint name="Magento\Checkout\Test\Constraint\AssertShippingAddressJsValidationMessagesIsAbsent" />
+ </variation>
+ </testCase>
+</config>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/testcase.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/testcase.xml
index a26a2cead49b07a094e550db1207e36d53269b15..24eb96c0a9347741384ffd6718bf349eeb452c85 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/testcase.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/testcase.xml
@@ -22,4 +22,10 @@
<step name="placeOrder" module="Magento_Checkout" next="createCustomerAccount" />
<step name="createCustomerAccount" module="Magento_Checkout" />
</scenario>
+ <scenario name="OnePageCheckoutJsValidationTest" firstStep="setupConfiguration">
+ <step name="setupConfiguration" module="Magento_Config" next="createProducts" />
+ <step name="createProducts" module="Magento_Catalog" next="addProductsToTheCart" />
+ <step name="addProductsToTheCart" module="Magento_Checkout" next="ProceedToCheckout" />
+ <step name="ProceedToCheckout" module="Magento_Checkout" />
+ </scenario>
</config>