File tree Expand file tree Collapse file tree 3 files changed +12
-4
lines changed
Backend/Controller/Adminhtml/Dashboard
Integration/Controller/Adminhtml/Integration
dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Ui Expand file tree Collapse file tree 3 files changed +12
-4
lines changed Original file line number Diff line number Diff line change 6
6
*/
7
7
namespace Magento \Backend \Controller \Adminhtml \Dashboard ;
8
8
9
- use Magento \Framework \App \Action \HttpGetActionInterface as HttpGetActionInterface ;
9
+ use Magento \Backend \Controller \Adminhtml \Dashboard as DashboardAction ;
10
+ use Magento \Framework \App \Action \HttpGetActionInterface ;
11
+ use Magento \Framework \App \Action \HttpPostActionInterface ;
10
12
11
- class Index extends \ Magento \ Backend \ Controller \ Adminhtml \Dashboard implements HttpGetActionInterface
13
+ class Index extends DashboardAction implements HttpGetActionInterface, HttpPostActionInterface
12
14
{
13
15
/**
14
16
* @var \Magento\Framework\View\Result\PageFactory
Original file line number Diff line number Diff line change 7
7
namespace Magento \Integration \Controller \Adminhtml \Integration ;
8
8
9
9
use Magento \Framework \App \Action \HttpGetActionInterface ;
10
- use Magento \Framework \App \Action \HttpPostActionInterface as HttpPostActionInterface ;
10
+ use Magento \Framework \App \Action \HttpPostActionInterface ;
11
11
use Magento \Integration \Controller \Adminhtml \Integration as IntegrationAction ;
12
12
13
13
class Grid extends IntegrationAction implements HttpPostActionInterface, HttpGetActionInterface
Original file line number Diff line number Diff line change 6
6
7
7
namespace Magento \Backend \Test \Handler \Ui ;
8
8
9
+ use Magento \Backend \Test \Page \AdminAuthLogin ;
9
10
use Magento \Mtf \Factory \Factory ;
10
11
use Magento \Mtf \Fixture \FixtureInterface ;
11
12
use Magento \Mtf \Handler \Ui ;
@@ -29,10 +30,15 @@ public function persist(FixtureInterface $fixture = null)
29
30
$ fixture = Factory::getFixtureFactory ()->getMagentoBackendAdminSuperAdmin ();
30
31
}
31
32
33
+ /** @var AdminAuthLogin $loginPage */
32
34
$ loginPage = Factory::getPageFactory ()->getAdminAuthLogin ();
33
35
$ loginForm = $ loginPage ->getLoginBlock ();
34
-
35
36
$ adminHeaderPanel = $ loginPage ->getHeaderBlock ();
37
+ if (!$ loginForm ->isVisible () && !$ adminHeaderPanel ->isVisible ()) {
38
+ //We are currently not in the admin area.
39
+ $ loginPage ->open ();
40
+ }
41
+
36
42
if (!$ adminHeaderPanel || !$ adminHeaderPanel ->isVisible ()) {
37
43
$ loginPage ->open ();
38
44
if ($ adminHeaderPanel ->isVisible ()) {
You can’t perform that action at this time.
0 commit comments