MAGETWO-54499: PayPal Payments Configuration UX Update

- Fixed phpdocs in functional tests for conflict resolution

Author: rliukshyn

dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Payments.php

@@ -8,14 +8,22 @@
 
 use Magento\Mtf\Block\Block;
 
+/**
+ * Class Payments
+ * Payments configuration block on Stores > Configuration > Sales > Payment Methods page
+ */
 class Payments extends Block
 {
     /**
+     * Merchant Country selector.
+     *
      * @var string
      */
     protected $merchantCountrySelector = "select[id$='_account_merchant_country'] > option[value='%s']";
 
     /**
+     * Solution title(e.g. PayPal Express Checkout, Payments Advanced, etc.) selector
+     *
      * @var string
      */
     protected $solutionTitle = './strong[contains(text(), "%s")]';

dev/tests/functional/tests/app/Magento/Braintree/Test/Block/System/Config/Braintree.php

@@ -15,6 +15,8 @@
 class Braintree extends Block
 {
     /**
+     * Braintree credentials fields sectors array.
+     *
      * @var array
      */
     private $fields = [
@@ -24,6 +26,8 @@ class Braintree extends Block
     ];
 
     /**
+     * Braintree enablers fields sectors array.
+     *
      * @var array
      */
     private $enablers = [
@@ -33,6 +37,8 @@ class Braintree extends Block
     ];
 
     /**
+     * Braintree 'Configure' button.
+     *
      * @var string
      */
     private $configureBraintreeButton = '#payment_us_braintree_section_braintree-head';

dev/tests/functional/tests/app/Magento/Braintree/Test/TestStep/CheckBraintreeConfigStep.php

@@ -19,6 +19,8 @@
 class CheckBraintreeConfigStep implements TestStepInterface
 {
     /**
+     * Payments configuration page.
+     *
      * @var SystemConfigEditSectionPayment
      */
     private $systemConfigEditSectionPayment;
@@ -44,12 +46,16 @@ class CheckBraintreeConfigStep implements TestStepInterface
     private $assertFieldsAreEnabled;
 
     /**
-     * @var
+     * Country code.
+     *
+     * @var string
      */
     private $countryCode;
 
     /**
-     * @var
+     * Payment sections on Payments configuration page.
+     *
+     * @var array
      */
     private $sections;
 
@@ -64,8 +70,8 @@ class CheckBraintreeConfigStep implements TestStepInterface
      * @param AssertFieldsArePresent $assertFieldsArePresent
      * @param AssertFieldsAreActive $assertFieldsAreActive
      * @param AssertFieldsAreEnabled $assertFieldsAreEnabled
-     * @param $countryCode
-     * @param $sections
+     * @param string $countryCode
+     * @param array $sections
      */
     public function __construct(
         SystemConfigEditSectionPayment $systemConfigEditSectionPayment,
@@ -74,7 +80,7 @@ public function __construct(
         AssertFieldsAreActive $assertFieldsAreActive,
         AssertFieldsAreEnabled $assertFieldsAreEnabled,
         $countryCode,
-        $sections
+        array $sections
     ) {
         $this->systemConfigEditSectionPayment = $systemConfigEditSectionPayment;
         $this->assertFieldsAreDisabled = $assertFieldsAreDisabled;

dev/tests/functional/tests/app/Magento/Payment/Test/TestCase/ConflictResolutionTest.xml

@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Payment\Test\TestCase\ConflictResolutionTest" summary="Conflict resolution for US"
-              ticketId="MAGETWO-55707, 38531">
+              ticketId="MAGETWO-55707, MAGETWO-38531">
         <variation name="ConflictResolutionTestVariation1">
             <data name="countryCode" xsi:type="string">US</data>
             <data name="sections" xsi:type="array">

dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/ExpressCheckout.php

@@ -15,6 +15,8 @@
 class ExpressCheckout extends Block
 {
     /**
+     * PayPal Express Checkout credentials fields sectors array.
+     *
      * @var array
      */
     private $fields = [
@@ -33,6 +35,8 @@ class ExpressCheckout extends Block
     ];
 
     /**
+     * PayPal Express Checkout enablers fields sectors array.
+     *
      * @var array
      */
     private $enablers = [
@@ -45,6 +49,8 @@ class ExpressCheckout extends Block
     ];
 
     /**
+     * PayPal Express Checkout 'Configure' button selector.
+     *
      * @var string
      */
     private $configureExpressButton = '#payment_us_paypal_alternative_payment_methods_express_checkout_us-head';

dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowLink.php

@@ -15,6 +15,8 @@
 class PayflowLink extends Block
 {
     /**
+     * Payflow Link credentials fields sectors array.
+     *
      * @var array
      */
     private $fields = [
@@ -31,6 +33,8 @@ class PayflowLink extends Block
     ];
 
     /**
+     * Payflow Link enablers fields sectors array.
+     *
      * @var array
      */
     private $enablers = [
@@ -43,6 +47,8 @@ class PayflowLink extends Block
     ];
 
     /**
+     * Payflow Link 'Configure' button selector.
+     *
      * @var string
      */
     private $configurePayflowLinkButton = '#payment_us_paypal_payment_gateways_payflow_link_us-head';

dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php

@@ -15,6 +15,8 @@
 class PayflowPro extends Block
 {
     /**
+     * Payflow Pro credentials fields sectors array.
+     *
      * @var array
      */
     private $fields = [
@@ -31,6 +33,8 @@ class PayflowPro extends Block
     ];
 
     /**
+     * Payflow Pro enablers fields sectors array.
+     *
      * @var array
      */
     private $enablers = [
@@ -43,6 +47,8 @@ class PayflowPro extends Block
     ];
 
     /**
+     * Payflow Pro 'Configure' button selector.
+     *
      * @var string
      */
     private $configureProButton = '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout-head';

dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsAdvanced.php

@@ -15,6 +15,8 @@
 class PaymentsAdvanced extends Block
 {
     /**
+     * Payments Advanced credentials fields sectors array.
+     *
      * @var array
      */
     private $fields = [
@@ -27,6 +29,8 @@ class PaymentsAdvanced extends Block
     ];
 
     /**
+     * Payments Advanced enablers fields sectors array.
+     *
      * @var array
      */
     private $enablers = [
@@ -37,6 +41,8 @@ class PaymentsAdvanced extends Block
     ];
 
     /**
+     * Payments Advanced 'Configure' button selector.
+     *
      * @var string
      */
     private $configureAdvancedButton = '#payment_us_paypal_group_all_in_one_payflow_advanced-head';

dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php

@@ -15,6 +15,8 @@
 class PaymentsPro extends Block
 {
     /**
+     * Payments Pro enablers fields sectors array.
+     *
      * @var array
      */
     private $fields = [
@@ -31,6 +33,8 @@ class PaymentsPro extends Block
     ];
 
     /**
+     * Payments Pro enablers fields sectors array.
+     *
      * @var array
      */
     private $enablers = [
@@ -43,6 +47,8 @@ class PaymentsPro extends Block
     ];
 
     /**
+     * Payments Pro 'Configure' button selector.
+     *
      * @var string
      */
     private $configureProButton = '#payment_us_paypal_group_all_in_one_wpp_usuk-head';

dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/CheckExpressConfigStep.php

@@ -19,6 +19,8 @@
 class CheckExpressConfigStep implements TestStepInterface
 {
     /**
+     * Payments configuration page.
+     *
      * @var SystemConfigEditSectionPayment
      */
     private $systemConfigEditSectionPayment;
@@ -44,12 +46,16 @@ class CheckExpressConfigStep implements TestStepInterface
     private $assertFieldsAreEnabled;
 
     /**
-     * @var
+     * Country code.
+     *
+     * @var string
      */
     private $countryCode;
 
     /**
-     * @var
+     * Payment sections on Payments configuration page.
+     *
+     * @var array
      */
     private $sections;
 
@@ -64,8 +70,8 @@ class CheckExpressConfigStep implements TestStepInterface
      * @param AssertFieldsArePresent $assertFieldsArePresent
      * @param AssertFieldsAreActive $assertFieldsAreActive
      * @param AssertFieldsAreEnabled $assertFieldsAreEnabled
-     * @param $countryCode
-     * @param $sections
+     * @param string $countryCode
+     * @param array $sections
      */
     public function __construct(
         SystemConfigEditSectionPayment $systemConfigEditSectionPayment,
@@ -74,7 +80,7 @@ public function __construct(
         AssertFieldsAreActive $assertFieldsAreActive,
         AssertFieldsAreEnabled $assertFieldsAreEnabled,
         $countryCode,
-        $sections
+        array $sections
     ) {
         $this->systemConfigEditSectionPayment = $systemConfigEditSectionPayment;
         $this->assertFieldsAreDisabled = $assertFieldsAreDisabled;