Skip to content

Commit afea900

Browse files
authored
Merge pull request #142 from magento-commerce/feature/ado-129-override-false-negatives-mftf
Override false negatives mftf
2 parents bbf16a0 + 35f085a commit afea900

File tree

59 files changed

+573
-3
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+573
-3
lines changed

app/code/Meta/BusinessExtension/Model/System/Config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -839,7 +839,7 @@ public function isActiveCollectionsSync($scopeId = null, $scope = null)
839839
*/
840840
public function isServerTestModeEnabled(int $scopeId = null, string $scope = null): bool
841841
{
842-
return $this->getConfig(self::XML_PATH_FACEBOOK_CONVERSION_MANAGEMENT_ENABLE_SERVER_TEST, $scopeId, $scope);
842+
return (bool) $this->getConfig(self::XML_PATH_FACEBOOK_CONVERSION_MANAGEMENT_ENABLE_SERVER_TEST, $scopeId, $scope);
843843
}
844844

845845
/**

app/code/Meta/Conversion/Test/Mftf/Legacy/Metadata/ProductMeta.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<field key="type_id">string</field>
1515
<field key="attribute_set_id">integer</field>
1616
<field key="weight">integer</field>
17-
<field key="extension_attributes">productExtensionAttribute</field>
17+
<field key="extension_attributes">product_extension_attribute</field>
1818
<array key="custom_attributes">
1919
<value>customAttributeArray</value>
2020
</array>
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
5+
<actionGroup name="AdminOrderClickSelectPaymentSubmitOrderActionGroup">
6+
<annotations>
7+
<description>Click "Submit Order" button for order.</description>
8+
</annotations>
9+
<conditionalClick
10+
selector="{{AdminOrderFormPaymentSection.linkPaymentOptions}}"
11+
dependentSelector="{{AdminOrderFormPaymentSection.linkPaymentOptions}}"
12+
visible="true"
13+
stepKey="showPaymentOptions"
14+
before="clickSubmitOrder"
15+
/>
16+
<waitForElementVisible selector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" stepKey="waitForPaymentOptions" after="showPaymentOptions"/>
17+
<selectOption selector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" userInput="{{PaymentMethodCheckMoneyOrder.method}}" stepKey="checkCheckMoneyOrder" after="waitForPaymentOptions"/>
18+
<waitForPageLoad stepKey="waitForPaymentMethodSelected" after="checkCheckMoneyOrder" />
19+
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
20+
<waitForPageLoad stepKey="waitForOrderPageToLoad"/>
21+
</actionGroup>
22+
</actionGroups>
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
5+
<actionGroup name="AdminSelectPaymentSubmitOrderActionGroup">
6+
<conditionalClick
7+
selector="{{AdminOrderFormPaymentSection.linkPaymentOptions}}"
8+
dependentSelector="{{AdminOrderFormPaymentSection.linkPaymentOptions}}"
9+
visible="true"
10+
stepKey="showPaymentOptions"
11+
before="scrollToSubmitButton"
12+
/>
13+
<waitForElementVisible selector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" stepKey="waitForPaymentOptions" after="showPaymentOptions"/>
14+
<selectOption selector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" userInput="{{PaymentMethodCheckMoneyOrder.method}}" stepKey="checkCheckMoneyOrder" after="waitForPaymentOptions"/>
15+
<waitForPageLoad stepKey="waitForPaymentMethodSelected" after="checkCheckMoneyOrder" />
16+
<scrollTo selector="{{OrdersGridSection.submitOrder}}" stepKey="scrollToSubmitButton"/>
17+
<click selector="{{OrdersGridSection.submitOrder}}" stepKey="submitOrder"/>
18+
<waitForPageLoad stepKey="waitForPageLoad"/>
19+
<see stepKey="seeSuccessMessageForOrder" userInput="You created the order."/>
20+
</actionGroup>
21+
</actionGroups>
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
5+
<actionGroup name="CreateOrderInStoreSelectPaymentActionGroup">
6+
<annotations>
7+
<description>Goes to the Admin Create Order page. Creates an Order based on the provided Customer, Store View and Product. Validates that the Success Message is present and correct.</description>
8+
</annotations>
9+
<arguments>
10+
<argument name="product"/>
11+
<argument name="customer"/>
12+
<argument name="storeView"/>
13+
</arguments>
14+
15+
<amOnPage stepKey="navigateToNewOrderPage" url="{{AdminOrderCreatePage.url}}"/>
16+
<click stepKey="chooseCustomer" selector="{{AdminOrdersGridSection.customerInOrdersSection(customer.firstname)}}"/>
17+
<waitForPageLoad stepKey="waitForStoresPageOpened"/>
18+
<click stepKey="chooseStore" selector="{{AdminOrderStoreScopeTreeSection.storeForOrder(storeView.name)}}"/>
19+
<scrollToTopOfPage stepKey="scrollToTop"/>
20+
<waitForPageLoad stepKey="waitForStoreToAppear"/>
21+
<click selector="{{OrdersGridSection.addProducts}}" stepKey="clickOnAddProducts"/>
22+
<waitForPageLoad stepKey="waitForProductsListForOrder"/>
23+
<click selector="{{AdminOrdersGridSection.productForOrder(product.sku)}}" stepKey="chooseTheProduct"/>
24+
<click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="addSelectedProductToOrder"/>
25+
<waitForPageLoad stepKey="waitForProductAddedInOrder"/>
26+
<click selector="{{AdminOrderFormPaymentSection.header}}" stepKey="unfocus"/>
27+
<conditionalClick
28+
selector="{{AdminOrderFormPaymentSection.linkPaymentOptions}}"
29+
dependentSelector="{{AdminOrderFormPaymentSection.linkPaymentOptions}}"
30+
visible="true"
31+
stepKey="showPaymentOptions"
32+
/>
33+
<waitForElementVisible selector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" stepKey="waitForPaymentOptions"/>
34+
<selectOption selector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" userInput="{{PaymentMethodCheckMoneyOrder.method}}" stepKey="checkCheckMoneyOrder"/>
35+
<waitForPageLoad stepKey="waitForPageLoadOrder" />
36+
<click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
37+
<waitForPageLoad stepKey="waitForShippingMethods"/>
38+
<click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
39+
<waitForPageLoad stepKey="waitForShippingMethodsThickened"/>
40+
<click selector="{{OrdersGridSection.submitOrder}}" stepKey="submitOrder"/>
41+
<see stepKey="seeSuccessMessageForOrder" userInput="You created the order."/>
42+
</actionGroup>
43+
</actionGroups>
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
5+
<test name="AdminAssignProductAttributeToAttributeSetTest">
6+
<actionGroup ref="AssignAttributeToGroupActionGroup" stepKey="assignAttributeToGroup">
7+
<argument name="group" value="General"/>
8+
<argument name="attribute" value="$$attribute.attribute_code$$"/>
9+
</actionGroup>
10+
</test>
11+
</tests>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
5+
<test name="AdminCacheValidationWhenGroupedProductIsSoldOutOnSingleStockModeTest">
6+
<actionGroup ref="OrderSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrderPayment" before="selectFlatRateShipping"/>
7+
</test>
8+
</tests>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
5+
<test name="AdminCancelTheCreatedOrderWithCheckMoneyOrderPaymentMethodTest">
6+
<actionGroup ref="OrderSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrderPayment" before="selectFlatRateShippingMethod"/>
7+
</test>
8+
</tests>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
5+
<test name="AdminCancelTheCreatedOrderWithProductQtyWithoutStockDecreaseTest">
6+
<actionGroup ref="OrderSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrderPayment" before="selectFlatRateShippingMethod"/>
7+
</test>
8+
</tests>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
5+
<test name="AdminCancelTheCreatedOrderWithZeroSubtotalCheckoutTest">
6+
<actionGroup ref="OrderSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrderPayment" after="selectFlatRateShippingMethod"/>
7+
</test>
8+
</tests>

0 commit comments

Comments
 (0)