Skip to content

Commit 9ed7c7d

Browse files
Merge pull request #938 from magento-qmt/MTA-4123
Tasks: - MTA-4123: Check skipped CreateTaxRule and CreateSimpleProductEntityWithSeveralWebsites tests on Jenkins Bugs: - MTA-4121: [FT] Magento\Sales\Test\TestCase\CreateOnlineInvoiceEntityTest
2 parents 607a301 + 83c7b90 commit 9ed7c7d

File tree

6 files changed

+5
-12
lines changed

6 files changed

+5
-12
lines changed

dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertAuthorizationInCommentsHistory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class AssertAuthorizationInCommentsHistory extends AbstractConstraint
1818
/**
1919
* Pattern of message about authorized amount in order.
2020
*/
21-
const AUTHORIZED_AMOUNT_PATTERN = '/(IPN "Pending" )*Authorized amount of \w*\W{1,2}%s. Transaction ID: "[\w\-]*"/';
21+
const AUTHORIZED_AMOUNT_PATTERN = '/(IPN "Pending" )*Authorized amount of .+?%s. Transaction ID: "[\w\-]*"/';
2222

2323
/**
2424
* Assert that comment about authorized amount exists in Comments History section on order page in Admin.

dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCaptureInCommentsHistory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class AssertCaptureInCommentsHistory extends AbstractConstraint
1919
/**
2020
* Pattern of message about captured amount in order.
2121
*/
22-
const CAPTURED_AMOUNT_PATTERN = '/^Captured amount of [\W]{1,2}%s online\. Transaction ID: "[\w\-]*"/';
22+
const CAPTURED_AMOUNT_PATTERN = '/^Captured amount of .+?%s online\. Transaction ID: "[\w\-]*"/';
2323

2424
/**
2525
* Assert that comment about captured amount exists in Comments History section on order page in Admin.

dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCommentsHistory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class AssertRefundInCommentsHistory extends AbstractConstraint
1919
/**
2020
* Pattern of message about refunded amount in order.
2121
*/
22-
const REFUNDED_AMOUNT_PATTERN = '/^We refunded \w*\W{1,2}%s online. Transaction ID: "[\w\-]*"/';
22+
const REFUNDED_AMOUNT_PATTERN = '/^We refunded .+?%s online. Transaction ID: "[\w\-]*"/';
2323

2424
/**
2525
* Assert that comment about refunded amount exists in Comments History section on order page in Admin.

dev/tests/functional/tests/app/Magento/Sales/Test/Repository/OrderInjectable/Invoice.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,6 @@
6262
<item name="comment_text" xsi:type="string">Partial Invoice with changed qty = 0</item>
6363
</item>
6464
</field>
65-
<field name="1" xsi:type="array">
66-
<item name="form_data" xsi:type="array">
67-
<item name="do_shipment" xsi:type="string">No</item>
68-
<item name="comment_text" xsi:type="string">Partial Invoice to the rest of order items</item>
69-
</item>
70-
</field>
7165
</dataset>
7266
</repository>
7367
</config>

dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
<constraint name="Magento\Tax\Test\Constraint\AssertTaxRuleForm" />
4949
</variation>
5050
<variation name="CreateTaxRuleEntityTestVariation4">
51-
<data name="tag" xsi:type="string">stable:no</data>
5251
<data name="taxRule/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
5352
<data name="taxRule/data/tax_rate/dataset/rate_0" xsi:type="string">withZipRange</data>
5453
<data name="taxRule/data/tax_rate/dataset/rate_1" xsi:type="string">US-CA-Rate_1</data>

dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductWithSeveralWebsitesUrlRewriteTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\UrlRewrite\Test\TestCase\CreateProductWithSeveralWebsitesUrlRewriteTest" summary="Test product url rewrites when it is created in several websites">
1010
<variation name="CreateSimpleProductEntityWithSeveralWebsites" summary="Create product with several websites and check URL Rewites" ticketId="MAGETWO-27238">
11-
<data name="issue" xsi:type="string">MAGETWO-63645: [FT] Magento\UrlRewrite\Test\TestCase\CreateProductWithSeveralWebsitesUrlRewriteTest randomly fails on CI</data>
12-
<data name="tag" xsi:type="string">to_maintain:yes</data>
11+
<data name="tag" xsi:type="string">stable:no</data>
12+
<data name="issue" xsi:type="string">MAGETWO-66532: [FT] Magento\UrlRewrite\Test\TestCase\CreateProductWithSeveralWebsitesUrlRewriteTest randomly fails on Jenkins</data>
1313
<data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
1414
<data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
1515
<data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>

0 commit comments

Comments
 (0)