Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 77acbc9

Browse files
Merge pull request #9 from sanganinamrata/2.3-develop-PR-port-16581
[Forwardport] Removed double occurrences from files.
2 parents 2456027 + 2a11e10 commit 77acbc9

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
9-
<testCase name="Magento\Paypal\Test\TestCase\CreateOnlineCreditMemoPayflowLinkTest" summary="Create online credit memo for order placed with with PayPal Payflow Link">
9+
<testCase name="Magento\Paypal\Test\TestCase\CreateOnlineCreditMemoPayflowLinkTest" summary="Create online credit memo for order placed with PayPal Payflow Link">
1010
<variation name="CreateOnlineCreditMemoPayflowLinkVariation1" summary="Create Refund for Order Paid with PayPal Payflow Link" ticketId="MAGETWO-13061">
1111
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
1212
<data name="products/0" xsi:type="string">catalogProductSimple::product_100_dollar</data>

dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@
9696
<field name="stop_rules_processing" xsi:type="string">Yes</field>
9797
</dataset>
9898
<dataset name="active_sales_rule_with_complex_conditions">
99-
<field name="name" xsi:type="string">Cart Price Rule with with complex conditions %isolation%</field>
100-
<field name="description" xsi:type="string">Cart Price Rule with with complex conditions</field>
99+
<field name="name" xsi:type="string">Cart Price Rule with complex conditions %isolation%</field>
100+
<field name="description" xsi:type="string">Cart Price Rule with complex conditions</field>
101101
<field name="is_active" xsi:type="string">Yes</field>
102102
<field name="website_ids" xsi:type="array">
103103
<item name="0" xsi:type="string">Main Website</item>
@@ -129,8 +129,8 @@
129129
<field name="stop_rules_processing" xsi:type="string">Yes</field>
130130
<field name="simple_free_shipping" xsi:type="string">For matching items only</field>
131131
<field name="store_labels" xsi:type="array">
132-
<item name="0" xsi:type="string">Cart Price Rule with with complex conditions</item>
133-
<item name="1" xsi:type="string">Cart Price Rule with with complex conditions</item>
132+
<item name="0" xsi:type="string">Cart Price Rule with complex conditions</item>
133+
<item name="1" xsi:type="string">Cart Price Rule with complex conditions</item>
134134
</field>
135135
</dataset>
136136

dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
</variation>
9898
<variation name="CreateTaxWithFptTestVariation5" firstConstraint="Magento\Weee\Test\Constraint\AssertFptApplied" method="test">
9999
<data name="tag" xsi:type="string">to_maintain:yes</data>
100-
<data name="description" xsi:type="string">Check taxed FPT display set to Excluding, Description and Including FPT on product with with custom option catalog price Excluding Tax</data>
100+
<data name="description" xsi:type="string">Check taxed FPT display set to Excluding, Description and Including FPT on product with custom option catalog price Excluding Tax</data>
101101
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_excl_disc_on_excl</data>
102102
<data name="productData" xsi:type="string">with_custom_option_and_fpt</data>
103103
<data name="prices/category_price" xsi:type="string">70.00</data>
@@ -117,7 +117,7 @@
117117
<constraint name="Magento\Weee\Test\Constraint\AssertFptApplied" />
118118
</variation>
119119
<variation name="CreateTaxWithFptTestVariation6" firstConstraint="Magento\Weee\Test\Constraint\AssertFptApplied" method="test">
120-
<data name="description" xsi:type="string">Check taxed FPT display set to Including FPT and Description on product with with custom option catalog price Excluding Tax</data>
120+
<data name="description" xsi:type="string">Check taxed FPT display set to Including FPT and Description on product with custom option catalog price Excluding Tax</data>
121121
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_excl_disc_on_incl, display_including_tax</data>
122122
<data name="productData" xsi:type="string">with_custom_option_and_fpt</data>
123123
<data name="prices/category_price" xsi:type="string">86.60</data>
@@ -173,7 +173,7 @@
173173
<constraint name="Magento\Weee\Test\Constraint\AssertFptApplied" />
174174
</variation>
175175
<variation name="CreateTaxWithFptTestVariation9" firstConstraint="Magento\Weee\Test\Constraint\AssertFptApplied" method="test">
176-
<data name="description" xsi:type="string">Check taxed FPT display set to Excluding, Description and Including FPT on product with with special price and catalog price Including Tax</data>
176+
<data name="description" xsi:type="string">Check taxed FPT display set to Excluding, Description and Including FPT on product with special price and catalog price Including Tax</data>
177177
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_incl_disc_on_excl</data>
178178
<data name="productData" xsi:type="string">with_special_price_and_fpt</data>
179179
<data name="prices/category_price" xsi:type="string">92.38</data>
@@ -193,7 +193,7 @@
193193
<constraint name="Magento\Weee\Test\Constraint\AssertFptApplied" />
194194
</variation>
195195
<variation name="CreateTaxWithFptTestVariation10" firstConstraint="Magento\Weee\Test\Constraint\AssertFptApplied" method="test">
196-
<data name="description" xsi:type="string">Check taxed FPT display set to Including FPT and Description on product with with special price and catalog price Including Tax</data>
196+
<data name="description" xsi:type="string">Check taxed FPT display set to Including FPT and Description on product with special price and catalog price Including Tax</data>
197197
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_incl_disc_on_incl</data>
198198
<data name="productData" xsi:type="string">with_special_price_and_fpt</data>
199199
<data name="prices/category_price" xsi:type="string">101.62</data>
@@ -210,7 +210,7 @@
210210
</variation>
211211
<variation name="CreateTaxWithFptTestVariation11" firstConstraint="Magento\Weee\Test\Constraint\AssertFptApplied" method="test">
212212
<data name="issue" xsi:type="string">MAGETWO-44968: FPT Final price includes tax on custom option, when display is set to excluding tax</data>
213-
<data name="description" xsi:type="string">Check taxed FPT display set to Excluding, Description and Including FPT on product with with custom option and catalog price Including Tax</data>
213+
<data name="description" xsi:type="string">Check taxed FPT display set to Excluding, Description and Including FPT on product with custom option and catalog price Including Tax</data>
214214
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_incl_disc_on_excl</data>
215215
<data name="productData" xsi:type="string">with_custom_option_and_fpt</data>
216216
<data name="prices/category_price" xsi:type="string">64.67</data>

setup/src/Magento/Setup/Module/Di/Code/Scanner/ConfigurationScanner.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function __construct(
2828
*
2929
* @param string $fileName
3030
*
31-
* @return array array of paths to the configuration files
31+
* @return array of paths to the configuration files
3232
*/
3333
public function scan($fileName)
3434
{

0 commit comments

Comments
 (0)