Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
760 commits
Select commit Hold shift + click to select a range
cbd3277
ENGCOM-2116: [Forwardport] Fix #15627: Product order in category chan…
Jun 25, 2018
6fa0424
ENGCOM-2115: Magento_Sales integration tests: fix invoice_list fixtur…
Jun 25, 2018
1877e55
ENGCOM-2112: Issue 5316 #16332
Jun 25, 2018
d986ac1
ENGCOM-2032: Fixed breadcrumb quote issue in product page #16148
Jun 25, 2018
6a06383
ENGCOM-2027: 1164: OnePageCheckoutOfflinePaymentMethodsTest rework to…
Jun 25, 2018
91ae1a1
Merge remote-tracking branch 'mainline/2.3-develop' into RE-develop
tomreece Jun 25, 2018
3a64d3c
Fixes updating wishlist item if an item object is passed instead its id.
Jun 25, 2018
dbe8c7b
Merge pull request #2729 from magento-arcticfoxes/MAGETWO-91435
cpartica Jun 25, 2018
b1a2907
MC-223: Admin should be able to add/edit bundle items when creating/e…
Clendenin Jun 25, 2018
ea16909
MC-221: Admin should be able to select/edit the “Attributes Set” when…
Clendenin Jun 25, 2018
99d6268
MC-186: Admin should be able to apply fixed pricing for Bundled Product
Clendenin Jun 25, 2018
ee16a2e
MC-214: Admin should be able to filter product list by type = Bundle …
Clendenin Jun 25, 2018
a417fca
MC-216: Admin should be able to delete a bundle product
Clendenin Jun 25, 2018
36758fa
Merge branch '2.3-develop' into MAGETWO-86795
nathanjosiah Jun 25, 2018
0bba7df
MAGETWO-91555: Admin orders can result in a customer with an example …
dthampy Jun 25, 2018
da60866
MC-216: Admin should be able to delete a bundle product
Clendenin Jun 25, 2018
a816c41
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-62310-…
dthampy Jun 25, 2018
f524c08
Merge branch 'RE-develop' of github.com:magento-pangolin/magento2ce i…
Clendenin Jun 25, 2018
988125c
MQE-1090: Stabilize RE-develop branch
tomreece Jun 25, 2018
2f0074a
MAGETWO-62310: Product "Use Default Value" checkbox for an attributes…
danielrenaud Jun 25, 2018
81520c8
Merge pull request #2757 from magento-borg/MAGETWO-62310-use-default-…
cpartica Jun 25, 2018
1ab9ed1
merge magento/2.3-develop into magento-borg/MAGETWO-91671
Jun 25, 2018
df12d19
merge magento/2.3-develop into magento-borg/MAGETWO-91555
Jun 26, 2018
bf71446
Merge pull request #2758 from magento-borg/MAGETWO-91671
cpartica Jun 26, 2018
22fbe7a
MAGETWO-91555: Admin orders can result in a customer with an example …
Jun 26, 2018
c94a981
Merge remote-tracking branch 'upstream/2.3-develop' into MAGETWO-91555
Jun 26, 2018
5a78f21
[EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Jun 26, 2018
d8e87dc
Strict comparison for form_key
Jun 26, 2018
bf2f3ad
ENGCOM-2134: [Forwardport] Login with wishlist raise report after log…
magento-engcom-team Jun 26, 2018
34dd540
ENGCOM-2135: Use the timeout when querying Elasticsearch #15592
magento-engcom-team Jun 26, 2018
5914661
ENGCOM-2130: [Forwardport] Fixes updating wishlist item if an item ob…
magento-engcom-team Jun 26, 2018
18c67f0
Remove empty line
VladimirZaets Jun 26, 2018
3e0c7c5
ENGCOM-2138: Make configfixture meaningful in ProcessCronQueueObserve…
magento-engcom-team Jun 26, 2018
7ab04bc
ENGCOM-2139: Add @api annotation to Filter Group & Sort Order #16252
magento-engcom-team Jun 26, 2018
01103d9
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Jun 26, 2018
4353482
Merge remote-tracking branch 'mainline/2.3-develop' into PANDA-PR-2.3
igrybkov Jun 26, 2018
ebaa5ea
MAGETWO-89609: [Backport for 2.2.x] Improve import files validation
svitja Jun 26, 2018
e1e5970
MAGETWO-90301: Extend MFTF tests to check Checkout Success page
1408sheva Jun 26, 2018
5487dfa
MAGETWO-92985: Duplicate required fields symbols in Category -> Displ…
svitja Jun 26, 2018
26bac6f
Merge pull request #2754 from magento-panda/PANDA-PR-2.3
igrybkov Jun 26, 2018
03f1c9c
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr25
zakdma Jun 26, 2018
741967e
ENGCOM-1206: [Improvement] Implement design theme grid on ui componen…
IvanPletnyov Jun 26, 2018
99c2b2a
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-92884
ameysar Jun 26, 2018
6c69054
Merge pull request #2762 from magento-tsg/2.3-develop-pr25
Jun 26, 2018
00f985b
MQE-1090: Stabilize RE-develop branch
tomreece Jun 26, 2018
fae5de2
MC-401: Advanced Attributes Not Removing From Preview
krissyhiserote Jun 26, 2018
82901ad
Merge remote-tracking branch 'mainline/2.3-develop' into RE-develop
tomreece Jun 26, 2018
26cbef3
MC-256: Tax for Simple Product Quote should be recalculated according…
leviv Jun 26, 2018
1cc0e00
Merge remote-tracking branch 'mainline/2.3-develop' into issue-17-cus…
vrann Jun 26, 2018
ecddf5e
magento/bulk-api-ce#17: Add possibility to define custom route for bu…
vrann Jun 26, 2018
4cf896d
Merge remote-tracking branch 'bulk/issue-17-custom-route-for-bulk-api…
vrann Jun 26, 2018
536a796
MC-191: Admin should be able to remove Product Images assigned as Bas…
tomreece Jun 26, 2018
6718752
Merge branch '2.3-develop' into MAGETWO-86795
nathanjosiah Jun 26, 2018
5621bd9
MAGETWO-86795: Admin Create Customer functional test fails
nathanjosiah Jun 26, 2018
7a6c902
Merge remote-tracking branch 'comwrap/async-status-search' into bulk-…
vrann Jun 26, 2018
41c212d
merge magento/2.3-develop into magento-borg/MAGETWO-91555
Jun 26, 2018
e04b7ca
Changes:
tiagosampaio Jun 15, 2018
447667f
Added comments and some descriptions.
tiagosampaio Jun 15, 2018
0dd4268
Tiny changes to add the type of a variable.
tiagosampaio Jun 20, 2018
9301ccb
Better way to retrieve the first tab ID if active tab is empty.
tiagosampaio Jun 22, 2018
c2b5c7a
Sort order was split into few private methods.
tiagosampaio Jun 22, 2018
024384a
Removing multiple lines.
tiagosampaio Jun 26, 2018
c41ffe5
Merge pull request #2765 from magento-engcom/bulk-custom-route
vrann Jun 27, 2018
ea1ad9e
merge magento/2.3-develop into magento-borg/MAGETWO-91555
Jun 27, 2018
a17c1fa
magento/bulk-api-ce#12: Operations Status Search API Endpoint
vrann Jun 27, 2018
e35695a
Merge remote-tracking branch 'mainline/2.3-develop' into status-searc…
vrann Jun 27, 2018
f67a1e3
magento/bulk-api-ce#12: Operations Status Search API Endpoint
vrann Jun 27, 2018
ed95acd
magento/bulk-api-ce#12: Operations Status Search API Endpoint
vrann Jun 27, 2018
3eadcc4
MAGETWO-90070: Image uploader improvements
OlgaVasyltsun Jun 27, 2018
2a17d7b
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-90070
OlgaVasyltsun Jun 27, 2018
fd43ac9
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-89609
svitja Jun 27, 2018
a7bfeca
ENGCOM-2119: [Forwardport] PHPDoc #16365
magento-engcom-team Jun 27, 2018
d35b094
Update Tabs.php
gelanivishal Jun 27, 2018
0373fde
Merge branch '2.3-develop' into MAGETWO-92985
svitja Jun 27, 2018
ed50bed
Merge remote-tracking branch 'origin/MAGETWO-85134' into 2.3-develop-…
OlgaVasyltsun Jun 27, 2018
63cc8e6
Fixed multiple empty lines issue
gelanivishal Jun 27, 2018
fc41f3c
Merge remote-tracking branch 'origin/MAGETWO-90070' into 2.3-develop-…
StasKozar Jun 27, 2018
75cec35
MAGETWO-90301: Extend MFTF tests to check Checkout Success page
zakdma Jun 27, 2018
52f6922
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-90301
zakdma Jun 27, 2018
33f096e
MAGETWO-89609: [Backport for 2.2.x] Improve import files validation
svitja Jun 27, 2018
5d7b3ca
add description for new classed/interfaces, remove not duplicated int…
Jun 27, 2018
8412217
magento/bulk-api-ce#12: Operations Status Search API Endpoint
vrann Jun 27, 2018
054f22f
Merge remote-tracking branch 'comwrap/async-status-search' into bulk-…
vrann Jun 27, 2018
9bd966f
Merge remote-tracking branch 'comwrap/async-status-search' into bulk-…
vrann Jun 27, 2018
ef60eb2
Merge remote-tracking branch 'bulk/bulk-status-search' into status-se…
vrann Jun 27, 2018
ad68d7e
merge magento/2.3-develop into magento-borg/MAGETWO-86795
Jun 27, 2018
59a80fd
Fix for #8222
0m3r Jun 18, 2018
bad70a1
MAGETWO-90301: Extend MFTF tests to check Checkout Success page
zakdma Jun 27, 2018
9cc2c04
merge magento/2.3-develop into magento-obsessive-owls/MC-401-remove-a…
Jun 27, 2018
0339078
Merge pull request #2741 from magento-borg/MAGETWO-86795
irenelagno Jun 27, 2018
b80f894
Merge remote-tracking branch 'mainline/2.3-develop' into MC-401-remov…
tjwiebell Jun 27, 2018
ae1a034
Merge remote-tracking branch 'origin/2.3-develop' into status-searchapi
vrann Jun 27, 2018
910eaca
magento/bulk-api-ce#12: Operations Status Search API Endpoint
vrann Jun 27, 2018
2a3c1ad
magento/bulk-api-ce#12: Operations Status Search API Endpoint
vrann Jun 27, 2018
96885cb
Merge remote-tracking branch 'mainline/2.3-develop' into RE-develop-pr
tomreece Jun 27, 2018
c312a5f
MAGETWO-91555: Admin orders can result in a customer with an example …
dthampy Jun 27, 2018
9beebf3
merge magento/2.3-develop into magento-borg/MAGETWO-91555
Jun 27, 2018
168ecf4
Merge pull request #2764 from magento-obsessive-owls/MC-401-remove-ad…
tjwiebell Jun 27, 2018
8d75e92
Merge remote-tracking branch 'mainline/2.3-develop' into status-searc…
vrann Jun 27, 2018
0525263
Merge remote-tracking branch 'mainline/2.3-develop' into RE-develop-pr
tomreece Jun 27, 2018
ce48579
Merge pull request #2769 from magento-engcom/status-searchapi
vrann Jun 27, 2018
d7a534d
ENGCOM-2139: Add @api annotation to Filter Group & Sort Order #16252
Jun 28, 2018
faf12d7
ENGCOM-2138: Make configfixture meaningful in ProcessCronQueueObserve…
Jun 28, 2018
4027689
ENGCOM-2125: [Forwardport] Postpone instantiation of session config b…
Jun 28, 2018
7585af4
ENGCOM-2123: [Forwardport] Add UpdatedAtListProvider to NotSyncedData…
Jun 28, 2018
a753586
ENGCOM-2119: [Forwardport] PHPDoc #16365
Jun 28, 2018
286b0e6
ENGCOM-1206: [Improvement] Implement design theme grid on ui componen…
Jun 28, 2018
b0bbc82
ENGCOM-2147: [Forwardport] Fix for #8222 #16429
magento-engcom-team Jun 28, 2018
aee9de9
Merge remote-tracking branch 'mainline/2.3-develop' into RE-develop-pr
tomreece Jun 28, 2018
f947cad
Merge pull request #2763 from magento-pangolin/RE-develop-pr
okolesnyk Jun 28, 2018
75fb28c
:bug: Add missing showInStore attributes
Jun 29, 2018
c455c1e
MAGETWO-88645: Error while deleting a Product Image
DianaRusin Jun 29, 2018
183fd79
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-89609
zakdma Jun 29, 2018
755f33b
Merge remote-tracking branch 'origin/MAGETWO-89609' into 2.3-develop-…
zakdma Jun 29, 2018
26d2985
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-88645
DianaRusin Jun 29, 2018
857dfe4
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-92985
zakdma Jun 29, 2018
f7b8d13
Merge remote-tracking branch 'origin/MAGETWO-92985' into 2.3-develop-…
zakdma Jun 29, 2018
1ddeaca
When searching for the title if search for all the segments that has …
rsantellan Jun 13, 2018
5b27b6e
Merge pull request #1 from rsantellan/2.3-develop-PR-port-16093
rsantellan Jun 29, 2018
85577bd
Fix discount label.
rsantellan Jun 29, 2018
d51fe75
Merge branch '2.3-develop' of https://github.com/rsantellan/magento2 …
rsantellan Jun 29, 2018
2824022
[EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Jun 29, 2018
2ca1182
ENGCOM-2151: 2.3 develop #16462
magento-engcom-team Jun 30, 2018
cc5c33b
Move breadcrumb json configuration to viewmodel
diedburn May 25, 2018
ce39035
Added escape text.
gelanivishal May 28, 2018
35ce945
Make new Json dependency backwards compatible
tdgroot Jun 2, 2018
0e693ce
ENGCOM-2152: [Forwardport] Move breadcrumb json configuration to view…
magento-engcom-team Jun 30, 2018
4bd3f63
Update Info.php
ronak2ram Jun 18, 2018
fe307c7
Fixed whitespace issue at end of line.
gelanivishal Jul 1, 2018
ad9ffe3
ENGCOM-2157: [Forwordport] Declare module namespace before template p…
magento-engcom-team Jul 2, 2018
9ba4c6b
ENGCOM-2158: Admin tabs order not working properly #16412
magento-engcom-team Jul 2, 2018
e250c7d
Add "UnusedFormalParameter" suppress warning
VladimirZaets Jul 2, 2018
c97fb5a
Merge remote-tracking branch 'engcom/2.3-develop' into ENGCOM-1816-ma…
VladimirZaets Jul 2, 2018
c4f3902
Merge remote-tracking branch 'engcom/2.3-develop' into ENGCOM-1806-ma…
VladimirZaets Jul 2, 2018
a2eeaea
Update Creditmemo.php
Sarvesh-A Jul 2, 2018
d96654d
ENGCOM-2160: Declare module namespace before template path name(Magen…
magento-engcom-team Jul 2, 2018
23c8639
Update History.php
mage2pratik Jul 2, 2018
519033a
ENGCOM-2161: Declare module namespace before template path name(Magen…
magento-engcom-team Jul 2, 2018
ab4471f
Merge branch '2.3-develop-prs' of github.com:magento-engcom/magento2c…
VladimirZaets Jul 2, 2018
519162d
Remove 'since' annotation
VladimirZaets Jul 2, 2018
8aea14d
Added SuppressWarnings to 'DependencyTest'
VladimirZaets Jul 2, 2018
e4756d6
MAGETWO-88645: Error while deleting a Product Image
DianaRusin Jul 2, 2018
104cad4
MAGETWO-90301: Extend MFTF tests to check Checkout Success page
1408sheva Jul 2, 2018
717879c
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
VladimirZaets Jul 2, 2018
cf98665
ENGCOM-2160: Declare module namespace before template path name(Magen…
VladimirZaets Jul 2, 2018
fe542e1
ENGCOM-2157: [Forwordport] Declare module namespace before template p…
VladimirZaets Jul 2, 2018
fb70872
ENGCOM-2151: 2.3 develop #16462
VladimirZaets Jul 2, 2018
b3ac99e
ENGCOM-2147: [Forwardport] Fix for #8222 #16429
VladimirZaets Jul 2, 2018
6824f97
ENGCOM-2135: Use the timeout when querying Elasticsearch #15592
VladimirZaets Jul 2, 2018
d9fb867
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Jul 2, 2018
a90e08d
merge magento/2.3-develop into magento-borg/MAGETWO-91555
Jul 2, 2018
fd72ad0
Merge remote-tracking branch 'origin/MAGETWO-90301' into MAGETWO-90301
1408sheva Jul 3, 2018
5d89f51
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-90301
1408sheva Jul 3, 2018
2482579
Remove the timezone from the date when retrieving the current month f…
the-midi Jul 3, 2018
f9aade8
ENGCOM-2169: Remove the timezone from the date when retrieving the cu…
magento-engcom-team Jul 3, 2018
3061233
MAGETWO-86176: #8810 - REST API - Attribute option creation -> no ID …
VladimirZaets Jul 3, 2018
62c5adf
ENGCOM-2134: [Forwardport] Login with wishlist raise report after log…
VladimirZaets Jul 3, 2018
16fc13b
ENGCOM-855: Allow import of empty attributes #13472
VladimirZaets Jul 3, 2018
7abdafd
MSI-1411: Add new rule to copy paste detector blacklist to avoid cove…
VitaliyBoyko Jul 3, 2018
7c9a5cb
Update AssignProducts.php
mageprince Jul 3, 2018
c92b57f
Update DefaultCaptcha.php
mageprince Jul 3, 2018
b8751c1
Update Tree.php
mageprince Jul 3, 2018
c1282aa
Update Chooser.php
mageprince Jul 3, 2018
0d99673
Update Edit.php
mageprince Jul 3, 2018
01efc65
Update Main.php
mageprince Jul 3, 2018
c104023
Update Group.php
mageprince Jul 3, 2018
78ef947
Update Add.php
mageprince Jul 3, 2018
0286a12
Update Main.php
mageprince Jul 3, 2018
4310d50
Update Configure.php
mageprince Jul 3, 2018
d27263f
Update Alerts.php
mageprince Jul 3, 2018
f9d5002
Update Inventory.php
mageprince Jul 3, 2018
7fe8314
Update Options.php
mageprince Jul 3, 2018
3cfd5c4
Update Websites.php
mageprince Jul 3, 2018
4f6396a
Update Option.php
mageprince Jul 3, 2018
43ee7dd
Update Date.php
mageprince Jul 3, 2018
4723db4
Update File.php
mageprince Jul 3, 2018
2f14719
Update Select.php
mageprince Jul 3, 2018
5a33ee5
Update Text.php
mageprince Jul 3, 2018
153466e
Update Tier.php
mageprince Jul 3, 2018
2b03b68
Update Content.php
mageprince Jul 3, 2018
69f5949
Update Container.php
mageprince Jul 3, 2018
70f6fe0
Update Link.php
mageprince Jul 3, 2018
c809d9f
Update Toolbar.php
mageprince Jul 3, 2018
e5d8965
Update Additional.php
mageprince Jul 3, 2018
cb94ab3
Update Conditions.php
mageprince Jul 3, 2018
17115ce
Update Conditions.php
mageprince Jul 3, 2018
a924cad
Update Created.php
mageprince Jul 3, 2018
24ec04f
Update Config.php
mageprince Jul 3, 2018
d5dbfb9
Update Currency.php
mageprince Jul 3, 2018
d036eb2
Update Matrix.php
mageprince Jul 3, 2018
3548a08
Update Services.php
mageprince Jul 3, 2018
5a8877f
Update Newsletter.php
mageprince Jul 3, 2018
b83ebb5
Update Newsletter.php
mageprince Jul 3, 2018
bee1aa4
Update Vat.php
mageprince Jul 3, 2018
54e0a3b
Update Downloadable.php
mageprince Jul 3, 2018
6b97b70
Update Links.php
mageprince Jul 3, 2018
8d8791b
Update Samples.php
mageprince Jul 3, 2018
fd4d8f5
Update Js.php
mageprince Jul 3, 2018
a22995f
Update Template.php
mageprince Jul 3, 2018
7b18cef
Update Edit.php
mageprince Jul 3, 2018
87e2f8c
Update Inline.php
mageprince Jul 3, 2018
58e2e4b
Update State.php
mageprince Jul 3, 2018
360b7fd
Merge branch '2.3-develop' into develop
mageprince Jul 3, 2018
2375461
Merge pull request #2792 from magento-engcom/2.3-develop-prs
VladimirZaets Jul 3, 2018
9acc4db
ENGCOM-2179: Declare module namespace before template path name #16515
magento-engcom-team Jul 3, 2018
77b74f7
merge magento/2.3-develop into magento-borg/MAGETWO-91555
Jul 3, 2018
d8a95c9
Merge pull request #2760 from magento-borg/MAGETWO-91555
cpartica Jul 4, 2018
6ed9e7b
ENGCOM-2161: Declare module namespace before template path name(Magen…
Jul 4, 2018
45078f2
ENGCOM-2158: Admin tabs order not working properly #16412
Jul 4, 2018
342f5cd
ENGCOM-2152: [Forwardport] Move breadcrumb json configuration to view…
Jul 4, 2018
d5892b1
ENGCOM-2130: [Forwardport] Fixes updating wishlist item if an item ob…
Jul 4, 2018
0b41730
ENGCOM-1806: [Forwardport] Resolve Knockout non-unique elements id in…
Jul 4, 2018
386438d
[Changed password placeholder text in checkout page]
hitesh-wagento Jul 4, 2018
fdb9ba0
ENGCOM-2181: [Forwardport : Changed password placeholder text in chec…
magento-engcom-team Jul 4, 2018
f83d14a
MAGETWO-88645: Error while deleting a Product Image
DianaRusin Jul 4, 2018
92233f9
ENGCOM-2180: MSI-1411: Add new rule to copy paste detector blacklist …
magento-engcom-team Jul 4, 2018
6feedba
MAGETWO-88645: Error while deleting a Product Image
DianaRusin Jul 4, 2018
2c15786
ENGCOM-2184: [Forwardport #16458] Add missing showInStore attributes …
magento-engcom-team Jul 4, 2018
c52172c
Merge remote-tracking branch 'origin/MAGETWO-88645' into 2.3-develop-…
svitja Jul 4, 2018
0c3e7f2
ENGCOM-2130: [Forwardport] Fixes updating wishlist item if an item ob…
Jul 4, 2018
c6cc981
ENGCOM-2152: [Forwardport] Move breadcrumb json configuration to view…
Jul 4, 2018
3a2ae7f
ENGCOM-1806: [Forwardport] Resolve Knockout non-unique elements id in…
Jul 4, 2018
2ff3421
ENGCOM-2180: MSI-1411: Add new rule to copy paste detector blacklist …
Jul 4, 2018
77bb78e
Fixed _module.less file according Magento 2 LESS coding standard
VasylShvorak Jul 4, 2018
36af29e
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr26
zakdma Jul 4, 2018
bc2bb9e
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-92883
OlgaVasyltsun Jul 4, 2018
713f6c4
Merge remote-tracking branch 'origin/MAGETWO-92883' into 2.3-develop-…
OlgaVasyltsun Jul 4, 2018
d7aafe9
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Jul 4, 2018
7809f44
Merge remote-tracking branch 'origin/90370' into 2.3-develop-mftf-pr2
zakdma Jul 4, 2018
f3090c4
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-mf…
zakdma Jul 4, 2018
c071076
Merge remote-tracking branch 'origin/2.3-develop' into ENGCOM-1816-ma…
VasylShvorak Jul 4, 2018
7bf8a19
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr26
zakdma Jul 4, 2018
5d4f74d
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr27
zakdma Jul 4, 2018
120836e
Merge pull request #2800 from magento-tsg/2.3-develop-pr27
Jul 4, 2018
5ebb891
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr26
zakdma Jul 5, 2018
1229301
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-mf…
zakdma Jul 5, 2018
5146696
Merge pull request #2801 from magento-tsg/2.3-develop-mftf-pr2
Jul 5, 2018
8744b6d
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr26
zakdma Jul 5, 2018
56e6762
ENGCOM-2184: [Forwardport #16458] Add missing showInStore attributes …
VladimirZaets Jul 5, 2018
ba25943
ENGCOM-2181: [Forwardport : Changed password placeholder text in chec…
VladimirZaets Jul 5, 2018
6f0c0ea
ENGCOM-2179: Declare module namespace before template path name #16515
VladimirZaets Jul 5, 2018
653ca8b
ENGCOM-2169: Remove the timezone from the date when retrieving the cu…
VladimirZaets Jul 5, 2018
6bb673f
ENGCOM-1816: [2.3] [improvement] Swatches LESS rewrite #15624
VladimirZaets Jul 5, 2018
8949985
ENGCOM-1816: [2.3] [improvement] Swatches LESS rewrite #15624
Jul 5, 2018
5872c82
Merge pull request #2803 from magento-tsg/2.3-develop-pr26
Jul 5, 2018
582cf52
[EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Jul 5, 2018
7f43369
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Jul 5, 2018
e0c6caf
MQE-1075: Move MFTF tests from dev/tests/acceptance to app/code
okolesnyk Jul 5, 2018
113bf62
Merge pull request #2808 from magento-pangolin/MQE-1075-2.3-develop
okolesnyk Jul 6, 2018
32884cd
Properly hyphenate "third-party"
erikhansen Jul 2, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions app/code/Magento/AdminNotification/Test/Mftf/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Admin Notification Functional Tests

The Functional Test Module for **Magento Admin Notification** module.
20 changes: 20 additions & 0 deletions app/code/Magento/AdminNotification/Test/Mftf/composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"name": "magento/functional-test-module-admin-notification",
"description": "N/A",
"config": {
"sort-packages": true
},
"require": {
"php": "~7.1.3||~7.2.0",
"magento/magento2-functional-testing-framework": "2.2.0",
"magento/functional-test-module-backend": "100.0.0-dev",
"magento/functional-test-module-media-storage": "100.0.0-dev",
"magento/functional-test-module-store": "100.0.0-dev",
"magento/functional-test-module-ui": "100.0.0-dev"
},
"type": "magento2-test",
"license": [
"OSL-3.0",
"AFL-3.0"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ public function testGetIdentity($expectedSum, $cacheTypes)
$this->assertEquals($expectedSum, $this->_messageModel->getIdentity());
}

/**
* @return array
*/
public function getIdentityDataProvider()
{
$cacheTypeMock1 = $this->createPartialMock(\stdClass::class, ['getCacheType']);
Expand Down Expand Up @@ -95,6 +98,9 @@ public function testIsDisplayed($expected, $allowed, $cacheTypes)
$this->assertEquals($expected, $this->_messageModel->isDisplayed());
}

/**
* @return array
*/
public function isDisplayedDataProvider()
{
$cacheTypesMock = $this->createPartialMock(\stdClass::class, ['getCacheType']);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ public function testIsDisplayed($expectedFirstRun, $data)
$this->assertEquals($expectedFirstRun, $model->isDisplayed());
}

/**
* @return array
*/
public function isDisplayedDataProvider()
{
return [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ public function testIsDisplayed($expectedResult, $cached, $response)
$this->assertEquals($expectedResult, $this->_messageModel->isDisplayed());
}

/**
* @return array
*/
public function isDisplayedDataProvider()
{
return [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,12 @@
</ul>
</div>

<script>
require([
"jquery",
"Magento_Ui/js/modal/modal"
], function($){
if (this.modal) {
this.modal.html($('[data-role="system_messages_list"]').html());
} else {
this.modal = $('[data-role="system_messages_list"]').modal({
modalClass: 'modal-system-messages ui-popup-message',
type: 'popup',
buttons: []
});
<script type="text/x-magento-init">
{
"[data-role=system_messages_list]": {
"Magento_AdminNotification/js/system/messages/popup": {
class: 'modal-system-messages ui-popup-message'
}
}
}
this.modal.modal('openModal');
});
</script>
</script>
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

define([
'jquery',
'Magento_Ui/js/modal/modal'
], function ($) {
'use strict';

return function (data, element) {
if (this.modal) {
this.modal.html($(element).html());
} else {
this.modal = $(element).modal({
modalClass: data.class,
type: 'popup',
buttons: []
});
}
this.modal.modal('openModal');
};
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Advanced Pricing Import Export Functional Tests

The Functional Test Module for **Magento Advanced Pricing Import Export** module.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"name": "magento/functional-test-module-advanced-pricing-import-export",
"description": "N/A",
"config": {
"sort-packages": true
},
"require": {
"php": "~7.1.3||~7.2.0",
"magento/magento2-functional-testing-framework": "2.2.0",
"magento/functional-test-module-catalog": "100.0.0-dev",
"magento/functional-test-module-catalog-import-export": "100.0.0-dev",
"magento/functional-test-module-catalog-inventory": "100.0.0-dev",
"magento/functional-test-module-customer": "100.0.0-dev",
"magento/functional-test-module-eav": "100.0.0-dev",
"magento/functional-test-module-import-export": "100.0.0-dev",
"magento/functional-test-module-store": "100.0.0-dev"
},
"type": "magento2-test",
"license": [
"OSL-3.0",
"AFL-3.0"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,9 @@ public function testIsValidAddMessagesCall($value, $hasEmptyColumns, $customerGr
$this->tierPrice->isValid($value);
}

/**
* @return array
*/
public function isValidResultFalseDataProvider()
{
return [
Expand Down Expand Up @@ -286,6 +289,9 @@ public function isValidResultFalseDataProvider()
];
}

/**
* @return array
*/
public function isValidAddMessagesCallDataProvider()
{
return [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ public function testGetAllWebsitesValue()
$this->assertEquals($expectedResult, $result);
}

/**
* @return array
*/
public function isValidReturnDataProvider()
{
return [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ public function testInit()
$this->validator->init(null);
}

/**
* @return array
*/
public function isValidDataProvider()
{
return [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -768,6 +768,9 @@ public function testSaveProductPrices($priceData, $oldSkus, $priceIn, $callNum)
$this->invokeMethod($this->advancedPricing, 'saveProductPrices', [$priceData, 'table']);
}

/**
* @return array
*/
public function saveProductPricesDataProvider()
{
return [
Expand Down Expand Up @@ -839,6 +842,9 @@ public function testDeleteProductTierPrices(
);
}

/**
* @return array
*/
public function deleteProductTierPricesDataProvider()
{
return [
Expand Down Expand Up @@ -921,6 +927,9 @@ public function testProcessCountExistingPrices(
$this->invokeMethod($this->advancedPricing, 'processCountExistingPrices', [$prices, 'table']);
}

/**
* @return array
*/
public function processCountExistingPricesDataProvider()
{
return [
Expand Down
3 changes: 3 additions & 0 deletions app/code/Magento/AdvancedSearch/Test/Mftf/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Advanced Search Functional Tests

The Functional Test Module for **Magento Advanced Search** module.
22 changes: 22 additions & 0 deletions app/code/Magento/AdvancedSearch/Test/Mftf/composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"name": "magento/functional-test-module-advanced-search",
"description": "N/A",
"config": {
"sort-packages": true
},
"require": {
"magento/magento2-functional-testing-framework": "2.2.0",
"magento/functional-test-module-backend": "100.0.0-dev",
"magento/functional-test-module-catalog": "100.0.0-dev",
"magento/functional-test-module-catalog-search": "100.0.0-dev",
"magento/functional-test-module-config": "100.0.0-dev",
"magento/functional-test-module-customer": "100.0.0-dev",
"magento/functional-test-module-search": "100.0.0-dev",
"magento/functional-test-module-store": "100.0.0-dev",
"php": "~7.1.3||~7.2.0"
},
"type": "magento2-test",
"license": [
"proprietary"
]
}
3 changes: 3 additions & 0 deletions app/code/Magento/Amqp/Test/Mftf/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Amqp Functional Tests

The Functional Test Module for **Magento Amqp** module.
17 changes: 17 additions & 0 deletions app/code/Magento/Amqp/Test/Mftf/composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"name": "magento/functional-test-module-amqp",
"description": "N/A",
"config": {
"sort-packages": true
},
"require": {
"magento/magento2-functional-testing-framework": "2.2.0",
"magento/framework-amqp": "100.0.0-dev",
"magento/framework-message-queue": "100.0.0-dev",
"php": "~7.1.3||~7.2.0"
},
"type": "magento2-test",
"license": [
"proprietary"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,9 @@ public function testValidateNoOptions()
$this->assertEquals($expectedResult, $this->model->validate($options, $this->deploymentConfigMock));
}

/**
* @return array
*/
public function getCreateConfigDataProvider()
{
return [
Expand Down
33 changes: 33 additions & 0 deletions app/code/Magento/Analytics/Test/Mftf/Data/UserData.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
<entity name="adminNoReport" type="user">
<data key="username" unique="suffix">noreport</data>
<data key="firstname">No</data>
<data key="lastname">Report</data>
<data key="email" unique="prefix">noreport@example.com</data>
<data key="password">123123q</data>
<data key="password_confirmation">123123q</data>
<data key="interface_local">en_US</data>
<data key="is_active">true</data>
<data key="current_password">123123q</data>
</entity>
<entity name="restrictedWebUser" type="user">
<data key="username" unique="suffix">restrictedWebUser</data>
<data key="firstname">restricted</data>
<data key="lastname">webUser</data>
<data key="email" unique="prefix">restrictedWebUser@example.com</data>
<data key="password">123123q</data>
<data key="password_confirmation">123123q</data>
<data key="interface_local">en_US</data>
<data key="is_active">true</data>
<data key="current_password">123123q</data>
</entity>
</entities>
Loading