MAGETWO-66442: Changes in default scope not effect product images in other scopes

- Update automated test

Author: nikshostko

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml

@@ -215,18 +215,6 @@
         <waitForElementNotVisible selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" stepKey="waitForCloseModalWindow"/>
       </actionGroup>
 
-    <!--Select Product In Websites-->
-    <actionGroup name="SelectProductInWebsitesActionGroup">
-        <arguments>
-            <argument name="website" type="string"/>
-        </arguments>
-        <scrollTo selector="{{CreateProductSection.productInWebsite}}" stepKey="ScrollToWebsites"/>
-        <click selector="{{CreateProductSection.productInWebsite}}" stepKey="ClickTpOpenProductInWebsite"/>
-        <waitForPageLoad stepKey="waitForPageOpened"/>
-        <click selector="{{CreateProductSection.isSelected(website)}}" stepKey="SelectWebsite"/>
-        <click selector="{{CreateProductSection.saveButton}}" stepKey="clickSaveProduct"/>
-    </actionGroup>
-
     <!--Switch to New Store view-->
     <actionGroup name="SwitchToTheNewStoreView">
         <arguments>

app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml

@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminRemoveImageAffectsAllScopesTest">
         <annotations>
             <features value="Catalog"/>
@@ -65,7 +65,7 @@
             </actionGroup>
             <deleteData createDataKey="category" stepKey="deletePreReqCategory"/>
             <deleteData createDataKey="product" stepKey="deleteFirstProduct"/>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="logout" stepKey="logout"/>
         </after>
 
         <!--Create product-->
@@ -86,13 +86,11 @@
         <actionGroup ref="addProductImage" stepKey="addSecondImageForProduct">
             <argument name="image" value="MagentoLogo"/>
         </actionGroup>
-
         <!--"Product in Websites": select both Websites-->
-        <actionGroup ref="SelectProductInWebsitesActionGroup" stepKey="selectFirstWebsite">
+        <actionGroup ref="ProductSetWebsite" stepKey="ProductSetWebsite1">
             <argument name="website" value="FirstWebSite"/>
         </actionGroup>
-
-        <actionGroup ref="SelectProductInWebsitesActionGroup" stepKey="selectSecondWebsite">
+        <actionGroup ref="ProductSetWebsite" stepKey="ProductSetWebsite2">
             <argument name="website" value="SecondWebSite"/>
         </actionGroup>