MAGETWO-70779: Add URL Rewrite not retrieving categories

 - Functional Test

Author: Eric Bohanon

dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Category.xml

@@ -45,6 +45,16 @@
             <field name="include_in_menu" xsi:type="string">Yes</field>
         </dataset>
 
+        <dataset name="default_subcategory_with_single_quote_in_name">
+            <field name="name" xsi:type="string">DefaultSubcategory\'%isolation%</field>
+            <field name="url_key" xsi:type="string">default-subcategory-%isolation%</field>
+            <field name="parent_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">default_category</item>
+            </field>
+            <field name="is_active" xsi:type="string">Yes</field>
+            <field name="include_in_menu" xsi:type="string">Yes</field>
+        </dataset>
+
         <dataset name="default_subcategory_without_url_key">
             <field name="name" xsi:type="string">DefaultSubcategory%isolation%</field>
             <field name="parent_id" xsi:type="array">
@@ -169,15 +179,5 @@
                 <item name="dataset" xsi:type="string">catalogProductSimple::default</item>
             </field>
         </dataset>
-
-        <dataset name="default_with_single_quote_in_name">
-            <field name="name" xsi:type="string">Category\'%isolation%</field>
-            <field name="url_key" xsi:type="string">category%isolation%</field>
-            <field name="is_active" xsi:type="string">Yes</field>
-            <field name="include_in_menu" xsi:type="string">Yes</field>
-            <field name="parent_id" xsi:type="array">
-                <item name="dataset" xsi:type="string">default_category</item>
-            </field>
-        </dataset>
     </repository>
 </config>

dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Category/Tree.php

@@ -32,7 +32,7 @@ public function selectCategory($category)
     {
         if ($category != null && $category->hasData('name')) {
             $this->_rootElement->find(
-                "//a[contains(text(),'{$category->getName()}')]",
+                "//a[contains(text(),\"{$category->getName()}\")]",
                 Locator::SELECTOR_XPATH
             )->click();
         } else {

dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CategoryUrlRewriteTest.xml

@@ -17,15 +17,5 @@
             <data name="categoryUpdates/data/url_key" xsi:type="string">UrlKey%isolation%</data>
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertCategoryUrlWithCustomStoreView" />
         </variation>
-        <variation name="CategoryUrlRewriteTestVariation2">
-            <data name="storeView/dataset" xsi:type="string">custom</data>
-            <data name="childCategory/dataset" xsi:type="string">default</data>
-            <data name="childCategory/data/category_products/dataset" xsi:type="string">catalogProductSimple::default_with_single_quote_in_name</data>
-            <data name="parentCategory/dataset" xsi:type="string">default</data>
-            <data name="parentCategory/data/category_products/dataset" xsi:type="string">catalogProductSimple::default_with_single_quote_in_name</data>
-            <data name="categoryUpdates/data/use_default_url_key" xsi:type="string">No</data>
-            <data name="categoryUpdates/data/url_key" xsi:type="string">UrlKey%isolation%</data>
-            <constraint name="Magento\UrlRewrite\Test\Constraint\AssertCategoryUrlWithCustomStoreView" />
-        </variation>
     </testCase>
 </config>

dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.php

@@ -68,7 +68,7 @@ public function __inject(
         $this->urlRewriteIndex = $urlRewriteIndex;
         $category = $fixtureFactory->createByCode(
             'category',
-            ['dataset' => 'default_subcategory']
+            ['dataset' => 'default_subcategory_with_single_quote_in_name']
         );
         $category->persist();
         return ['category' => $category];
@@ -87,6 +87,7 @@ public function test(UrlRewrite $urlRewrite, Category $category)
         $this->urlRewriteIndex->open();
         $this->urlRewriteIndex->getPageActionsBlock()->addNew();
         $this->urlRewriteEdit->getFormBlock()->fill($urlRewrite);
+
         $this->urlRewriteEdit->getTreeBlock()->selectCategory($category);
         $this->urlRewriteEdit->getFormBlock()->fill($urlRewrite);
         $this->urlRewriteEdit->getPageMainActions()->save();