Merge pull request #476 from magento-dragons/W3

[DRAGONS] BugFix(W3)

Author: Korshenko, Oleksii(okorshenko)

app/code/Magento/Catalog/view/adminhtml/web/js/options.js

@@ -41,9 +41,6 @@ define([
                         data.intype = this.getOptionInputType();
                     }
 
-                    if (!this.totalItems) {
-                        data.checked = 'checked';
-                    }
                     element = this.template({
                         data: data
                     });

app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml

@@ -11,7 +11,7 @@
 <div data-bind="scope: '<?= /* @noEscape */  $block->getComponentName()?>'">
     <h2 class="steps-wizard-title"><?= /* @noEscape */  __('Step 2: Attribute Values') ?></h2>
     <div class="steps-wizard-info">
-        <span><?= /* @noEscape */  __('Select values from each attribute to include in this product. Each unique combination of values creates a unigue product SKU.') ?></span>
+        <span><?= $block->escapeHtml(__('Select from the following attribute values for this product. Each unique combination of values creates a unique product SKU.')) ?></span>
     </div>
     <div data-bind="foreach: attributes, sortableList: attributes">
 

app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml

@@ -11,7 +11,7 @@
 <div data-bind="scope: '<?= /* @escapeNotVerified */  $block->getComponentName()?>'">
     <h2 class="steps-wizard-title"><?= /* @escapeNotVerified */  __('Step 2: Attribute Values') ?></h2>
     <div class="steps-wizard-info">
-        <span><?= /* @escapeNotVerified */  __('Select values from each attribute to include in this product. Each unique combination of values creates a unigue product SKU.') ?></span>
+        <span><?= $block->escapeHtml(__('Select from the following attribute values for this product. Each unique combination of values creates a unique product SKU.')) ?></span>
     </div>
     <div data-bind="foreach: attributes, sortableList: attributes">
 

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.php

@@ -48,6 +48,7 @@ public function fill(FixtureInterface $fixture, SimpleElement $element = null)
     {
         if ($fixture->hasData('store_id')) {
             $store = $fixture->getStoreId();
+            $this->browser->find($this->header)->hover();
             $storeSwitcherBlock = $this->browser->find($this->storeSwitcherBlock);
             $storeSwitcherBlock->find($this->dropdownBlock, Locator::SELECTOR_CSS, 'liselectstore')->setValue($store);
             $modalElement = $this->browser->find($this->confirmModal);

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php

@@ -28,7 +28,7 @@ class TopToolbar extends Block
      */
     public function getSelectSortType()
     {
-        return $this->_rootElement->find($this->sorter)->getValue();
+        return $this->_rootElement->find("#sorter")->getElements('option[selected]')[0]->getText();
     }
 
     /**

dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php

@@ -205,12 +205,12 @@ protected function verifyDisplaySettings(array $categoryData)
         //TODO: verify display_mode
 
         if (isset($categoryData['default_sort_by'])) {
-            $sortBy = strtolower($categoryData['default_sort_by']);
-            $sortType = $this->categoryViewPage->getTopToolbar()->getSelectSortType();
-            if ($sortBy != $sortType) {
+            $expected = $categoryData['default_sort_by'];
+            $actual = $this->categoryViewPage->getTopToolbar()->getSelectSortType();
+            if ($expected != $actual) {
                 $errorMessage[] = 'Wrong sorting type.'
-                    . "\nExpected: " . $sortBy
-                    . "\nActual: " . $sortType;
+                    . "\nExpected: " . $expected
+                    . "\nActual: " . $actual;
             }
         }
 
@@ -257,7 +257,7 @@ protected function verifySearchEngineOptimization(array $categoryData)
         };
 
         if (isset($categoryData['meta_title'])) {
-            $actual = $this->categoryViewPage->getMetaInformation()->getTitle();
+            $actual = $this->browser->getTitle();
             if ($categoryData['meta_title'] != $actual) {
                 $errorMessage[] = 'Wrong page title.'
                     . "\nExpected: " . $categoryData['meta_title']

dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryView.xml

@@ -7,7 +7,6 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
     <page name="CatalogCategoryView" area="Category" mca="catalog/category/view" module="Magento_Catalog">
-        <block name="metaInformation" class="Magento\Cms\Test\Block\MetaInformation" locator="head" strategy="css selector" />
         <block name="topmenu" class="Magento\Theme\Test\Block\Html\Topmenu" locator=".navigation" strategy="css selector" />
         <block name="titleBlock" class="Magento\Theme\Test\Block\Html\Title" locator=".page-title-wrapper h1.page-title .base" strategy="css selector"/>
         <block name="breadcrumbs" class="Magento\Theme\Test\Block\Html\Breadcrumbs" locator=".breadcrumbs" strategy="css selector"/>

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.xml

@@ -43,6 +43,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryIsNotActive" />
         </variation>
         <variation name="UpdateCategoryEntityTestVariation4_ChangeCategoryNameOnStoreView" summary="Update Category with custom Store View.">
+            <data name="issue" xsi:type="string">Not implemented yet: MAGETWO-48516</data>
             <data name="category/data/store_id/dataset" xsi:type="string">custom</data>
 	        <data name="category/data/use_default_name" xsi:type="string">No</data>
             <data name="category/data/name" xsi:type="string">Category %isolation%</data>

dev/tests/functional/tests/app/Magento/Cms/Test/Block/MetaInformation.php

@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * 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/Magento/Mtf/TestRunner/etc/testRunner.xsd">
+    <rule scope="testsuite">
+        <allow>
+            <namespace value="Magento\Catalog\Test\TestCase\Category" />
+        </allow>
+    </rule>
+</config>