MAGETWO-52577: [GitHub] Set Product as New from Date and Design Activ…

…e From is set when setting Special Price #4387
magento · Jan 17, 2017 · 16bfaf2 · 16bfaf2
1 parent 331e44f
commit 16bfaf2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.xml
@@ -45,7 +45,10 @@
             <visibility>
                 <input>select</input>
             </visibility>
-            <news_from_date />
+            <news_from_date>
+                <selector>[name="product[news_from_date]"]</selector>
+                <strategy>css selector</strategy>
+            </news_from_date>
             <news_to_date>
                 <selector>[name="product[news_to_date]"]</selector>
                 <strategy>css selector</strategy>
@@ -190,6 +193,12 @@
         <class>\Magento\Ui\Test\Block\Adminhtml\Section</class>
         <selector>[data-index='schedule-design-update']</selector>
         <strategy>css selector</strategy>
+        <fields>
+            <custom_design_from>
+                <selector>[name="product[custom_design_from]"]</selector>
+                <strategy>css selector</strategy>
+            </custom_design_from>
+        </fields>
     </schedule-design-update>
     <customer-options>
         <class>\Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Section\Options</class>

diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml
@@ -29,8 +29,8 @@
         <field name="country_of_manufacture" is_required="0" />
         <field name="created_at" is_required="1" />
         <field name="custom_design" is_required="0" />
-        <field name="custom_design_from" is_required="0" />
-        <field name="custom_design_to" is_required="0" />
+        <field name="custom_design_from" is_required="0" group="schedule-design-update" source="Magento\Backend\Test\Fixture\Source\Date" />
+        <field name="custom_design_to" is_required="0" group="schedule-design-update" source="Magento\Backend\Test\Fixture\Source\Date" />
         <field name="custom_layout_update" is_required="0" />
         <field name="description" is_required="0" group="content" />
         <field name="gallery" is_required="0" />
@@ -80,8 +80,8 @@
         <field name="custom_options" is_required="0" group="customer-options" source="Magento\Catalog\Test\Fixture\Product\CustomOptions" repository="Magento\Catalog\Test\Repository\Product\CustomOptions" />
         <field name="website_ids" group="websites" source="Magento\Catalog\Test\Fixture\Product\WebsiteIds" />
         <field name="is_returnable" is_required="0" group="product-details" />
-        <field name="news_from_date" is_required="0" source="Magento\Backend\Test\Fixture\Source\Date" />
-        <field name="news_to_date" is_required="0" source="Magento\Backend\Test\Fixture\Source\Date" />
+        <field name="news_from_date" is_required="0" group="product-details" source="Magento\Backend\Test\Fixture\Source\Date" />
+        <field name="news_to_date" is_required="0" group="product-details" source="Magento\Backend\Test\Fixture\Source\Date" />
         <field name="stock_data" group="advanced-inventory" />
         <field name="checkout_data" group="null" repository="Magento\Catalog\Test\Repository\CatalogProductSimple\CheckoutData" />
         <field name="cross_sell_products" group="related" source="Magento\Catalog\Test\Fixture\Product\RelatedProducts" />

diff --git a/...ctional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml b/...ctional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml
@@ -55,11 +55,14 @@
             <data name="product/data/short_description" xsi:type="string">Simple Product short_description %isolation%</data>
             <data name="product/data/description" xsi:type="string">Simple Product description %isolation%</data>
             <data name="product/data/weight" xsi:type="string">52</data>
+            <data name="product/data/news_from_date" xsi:type="string"></data>
+            <data name="product/data/custom_design_from" xsi:type="string"></data>
             <data name="product/data/quantity_and_stock_status/qty" xsi:type="string">659</data>
             <data name="product/data/custom_options/dataset" xsi:type="string">drop_down_with_one_option_fixed_price</data>
             <data name="product/data/checkout_data/dataset" xsi:type="string">simple_drop_down_with_one_option_fixed_price</data>
             <data name="product/data/price/dataset" xsi:type="string">MAGETWO-23029</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInCategory" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />