Skip to content

Commit 14aab2a

Browse files
committed
ACP2E-3992: Customer password reset through GraphQL doesn't honour the restrictions
2 parents 8941867 + 722a932 commit 14aab2a

File tree

69 files changed

+2033
-1811
lines changed

Some content is hidden

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

69 files changed

+2033
-1811
lines changed

app/code/Magento/Bundle/Test/Mftf/Test/EditOrderWithBundleProductBackendTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@
155155
<wait time="2" stepKey="waitForPageLoad2" />
156156
<click selector="{{AdminOrderDetailsMainActionsSection.edit}}" stepKey="clickEditButton"/>
157157
<click selector="{{AdminOrderDetailsMainActionsSection.ok}}" stepKey="clickOk"/>
158+
<waitForElementClickable selector="{{AdminOrderFormItemsSection.configure}}" stepKey="waitForItemConfigureButton"/>
158159
<click selector="{{AdminOrderFormItemsSection.configure}}" stepKey="clickConfigure"/>
159160
<click selector="{{AdminOrderFormConfigureProductSection.selectOption}}" stepKey="clickTodropdown2"/>
160161
<click selector="{{AdminOrderFormConfigureProductSection.selectProductOption('3')}}" stepKey="clickToSelectOption2"/>

app/code/Magento/CatalogRule/Model/Config/CatalogRule.php

Lines changed: 0 additions & 46 deletions
This file was deleted.

app/code/Magento/CatalogRule/Model/ResourceModel/GetAllCatalogRules.php

Lines changed: 0 additions & 56 deletions
This file was deleted.

app/code/Magento/CatalogRule/Model/ResourceModel/GetAppliedCatalogRules.php

Lines changed: 0 additions & 62 deletions
This file was deleted.

app/code/Magento/CatalogRule/etc/adminhtml/system.xml

Lines changed: 0 additions & 26 deletions
This file was deleted.

app/code/Magento/CatalogRule/etc/config.xml

Lines changed: 0 additions & 17 deletions
This file was deleted.

app/code/Magento/CatalogRuleGraphQl/Model/Resolver/AllCatalogRules.php

Lines changed: 0 additions & 55 deletions
This file was deleted.

app/code/Magento/CatalogRuleGraphQl/Model/Resolver/AppliedCatalogRules.php

Lines changed: 0 additions & 60 deletions
This file was deleted.

app/code/Magento/CatalogRuleGraphQl/etc/graphql/di.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,4 @@
99
<type name="Magento\CatalogRule\Pricing\Price\CatalogRulePrice">
1010
<plugin name="update_catalog_rule_price_for_logged_in_customer_group" type="Magento\CatalogRuleGraphQl\Plugin\Pricing\Price\UpdateCatalogRulePrice"/>
1111
</type>
12-
<type name="Magento\StoreGraphQl\Model\Resolver\Store\StoreConfigDataProvider">
13-
<arguments>
14-
<argument name="extendedConfigData" xsi:type="array">
15-
<item name="share_all_catalog_rules" xsi:type="string">catalog/rule/share_all_catalog_rules</item>
16-
<item name="share_applied_catalog_rules" xsi:type="string">catalog/rule/share_applied_catalog_rules</item>
17-
</argument>
18-
</arguments>
19-
</type>
2012
</config>

app/code/Magento/CatalogRuleGraphQl/etc/schema.graphqls

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)