MAGETWO-42818: Verify outputs for Braintree module

 - Refactored code related to failed tests

Author: Ievgen Sentiabov

app/code/Magento/Braintree/view/adminhtml/templates/form.phtml

@@ -49,7 +49,7 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
                         <?php foreach ($storedCards as $creditCard): ?>
                             <option value="<?php echo $block->escapeHtml($creditCard->token); ?>"
                                 <?php /* @noEscape */ echo $creditCard->default ? ' selected="selected"' : ''; ?>>
-                                <?php echo $block->escapeHtml($creditCard->maskedNumber . ' - ' . $creditCard->cardType); ?>
+                                <?php echo $block->escapeHtml($creditCard->maskedNumber); ?> - <?php echo $block->escapeHtml($creditCard->cardType); ?>
                             </option>
                         <?php endforeach; ?>
                         <option value=''><?php echo $block->escapeHtml(__('Add new card')); ?></option>

app/code/Magento/Braintree/view/frontend/templates/creditcard/edit.phtml

@@ -328,7 +328,7 @@ $serializedFormData = $this->helper('Magento\Framework\Json\Helper\Data')->jsonE
             </label>
 
             <div class="control">
-                <?php echo $block->escapeHtml($block->countrySelect('credit_card' . '[billing_address][country_code_alpha2]', 'billing_address_country', $default)); ?>
+                <?php echo $block->escapeHtml($block->countrySelect('credit_card[billing_address][country_code_alpha2]', 'billing_address_country', $default)); ?>
             </div>
         </div>
     </fieldset>

app/code/Magento/Braintree/view/frontend/templates/form.phtml

@@ -39,8 +39,8 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
                 <select id="<?php /* @noEscape */ echo $code; ?>_cc_token" name="payment[cc_token]">
                     <?php foreach ($storedCards as $creditCard): ?>
                         <option value="<?php echo $block->escapeHtml($creditCard->token); ?>"
-                            <?php /* @noEscape */ echo $creditCard->default ? ' selected="selected"' : '' ?>>
-                            <?php echo $block->escapeHtml($creditCard->maskedNumber . ' - ' . $creditCard->cardType); ?>
+                            <?php /* @noEscape */ echo $creditCard->default ? ' selected="selected"' : ''; ?>>
+                            <?php echo $block->escapeHtml($creditCard->maskedNumber); ?> - <?php echo $block->escapeHtml($creditCard->cardType); ?>
                         </option>
                     <?php endforeach; ?>
                         <option value=''><?php echo $block->escapeHtml(__('Add new card')); ?></option>