File tree Expand file tree Collapse file tree 11 files changed +36
-11
lines changed
dev/tests/integration/testsuite/Magento/Wishlist/Controller Expand file tree Collapse file tree 11 files changed +36
-11
lines changed Original file line number Diff line number Diff line change 157
157
<element name =" FolderName" type =" button" selector =" input[data-role='promptField']" />
158
158
<element name =" AcceptFolderName" type =" button" selector =" .action-primary.action-accept" timeout =" 30" />
159
159
<element name =" StorageRootArrow" type =" button" selector =" #root > .jstree-icon" />
160
+ <element name =" FolderContainer" type =" button" selector =" div[data-role='tree']" />
160
161
<element name =" checkIfArrowExpand" type =" button" selector =" //li[@id='root' and contains(@class,'jstree-closed')]" />
161
162
<element name =" WysiwygArrow" type =" button" selector =" #d3lzaXd5Zw-- > .jstree-icon" />
162
163
<element name =" checkIfWysiwygArrowExpand" type =" button" selector =" //li[@id='d3lzaXd5Zw--' and contains(@class,'jstree-closed')]" />
Original file line number Diff line number Diff line change 70
70
<scrollTo selector =" {{ProductDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey =" scrollToTinyMCE4" />
71
71
<click selector =" {{ProductShortDescriptionWYSIWYGToolbarSection.InsertImageIcon}}" stepKey =" clickInsertImageIcon2" />
72
72
<click selector =" {{ProductShortDescriptionWYSIWYGToolbarSection.Browse}}" stepKey =" clickBrowse2" />
73
+ <waitForLoadingMaskToDisappear stepKey =" waitForLoading13" />
73
74
<waitForElementVisible selector =" {{ProductDescriptionWYSIWYGToolbarSection.CancelBtn}}" stepKey =" waitForCancelButton2" />
74
75
<see selector =" {{ProductShortDescriptionWYSIWYGToolbarSection.CancelBtn}}" userInput =" Cancel" stepKey =" seeCancelBtn2" />
75
- <waitForLoadingMaskToDisappear stepKey =" waitForLoading13 " />
76
+ <waitForElementVisible selector = " {{ProductDescriptionWYSIWYGToolbarSection.CreateFolder}} " stepKey =" waitForCreateFolderBtn2 " />
76
77
<see selector =" {{ProductShortDescriptionWYSIWYGToolbarSection.CreateFolder}}" userInput =" Create Folder" stepKey =" seeCreateFolderBtn2" />
77
- <waitForLoadingMaskToDisappear stepKey =" waitForLoading14 " />
78
+ <see selector = " {{ProductDescriptionWYSIWYGToolbarSection.FolderContainer}} " userInput = " Storage Root " stepKey =" seeFolderContainer " />
78
79
<click userInput =" Storage Root" stepKey =" clickOnRootFolder" />
79
80
<waitForLoadingMaskToDisappear stepKey =" waitForLoading15" />
80
81
<dontSeeElement selector =" {{ProductShortDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey =" dontSeeAddSelectedBtn3" />
Original file line number Diff line number Diff line change 11
11
use Magento \Framework \Controller \ResultFactory ;
12
12
13
13
/**
14
+ * Wishlist Configure Controller
15
+ *
14
16
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
15
17
*/
16
- class Configure extends \Magento \Wishlist \Controller \AbstractIndex
18
+ class Configure extends \Magento \Wishlist \Controller \AbstractIndex implements Action \HttpGetActionInterface
17
19
{
18
20
/**
19
21
* Core registry
Original file line number Diff line number Diff line change 14
14
use Magento \Wishlist \Model \Product \AttributeValueProvider ;
15
15
16
16
/**
17
+ * Wishlist Remove Controller
18
+ *
17
19
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
18
20
*/
19
- class Remove extends \Magento \Wishlist \Controller \AbstractIndex
21
+ class Remove extends \Magento \Wishlist \Controller \AbstractIndex implements Action \HttpPostActionInterface
20
22
{
21
23
/**
22
24
* @var WishlistProviderInterface
Original file line number Diff line number Diff line change 14
14
use Magento \Wishlist \Controller \WishlistProviderInterface ;
15
15
16
16
/**
17
+ * Wishlist UpdateItemOptions Controller
18
+ *
17
19
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
18
20
*/
19
- class UpdateItemOptions extends \Magento \Wishlist \Controller \AbstractIndex
21
+ class UpdateItemOptions extends \Magento \Wishlist \Controller \AbstractIndex implements Action \HttpPostActionInterface
20
22
{
21
23
/**
22
24
* @var WishlistProviderInterface
Original file line number Diff line number Diff line change 9
9
use Magento \Checkout \Helper \Cart as CartHelper ;
10
10
use Magento \Checkout \Model \Cart as CustomerCart ;
11
11
use Magento \Framework \App \Action \Context as ActionContext ;
12
+ use Magento \Framework \App \Action \HttpGetActionInterface ;
12
13
use Magento \Framework \Controller \ResultFactory ;
13
14
use Magento \Framework \Escaper ;
14
15
use Magento \Framework \Exception \LocalizedException ;
18
19
use Magento \Wishlist \Model \ResourceModel \Item \Option \Collection as OptionCollection ;
19
20
20
21
/**
22
+ * Wishlist Cart Controller
23
+ *
21
24
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
22
25
*/
23
- class Cart extends \Magento \Framework \App \Action \Action
26
+ class Cart extends \Magento \Framework \App \Action \Action implements HttpGetActionInterface
24
27
{
25
28
/**
26
29
* @var CustomerCart
Original file line number Diff line number Diff line change 1
1
<?php
2
2
/**
3
- *
4
3
* Copyright © Magento, Inc. All rights reserved.
5
4
* See COPYING.txt for license details.
6
5
*/
7
6
namespace Magento \Wishlist \Controller ;
8
7
8
+ use Magento \Framework \App \Action \HttpPostActionInterface ;
9
9
use Magento \Framework \App \RequestInterface ;
10
10
11
+ /**
12
+ * WishlistProvider Controller
13
+ *
14
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
15
+ */
11
16
class WishlistProvider implements WishlistProviderInterface
12
17
{
13
18
/**
@@ -54,7 +59,8 @@ public function __construct(
54
59
}
55
60
56
61
/**
57
- * {@inheritdoc}
62
+ * @inheritdoc
63
+ *
58
64
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
59
65
*/
60
66
public function getWishlist ($ wishlistId = null )
Original file line number Diff line number Diff line change 10
10
use Magento \Checkout \Helper \Cart as CartHelper ;
11
11
use Magento \Checkout \Model \Cart ;
12
12
use Magento \Customer \Model \Session ;
13
+ use Magento \Framework \App \Action \HttpPostActionInterface ;
13
14
use Magento \Framework \App \Response \RedirectInterface ;
14
15
use Magento \Framework \Exception \LocalizedException ;
15
16
use Psr \Log \LoggerInterface as Logger ;
18
19
use Magento \Wishlist \Helper \Data as WishlistHelper ;
19
20
20
21
/**
22
+ * Wishlist ItemCarrier Controller
23
+ *
21
24
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
25
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
22
26
*/
23
27
class ItemCarrier
24
28
{
Original file line number Diff line number Diff line change @@ -105,7 +105,7 @@ public function execute(Observer $observer)
105
105
$ this ->checkoutSession ->setWishlistPendingUrls ($ urls );
106
106
$ this ->checkoutSession ->setWishlistPendingMessages ($ messages );
107
107
108
- $ this ->messageManager ->addErrorMessage ($ message );
108
+ $ this ->messageManager ->addError ($ message );
109
109
110
110
$ observer ->getEvent ()->getResponse ()->setRedirect ($ url );
111
111
$ this ->checkoutSession ->setNoCartRedirect (true );
Original file line number Diff line number Diff line change @@ -167,7 +167,7 @@ public function testExecute()
167
167
->with ([])
168
168
->willReturnSelf ();
169
169
$ this ->messageManager ->expects ($ this ->once ())
170
- ->method ('addErrorMessage ' )
170
+ ->method ('addError ' )
171
171
->with ($ message )
172
172
->willReturnSelf ();
173
173
$ event ->expects ($ this ->once ())
You can’t perform that action at this time.
0 commit comments