Skip to content

Commit 529b086

Browse files
abrarpathan19abrarpathan19
authored
Merge pull request #1 from magento/2.3-develop
2.3 - Develop update
2 parents b9bd738 + 5498231 commit 529b086

File tree

774 files changed

+17309
-4602
lines changed

Some content is hidden

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

774 files changed

+17309
-4602
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ atlassian*
3333
/.php_cs
3434
/.php_cs.cache
3535
/grunt-config.json
36-
/dev/tools/grunt/configs/local-themes.js
3736
/pub/media/*.*
3837
!/pub/media/.htaccess
3938
/pub/media/attribute/*

‎.travis.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ env:
3333
- TEST_SUITE=integration INTEGRATION_INDEX=2
3434
- TEST_SUITE=integration INTEGRATION_INDEX=3
3535
- TEST_SUITE=functional
36+
- TEST_SUITE=graphql-api-functional
3637
matrix:
3738
exclude:
3839
- php: 7.1
@@ -43,6 +44,8 @@ matrix:
4344
env: TEST_SUITE=js GRUNT_COMMAND=static
4445
- php: 7.1
4546
env: TEST_SUITE=functional
47+
- php: 7.1
48+
env: TEST_SUITE=graphql-api-functional
4649
cache:
4750
apt: true
4851
directories:
@@ -61,5 +64,6 @@ script:
6164

6265
# The scripts for grunt/phpunit type tests
6366
- if [ $TEST_SUITE == "functional" ]; then dev/tests/functional/vendor/phpunit/phpunit/phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
64-
- if [ $TEST_SUITE != "functional" ] && [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
67+
- if [ $TEST_SUITE != "functional" ] && [ $TEST_SUITE != "js"] && [ $TEST_SUITE != "graphql-api-functional" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
6568
- if [ $TEST_SUITE == "js" ]; then grunt $GRUNT_COMMAND; fi
69+
- if [ $TEST_SUITE == "graphql-api-functional" ]; then phpunit -c dev/tests/api-functional; fi

‎CHANGELOG.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ To get detailed information about changes in Magento 2.1.0, please visit [Magent
157157
* Updated styles
158158
* Sample Data:
159159
* Improved sample data installation UX
160-
* Updated sample data with Product Heros, color swatches, MAP and rule based product relations
160+
* Updated sample data with Product Heroes, color swatches, MAP and rule based product relations
161161
* Improved sample data upgrade flow
162162
* Added the ability to log errors and set the error flag during sample data installation
163163
* Various improvements:
@@ -2284,7 +2284,7 @@ Tests:
22842284
* Fixed an issue where no results were found for Coupons reports
22852285
* Fixed an issue with incremental Qty setting
22862286
* Fixed an issue with allowing importing of negative weight values
2287-
* Fixed an issue with Inventory - Only X left Treshold being not dependent on Qty for Item's Status to Become Out of Stock
2287+
* Fixed an issue with Inventory - Only X left Threshold being not dependent on Qty for Item's Status to Become Out of Stock
22882288
* Fixed an issue where the "Catalog Search Index index was rebuilt." message was displayed when reindexing the Catalog Search index
22892289
* Search module:
22902290
* Integrated the Search library to the advanced search functionality
@@ -2706,7 +2706,7 @@ Tests:
27062706
* Ability to support extensible service data objects
27072707
* No Code Duplication in Root Templates
27082708
* Fixed bugs:
2709-
* Persistance session application. Loggin out the customer
2709+
* Persistence session application. Logging out the customer
27102710
* Placing the order with two terms and conditions
27112711
* Saving of custom option by service catalogProductCustomOptionsWriteServiceV1
27122712
* Placing the order on frontend if enter in the street address line 1 and 2 255 symbols
@@ -2965,7 +2965,7 @@ Tests:
29652965
* Fixed an issue with incorrect items label for the cases when there are more than one item in the category
29662966
* Fixed an issue when configurable product was out of stock in Google Shopping while being in stock in the Magento backend
29672967
* Fixed an issue when swipe gesture in menu widget was not supported on mobile
2968-
* Fixed an issue when it was impossible to enter alpha-numeric zip code on the stage of estimating shipping and tax rates
2968+
* Fixed an issue when it was impossible to enter alphanumeric zip code on the stage of estimating shipping and tax rates
29692969
* Fixed an issue when custom price was not applied when editing an order
29702970
* Fixed an issue when items were not returned to stock after unsuccessful order was placed
29712971
* Fixed an issue when error message appeared "Cannot save the credit memo” while creating credit memo

‎app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,13 @@ public function testGetAllWebsitesValue()
103103
$this->webSiteModel->expects($this->once())->method('getBaseCurrency')->willReturn($currency);
104104

105105
$expectedResult = AdvancedPricing::VALUE_ALL_WEBSITES . ' [' . $currencyCode . ']';
106-
$this->websiteString = $this->getMockBuilder(
106+
$websiteString = $this->getMockBuilder(
107107
\Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator\Website::class
108108
)
109109
->setMethods(['_clearMessages', '_addMessages'])
110110
->setConstructorArgs([$this->storeResolver, $this->webSiteModel])
111111
->getMock();
112-
$result = $this->websiteString->getAllWebsitesValue();
112+
$result = $websiteString->getAllWebsitesValue();
113113

114114
$this->assertEquals($expectedResult, $result);
115115
}

‎app/code/Magento/Analytics/Test/Mftf/Page/AdminConfigPage.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
9+
<page name="AdminConfigGeneralAnalyticsPage" url="admin/system_config/edit/section/analytics/" area="admin" module="Magento_Config">
10+
<section name="AdminConfigAdvancedReportingSection"/>
11+
</page>
12+
</pages>

‎app/code/Magento/Analytics/Test/Mftf/Section/AdminConfigSection.xml‎ renamed to ‎app/code/Magento/Analytics/Test/Mftf/Section/AdminConfigAdvancedReportingSection.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*/
77
-->
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
9-
<section name="AdminConfigSection">
10-
<element name="advancedReportingMenuItem" type="text" selector="//*[@id='system_config_tabs']/div[1]//span[text()='Advanced Reporting']"/>
9+
<section name="AdminConfigAdvancedReportingSection">
10+
<element name="advancedReportingMenuItem" type="text" selector="//*[@class='admin__page-nav-link item-nav']//span[text()='Advanced Reporting']"/>
1111
<element name="advancedReportingService" type="select" selector="#analytics_general_enabled"/>
1212
<element name="advancedReportingServiceLabel" type="text" selector="#row_analytics_general_enabled>td.label>label>span"/>
1313
<element name="advancedReportingServiceStatus" type="text" selector="#row_analytics_general_enabled>td.value>p>span"/>
@@ -17,6 +17,5 @@
1717
<element name="advancedReportingMinute" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(3)"/>
1818
<element name="advancedReportingSeconds" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(4)"/>
1919
<element name="advancedReportingBlankIndustryError" type="text" selector=".message-error>div"/>
20-
<element name="advancedReportingSuccessMessage" type="text" selector=".message-success>div"/>
2120
</section>
22-
</sections>
21+
</sections>

‎app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,14 @@
1818
<group value="analytics"/>
1919
</annotations>
2020
<after>
21-
<amOnPage stepKey="amOnLogoutPage" url="admin/admin/auth/logout/"/>
21+
<actionGroup ref="logout" stepKey="logoutOfAdmin"/>
2222
</after>
2323
<actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
24-
<amOnPage stepKey="amOnAdminConfig" url="{{AdminConfigPage.url}}"/>
25-
<waitForPageLoad stepKey="waitForAdminConfig"/>
26-
<click stepKey="clickAdvancedReportingConfigMenu" selector="{{AdminConfigSection.advancedReportingMenuItem}}"/>
27-
<see stepKey="seeAdvancedReportingIndustryLabel" selector="{{AdminConfigSection.advancedReportingIndustryLabel}}" userInput="Industry"/>
28-
<selectOption stepKey="selectAdvancedReportingIndustry" selector="{{AdminConfigSection.advancedReportingIndustry}}" userInput="--Please Select--"/>
29-
<click stepKey="clickSaveConfigButton" selector="{{AdminConfigSection.saveButton}}"/>
30-
<see stepKey="seeBlankIndustryErrorMessage" selector="{{AdminConfigSection.advancedReportingBlankIndustryError}}" userInput="Please select an industry."/>
24+
<amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
25+
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
26+
<see selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustryLabel}}" userInput="Industry" stepKey="seeAdvancedReportingIndustryLabel"/>
27+
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustry}}" userInput="--Please Select--" stepKey="selectAdvancedReportingIndustry"/>
28+
<click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveConfigButton"/>
29+
<see selector="{{AdminConfigAdvancedReportingSection.advancedReportingBlankIndustryError}}" userInput="Please select an industry." stepKey="seeBlankIndustryErrorMessage"/>
3130
</test>
3231
</tests>

‎app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,24 @@
1818
<group value="analytics"/>
1919
</annotations>
2020
<after>
21-
<amOnPage stepKey="amOnLogoutPage" url="admin/admin/auth/logout/"/>
21+
<actionGroup ref="logout" stepKey="logoutOfAdmin"/>
2222
</after>
2323
<actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
24-
<!--Goto admin stores configure page -->
25-
<amOnPage stepKey="amOnAdminConfig" url="{{AdminConfigPage.url}}"/>
26-
<!--Enable Advanced Reporting-->
27-
<click stepKey="clickAdvancedReportingConfigMenu" selector="{{AdminConfigSection.advancedReportingMenuItem}}"/>
28-
<see stepKey="seeAdvancedReportingServiceLabelEnabled" selector="{{AdminConfigSection.advancedReportingServiceLabel}}" userInput="Advanced Reporting Service"/>
29-
<selectOption stepKey="selectAdvancedReportingServiceEnabled" selector="{{AdminConfigSection.advancedReportingService}}" userInput="Enable"/>
30-
<see stepKey="seeAdvancedReportingIndustryLabel" selector="{{AdminConfigSection.advancedReportingIndustryLabel}}" userInput="Industry"/>
31-
<selectOption stepKey="selectAdvancedReportingIndustry" selector="{{AdminConfigSection.advancedReportingIndustry}}" userInput="Apps and Games"/>
32-
<click stepKey="clickSaveConfigButtonEnabled" selector="{{AdminConfigSection.saveButton}}"/>
33-
<see stepKey="seeSaveConfigurationMessageEnabled" selector="{{AdminConfigSection.advancedReportingSuccessMessage}}" userInput="You saved the configuration."/>
34-
<see stepKey="seeAdvancedReportingServiceEnabled" selector="{{AdminConfigSection.advancedReportingService}}" userInput="Enable"/>
35-
<see stepKey="seeAdvancedReportingServiceStatusEnabled" selector="{{AdminConfigSection.advancedReportingServiceStatus}}" userInput="Subscription status: Pending"/>
24+
<amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
25+
<see selector="{{AdminConfigAdvancedReportingSection.advancedReportingServiceLabel}}" userInput="Advanced Reporting Service" stepKey="seeAdvancedReportingServiceLabelEnabled"/>
26+
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
27+
<see selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustryLabel}}" userInput="Industry" stepKey="seeAdvancedReportingIndustryLabel"/>
28+
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustry}}" userInput="Apps and Games" stepKey="selectAdvancedReportingIndustry"/>
29+
<click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveConfigButton1"/>
30+
<see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeSuccess"/>
31+
<see selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="seeAdvancedReportingServiceEnabled"/>
32+
<see selector="{{AdminConfigAdvancedReportingSection.advancedReportingServiceStatus}}" userInput="Subscription status: Pending" stepKey="seeAdvancedReportingServiceStatusEnabled"/>
3633
<!--Disable Advanced Reporting-->
37-
<see stepKey="seeAdvancedReportingServiceLabelDisabled" selector="{{AdminConfigSection.advancedReportingServiceLabel}}" userInput="Advanced Reporting Service"/>
38-
<selectOption stepKey="selectAdvancedReportingServiceDisabled" selector="{{AdminConfigSection.advancedReportingService}}" userInput="Disable"/>
39-
<click stepKey="clickSaveConfigButtonDisabled" selector="{{AdminConfigSection.saveButton}}"/>
40-
<see stepKey="seeSaveConfigurationMessageDisabled" selector="{{AdminConfigSection.advancedReportingSuccessMessage}}" userInput="You saved the configuration."/>
41-
<see stepKey="seeAdvancedReportingServiceDisabled" selector="{{AdminConfigSection.advancedReportingService}}" userInput="Disable"/>
42-
<see stepKey="seeAdvancedReportingServiceStatusDisabled" selector="{{AdminConfigSection.advancedReportingServiceStatus}}" userInput="Subscription status: Disabled"/>
34+
<see selector="{{AdminConfigAdvancedReportingSection.advancedReportingServiceLabel}}" userInput="Advanced Reporting Service" stepKey="seeAdvancedReportingServiceLabelDisabled"/>
35+
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Disable" stepKey="selectAdvancedReportingServiceDisabled"/>
36+
<click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveConfigButton2"/>
37+
<see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeSuccess2"/>
38+
<see selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Disable" stepKey="seeAdvancedReportingServiceDisabled"/>
39+
<see selector="{{AdminConfigAdvancedReportingSection.advancedReportingServiceStatus}}" userInput="Subscription status: Disabled" stepKey="seeAdvancedReportingServiceStatusDisabled"/>
4340
</test>
4441
</tests>

‎app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,17 @@
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MAGETWO-63898"/>
1919
<group value="analytics"/>
20+
<skip>
21+
<issueId value="MAGETWO-96223"/>
22+
</skip>
2023
</annotations>
2124

2225
<actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
23-
24-
<amOnPage stepKey="amOnAdminConfig" url="{{AdminConfigPage.url}}"/>
25-
<click stepKey="clickAdvancedReportingConfigMenu" selector="{{AdminConfigSection.advancedReportingMenuItem}}"/>
26-
<see stepKey="seeAdvancedReportingIndustryLabel" selector="{{AdminConfigSection.advancedReportingIndustryLabel}}" userInput="Industry"/>
27-
<selectOption stepKey="selectAdvancedReportingIndustry" selector="{{AdminConfigSection.advancedReportingIndustry}}" userInput="Apps and Games"/>
28-
<click stepKey="clickSaveConfigButton" selector="{{AdminConfigSection.saveButton}}"/>
29-
<see stepKey="seeIndustrySuccessMessage" selector="{{AdminConfigSection.advancedReportingSuccessMessage}}" userInput="You saved the configuration."/>
26+
<amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
27+
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
28+
<see selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustryLabel}}" userInput="Industry" stepKey="seeAdvancedReportingIndustryLabel"/>
29+
<selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustry}}" userInput="Apps and Games" stepKey="selectAdvancedReportingIndustry"/>
30+
<click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveConfigButton"/>
31+
<see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeSuccess"/>
3032
</test>
3133
</tests>

0 commit comments

Comments
 (0)