forked from magento/magento2
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from lfolco/2.2-develop-PR-port-17650
[Backport] Use route ID when creating secret keys in backend menus instead of route name
- Loading branch information
Showing
139 changed files
with
2,912 additions
and
496 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| --- | ||
| name: Bug report | ||
| about: Technical issue with the Magento 2 core components | ||
|
|
||
| --- | ||
|
|
||
| <!--- | ||
| Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines | ||
| --> | ||
|
|
||
| ### Preconditions | ||
| <!--- | ||
| Provide the exact Magento version (example: 2.2.5) and any important information on the environment where bug is reproducible. | ||
| --> | ||
| 1. | ||
| 2. | ||
|
|
||
| ### Steps to reproduce | ||
| <!--- | ||
| Important: Provide a set of clear steps to reproduce this bug. We can not provide support without clear instructions on how to reproduce. | ||
| --> | ||
| 1. | ||
| 2. | ||
|
|
||
| ### Expected result | ||
| <!--- Tell us what do you expect to happen. --> | ||
| 1. [Screenshots, logs or description] | ||
| 2. | ||
|
|
||
| ### Actual result | ||
| <!--- Tell us what happened instead. Include error messages and issues. --> | ||
| 1. [Screenshots, logs or description] | ||
| 2. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| --- | ||
| name: Developer experience issue | ||
| about: Issues related to customization, extensibility, modularity | ||
|
|
||
| --- | ||
|
|
||
| <!--- | ||
| Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines | ||
| --> | ||
|
|
||
| ### Summary | ||
| <!--- Describe the issue you are experiencing. Include general information, error messages, environments, and so on. --> | ||
|
|
||
| ### Examples | ||
| <!--- Provide code examples or a patch with a test (recommended) to clearly indicate the problem. --> | ||
|
|
||
| ### Proposed solution | ||
| <!--- Suggest your potential solutions for this issue. --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| --- | ||
| name: Feature request | ||
| about: Please consider reporting directly to https://github.com/magento/community-features | ||
|
|
||
| --- | ||
|
|
||
| <!--- | ||
| Important: This repository is intended only for Magento 2 Technical Issues. Enter Feature Requests at https://github.com/magento/community-features. Project stakeholders monitor and manage requests. Feature requests entered using this form may be moved to the forum. | ||
| --> | ||
|
|
||
| ### Description | ||
| <!--- Describe the feature you would like to add. --> | ||
|
|
||
| ### Expected behavior | ||
| <!--- What is the expected behavior of this feature? How is it going to work? --> | ||
|
|
||
| ### Benefits | ||
| <!--- How do you think this feature would improve Magento? --> | ||
|
|
||
| ### Additional information | ||
| <!--- What other information can you provide about the desired feature? --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
.../Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderFillBraintreeCreditCardActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="AdminOrderFillBraintreeCreditCardActionGroup"> | ||
| <arguments> | ||
| <argument name="cardData" defaultValue="BraintreeCard"/> | ||
| </arguments> | ||
| <waitForLoadingMaskToDisappear stepKey="waitLoadingMaskDisappear"/> | ||
| <conditionalClick selector="{{AdminOrderFormPaymentSection.braintreeCreditCardMethod}}" dependentSelector="{{AdminOrderFormPaymentSection.braintreeCreditCardMethod}}" visible="true" stepKey="chooseBraintreeCreditCard"/> | ||
| <waitForLoadingMaskToDisappear stepKey="waitLoadingMask"/> | ||
| <selectOption selector="{{AdminOrderFormPaymentSection.braintreeCcType}}" userInput="{{cardData.cc_type}}" stepKey="fillCc"/> | ||
| <!--Fill card number--> | ||
| <switchToIFrame selector="{{AdminOrderFormPaymentSection.braintreeCcFrame}}" stepKey="switchToCcIFrame"/> | ||
| <fillField selector="{{AdminOrderFormPaymentSection.braintreeCardNumber}}" userInput="{{cardData.card_number}}" stepKey="fillCardNumber"/> | ||
| <waitForPageLoad stepKey="waitForFillCardNumber" time="1"/> | ||
| <switchToIFrame stepKey="switchToDefaultContext1"/> | ||
| <!--Fill card expiration month--> | ||
| <switchToIFrame selector="{{AdminOrderFormPaymentSection.braintreeCcExpMonthFrame}}" stepKey="switchToCcExpMonthIFrame"/> | ||
| <fillField selector="{{AdminOrderFormPaymentSection.braintreeExpMonth}}" userInput="{{cardData.exp_month}}" stepKey="fillExpMonth"/> | ||
| <waitForPageLoad stepKey="waitForFillCardExpMonth" time="1"/> | ||
| <switchToIFrame stepKey="switchToDefaultContext2"/> | ||
| <!--Fill card expiration year--> | ||
| <switchToIFrame selector="{{AdminOrderFormPaymentSection.braintreeCcExpYear}}" stepKey="switchToCcExpYearIFrame"/> | ||
| <fillField selector="{{AdminOrderFormPaymentSection.braintreeExpYear}}" userInput="{{cardData.exp_year}}" stepKey="fillExpYear"/> | ||
| <waitForPageLoad stepKey="waitForFillCardExpYear" time="1"/> | ||
| <switchToIFrame stepKey="switchToDefaultContext3"/> | ||
| <!--Fill card CVV--> | ||
| <switchToIFrame selector="{{AdminOrderFormPaymentSection.braintreeCvvFrame}}" stepKey="switchToCvvIFrame"/> | ||
| <fillField selector="{{AdminOrderFormPaymentSection.braintreeCvv}}" userInput="{{cardData.cvv}}" stepKey="fillCvv"/> | ||
| <waitForPageLoad stepKey="waitForFillCardCvv" time="1"/> | ||
| <switchToIFrame stepKey="switchToDefaultContext4"/> | ||
| </actionGroup> | ||
| </actionGroups> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
app/code/Magento/Braintree/Test/Mftf/Section/AdminOrderFormPaymentSection.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd"> | ||
| <section name="AdminOrderFormPaymentSection"> | ||
| <element name="braintreeCreditCardMethod" type="radio" selector="#p_method_braintree" timeout="10"/> | ||
| <element name="braintreeCcType" type="select" selector="#braintree_cc_type"/> | ||
| <element name="braintreeCardNumber" type="input" selector="#credit-card-number"/> | ||
| <element name="braintreeExpMonth" type="input" selector="#expiration-month"/> | ||
| <element name="braintreeExpYear" type="input" selector="#expiration-year"/> | ||
| <element name="braintreeCvv" type="input" selector="#cvv"/> | ||
| <element name="braintreeCcFrame" type="iframe" selector="braintree-hosted-field-number"/> | ||
| <element name="braintreeCcExpMonthFrame" type="iframe" selector="braintree-hosted-field-expirationMonth"/> | ||
| <element name="braintreeCcExpYear" type="iframe" selector="braintree-hosted-field-expirationYear"/> | ||
| <element name="braintreeCvvFrame" type="iframe" selector="braintree-hosted-field-cvv"/> | ||
| </section> | ||
| </sections> |
Oops, something went wrong.