MAGETWO-86624: [2.2] Allowed countries restriction for a default website is applied to backend customer grid

Author: DianaRusin

app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml

@@ -16,5 +16,6 @@
         <element name="clearFilters" type="button" selector=".admin__data-grid-header button[data-action='grid-filter-reset']" timeout="30"/>
         <element name="viewDropdown" type="button" selector=".admin__data-grid-action-bookmarks button.admin__action-dropdown"/>
         <element name="countryOptions" type="button" selector=".admin__data-grid-filters select[name=billing_country_id] option"/>
+        <element name="countryOptionsWithoutEmptyOption" type="button" selector=".admin__data-grid-filters select[name=billing_country_id] option:not([value=''])"/>
     </section>
 </sections>

app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml

@@ -55,7 +55,7 @@
 
         <!--Check that all countries are allowed initially and get amount-->
         <amOnPage url="{{AdminConfigurationGeneralSectionPage.url('#general_country-link')}}" stepKey="goToCountryConfigurationSectionPage"/>
-        <executeJS function="return document.querySelectorAll('{{AdminConfigurationGeneralCountryOptionsSection.allowedCountries}} option').length" stepKey="countriesAmount"/>
+        <executeJS function="return document.querySelectorAll('{{AdminConfigurationGeneralCountryOptionsSection.allowedCountriesOptions}}').length" stepKey="countriesAmount"/>
 
         <!-- Switch to first website, allow only Canada and set Canada as default country -->
         <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="adminSwitchWebsite">
@@ -82,7 +82,6 @@
         <!--Go to Customers grid and check that filter countries amount is the same as initial allowed countries amount-->
         <amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToCustomersGrid"/>
         <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openFiltersSectionOnCustomersGrid"/>
-        <executeJS function="var len = document.querySelectorAll('{{AdminCustomerFiltersSection.countryOptions}}').length; return len-1;" stepKey="actualCountriesAmount"/>
-        <assertEquals expected='($countriesAmount)' actual="($actualCountriesAmount)" stepKey="assertCountryAmounts"/>
+        <seeNumberOfElements userInput="$countriesAmount" selector="{{AdminCustomerFiltersSection.countryOptionsWithoutEmptyOption}}" stepKey="assertCountryAmounts"/>
     </test>
 </tests>

app/code/Magento/Directory/Test/Mftf/Section/AdminConfigurationGeneralCountryOptionsSection.xml

@@ -17,5 +17,6 @@
         <element name="countryOptions" type="button" selector="#general_country-head"/>
         <element name="countryOptionsOpen" type="button" selector="#general_country-head.open"/>
         <element name="topDestinations" type="select" selector="#general_country_destinations"/>
+        <element name="allowedCountriesOptions" selector="#general_country_allow option"/>
     </section>
 </sections>