Skip to content

Commit db47d6c

Browse files
avattam06avattam06
authored
Merge branch '2.4-develop' into paypalflowpro-graphql
2 parents 05e9e4e + 00f8a8c commit db47d6c

File tree

695 files changed

+29168
-1259
lines changed

Some content is hidden

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

695 files changed

+29168
-1259
lines changed

‎.github/CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ For more detailed information on contribution please read our [beginners guide](
2323
* Unit/integration test coverage
2424
* Proposed [documentation](https://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
2525
4. For larger features or changes, please [open an issue](https://github.com/magento/magento2/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
26-
5. All automated tests must pass (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
26+
5. All automated tests must pass.
2727

2828
## Contribution process
2929

‎.htaccess‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -238,15 +238,6 @@
238238
Require all denied
239239
</IfVersion>
240240
</Files>
241-
<Files .travis.yml>
242-
<IfVersion < 2.4>
243-
order allow,deny
244-
deny from all
245-
</IfVersion>
246-
<IfVersion >= 2.4>
247-
Require all denied
248-
</IfVersion>
249-
</Files>
250241
<Files CHANGELOG.md>
251242
<IfVersion < 2.4>
252243
order allow,deny

‎.htaccess.sample‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -238,15 +238,6 @@
238238
Require all denied
239239
</IfVersion>
240240
</Files>
241-
<Files .travis.yml>
242-
<IfVersion < 2.4>
243-
order allow,deny
244-
deny from all
245-
</IfVersion>
246-
<IfVersion >= 2.4>
247-
Require all denied
248-
</IfVersion>
249-
</Files>
250241
<Files CHANGELOG.md>
251242
<IfVersion < 2.4>
252243
order allow,deny

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
</actionGroup>
7171

7272
<!--Save the product-->
73-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
73+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
7474
<see userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
7575

7676
<!--Checking on admin side-->
@@ -117,7 +117,7 @@
117117
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '3')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillNewProductDefaultQty2"/>
118118

119119
<!--Save the product-->
120-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAgain"/>
120+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButtonAgain"/>
121121
<see userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
122122

123123
<!--Checking on admin side-->

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku}}" stepKey="fillProductSku"/>
5050

5151
<!--save the product/published by default-->
52-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
52+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
5353
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
5454

5555
<!--Testing that price appears correctly in admin catalog-->
@@ -70,7 +70,7 @@
7070
<click selector="{{AdminProductFormSection.attributeSetFilterResult}}" stepKey="selectAttrSet2"/>
7171

7272
<!--save the product/published by default-->
73-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton2"/>
73+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton2"/>
7474
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown2"/>
7575

7676
<!--Testing that price appears correctly in admin catalog-->

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
<selectOption selector="{{AdminProductFormBundleSection.countryOfManufactureDropDown}}" userInput="France" stepKey="countryOfManufactureDropDown"/>
144144

145145
<!--Save the product-->
146-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
146+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
147147
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
148148

149149
<!--Verify form was filled out correctly after edit-->

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminCreateAndEditBundleProductOptionsNegativeTest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111

112112
<!-- Save product form -->
113113
<actionGroup ref="SaveProductFormActionGroup" stepKey="clickSaveProduct"/>
114-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveWithTwoOptions"/>
114+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveWithTwoOptions"/>
115115
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
116116

117117
<!-- Delete created bundle product -->

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<actionGroup ref="AncillaryPrepBundleProductActionGroup" stepKey="createBundledProductForTwoSimpleProducts"/>
5858

5959
<!--Save the product-->
60-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
60+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
6161
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
6262

6363
<!--Go to catalog deletion page-->

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
</actionGroup>
5252

5353
<!--Save the product-->
54-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
54+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
5555
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
5656

5757
<actionGroup ref="AddRelatedProductBySkuActionGroup" stepKey="addRelatedProduct1">
@@ -62,7 +62,7 @@
6262
<click selector="{{AdminProductFormRelatedUpSellCrossSellSection.removeRelatedProduct($$simpleProduct0.sku$$)}}" stepKey="removeRelatedProduct"/>
6363

6464
<!--Save the product-->
65-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAfterEdit"/>
65+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButtonAfterEdit"/>
6666
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
6767

6868
<!--See related product in admin-->

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<actionGroup ref="AncillaryPrepBundleProductActionGroup" stepKey="createBundledProductForTwoSimpleProducts"/>
5858

5959
<!--Save the product-->
60-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
60+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
6161
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
6262

6363
<!--Apply Bundle Product Filter-->

0 commit comments

Comments
 (0)