Merge branch 'MAGETWO-67485' into PR-bugfixes-040417

Author: iivashchenko

dev/tests/functional/tests/app/Magento/Paypal/Test/Repository/ConfigData.xml

@@ -148,77 +148,6 @@
             </field>
         </dataset>
 
-        <dataset name="payflowpro_fraud_filters_enabled">
-            <field name="payment/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_api_settings/business_account" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Email Associated with PayPal Merchant Account (Optional)</item>
-                <item name="value" xsi:type="string">%payflow_pro_fraud_protection_enabled_business_account%</item>
-            </field>
-            <field name="payment/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_api_settings/partner" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Partner</item>
-                <item name="value" xsi:type="string">%payflow_pro_fraud_protection_enabled_partner%</item>
-            </field>
-            <field name="payment/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_api_settings/user" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">User</item>
-                <item name="value" xsi:type="string">%payflow_pro_fraud_protection_enabled_user%</item>
-            </field>
-            <field name="payment/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_api_settings/pwd" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Password</item>
-                <item name="value" xsi:type="string">%payflow_pro_fraud_protection_enabled_pwd%</item>
-            </field>
-            <field name="payment/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_api_settings/vendor" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Vendor</item>
-                <item name="value" xsi:type="string">%payflow_pro_fraud_protection_enabled_vendor%</item>
-            </field>
-            <field name="payment/paypal_payment_gateways/paypal_payflowpro_with_express_checkout/paypal_payflow_required/paypal_payflow_api_settings/sandbox_flag" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string"/>
-                <item name="value" xsi:type="number">1</item>
-            </field>
-            <field name="payment/payflowpro/debug" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Yes</item>
-                <item name="value" xsi:type="number">1</item>
-            </field>
-            <field name="payment/payflowpro/active" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Yes</item>
-                <item name="value" xsi:type="number">1</item>
-            </field>
-            <field name="payment/payflow_express/debug" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Yes</item>
-                <item name="value" xsi:type="number">1</item>
-            </field>
-            <field name="payment/payflow_express/active" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">Yes</item>
-                <item name="value" xsi:type="number">1</item>
-            </field>
-        </dataset>
-        <dataset name="payflowpro_fraud_filters_enabled_rollback">
-            <field name="payment/payflowpro/active" xsi:type="array">
-                <item name="scope" xsi:type="string">payment</item>
-                <item name="scope_id" xsi:type="number">1</item>
-                <item name="label" xsi:type="string">No</item>
-                <item name="value" xsi:type="number">0</item>
-            </field>
-        </dataset>
-
         <dataset name="payflowpro_avs_street_does_not_match">
             <field name="payment/payflowpro/avs_street" xsi:type="array">
                 <item name="scope" xsi:type="string">payment</item>

dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/OnePageCheckoutTest.xml

@@ -43,7 +43,7 @@
             <data name="creditCardClass" xsi:type="string">credit_card</data>
             <data name="creditCard/dataset" xsi:type="string">visa_default</data>
             <data name="isVaultPresent" xsi:type="boolean">false</data>
-            <data name="configData" xsi:type="string">payflowpro_fraud_filters_enabled</data>
+            <data name="configData" xsi:type="string">payflowpro</data>
             <data name="paymentInfo" xsi:type="array">
                 <item name="Triggered Fraud Filters" xsi:type="string">Under review by Fraud Service</item>
                 <item name="International AVS response" xsi:type="string">#N: No Details matched</item>
@@ -70,7 +70,7 @@
             <data name="creditCardClass" xsi:type="string">credit_card</data>
             <data name="creditCard/dataset" xsi:type="string">visa_default</data>
             <data name="isVaultPresent" xsi:type="boolean">false</data>
-            <data name="configData" xsi:type="string">payflowpro_fraud_filters_enabled</data>
+            <data name="configData" xsi:type="string">payflowpro</data>
             <data name="paymentInfo" xsi:type="array">
                 <item name="AVS Street Match" xsi:type="string">#Y: Yes. Matched Address and five-didgit ZIP</item>
             </data>