MAGETWO-92425: Create/Update Automated Tests

- Update tests to handle cleaning up uploaded images better
- Fix additional usages of background-position to use visual select

Author: tjwiebell

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/DeleteImageFromStorageActionGroup.xml

@@ -11,16 +11,16 @@
         <arguments>
             <argument name="Image"/>
         </arguments>
-        <grabMultiple selector="{{MediaGallerySection.imageOrImageCopy(Image.value, Image.fileName, Image.extension)}}" stepKey="initialImages"/>
-        <click selector="{{MediaGallerySection.imageOrImageCopy(Image.value, Image.fileName, Image.extension)}}" stepKey="selectImage"/>
+        <grabMultiple selector="{{MediaGallerySection.imageOrImageCopy(Image.fileName, Image.extension)}}" stepKey="initialImages"/>
+        <click selector="{{MediaGallerySection.imageOrImageCopy(Image.fileName, Image.extension)}}" stepKey="selectImage"/>
         <waitForElementVisible selector="{{MediaGallerySection.DeleteSelectedBtn}}" stepKey="waitForDeleteBtn"/>
         <click selector="{{MediaGallerySection.DeleteSelectedBtn}}" stepKey="clickDeleteSelected"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
         <waitForElementVisible selector="{{MediaGallerySection.confirmDelete}}" stepKey="waitForConfirmBtn"/>
         <click selector="{{MediaGallerySection.confirmDelete}}" stepKey="clickConfirmBtn"/>
         <waitForPageLoad stepKey="waitForPageLoad2"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
-        <grabMultiple selector="{{MediaGallerySection.imageOrImageCopy(Image.value, Image.fileName, Image.extension)}}" stepKey="newImages"/>
+        <grabMultiple selector="{{MediaGallerySection.imageOrImageCopy(Image.fileName, Image.extension)}}" stepKey="newImages"/>
         <assertLessThan stepKey="assertLessImages">
             <expectedResult type="variable">initialImages</expectedResult>
             <actualResult type="variable">newImages</actualResult>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/SelectImageFromMediaStorageActionGroup.xml

@@ -42,7 +42,7 @@
         <attachFile selector="{{MediaGallerySection.BrowseUploadImage}}" userInput="{{Image.value}}" stepKey="uploadImage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
-        <waitForElementVisible  selector="{{MediaGallerySection.imageOrImageCopy(Image.value, Image.fileName, Image.extension)}}" stepKey="waitForUploadImage"/>
+        <waitForElementVisible  selector="{{MediaGallerySection.imageOrImageCopy(Image.fileName, Image.extension)}}" stepKey="waitForUploadImage"/>
     </actionGroup>
     <actionGroup name="deleteImage">
         <see selector="{{MediaGallerySection.DeleteSelectedBtn}}" userInput="Delete Selected" stepKey="seeDeleteBtn"/>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/TinyMCESection.xml

@@ -36,7 +36,7 @@
         <element name="Browse" type="button" selector=".mce-i-browse"/>
         <element name="BrowseUploadImage" type="file" selector=".fileupload" />
         <element name="image" type="text" selector="//small[text()='{{var1}}']" parameterized="true"/>
-        <element name="imageOrImageCopy" type="text" selector="//img[contains(@alt, '{{arg1}}')]|//img[contains(@alt,'{{arg2}}_') and contains(@alt,'.{{arg3}}')]" parameterized="true"/>
+        <element name="imageOrImageCopy" type="text" selector="//img[contains(@alt, '{{arg1}}.{{arg2}}')]|//img[contains(@alt,'{{arg1}}_') and contains(@alt,'.{{arg2}}')]" parameterized="true"/>
         <element name="imageSelected" type="text" selector="//small[text()='{{var1}}']/parent::*[@class='filecnt selected']" parameterized="true"/>
         <element name="ImageSource" type="input" selector=".mce-combobox.mce-abs-layout-item.mce-last.mce-has-open" />
         <element name="ImageDescription" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-last" />