Skip to content

Commit 60b0892

Browse files
MAGETWO-65216: Update analytics dashboard button position
- Update corresponding functional test
1 parent 25f2ffc commit 60b0892

File tree

6 files changed

+43
-43
lines changed

6 files changed

+43
-43
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?php
2+
/**
3+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Analytics\Test\Block\Adminhtml\Dashboard\Analytics;
7+
8+
use Magento\Mtf\Block\Block;
9+
10+
/**
11+
* Advanced Reporting section
12+
*/
13+
class AdvancedReportingBlock extends Block
14+
{
15+
/**
16+
* Advanced Reporting Button.
17+
*
18+
* @var string
19+
*/
20+
protected $advancedReportingButton = '[data-index="analytics-service-link"]';
21+
22+
/**
23+
* Click Advanced Reporting link.
24+
*
25+
* @return void
26+
*/
27+
public function click()
28+
{
29+
$this->_rootElement->find($this->advancedReportingButton)->click();
30+
}
31+
}

dev/tests/functional/tests/app/Magento/Analytics/Test/Block/Adminhtml/Dashboard/Page/Actions.php

Lines changed: 0 additions & 31 deletions
This file was deleted.

dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertFreeTierLink.php renamed to dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertAdvancedReportingPage.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
use Magento\Mtf\Client\BrowserInterface;
1010

1111
/**
12-
* Assert Free Tier Sign Up page is opened by admin dashboard link
12+
* Assert Advanced Reporting Sign Up page is opened by admin dashboard link.
1313
*/
14-
class AssertFreeTierLink extends AbstractConstraint
14+
class AssertAdvancedReportingPage extends AbstractConstraint
1515
{
1616
/**
1717
* Browser instance.
@@ -21,7 +21,7 @@ class AssertFreeTierLink extends AbstractConstraint
2121
protected $browser;
2222

2323
/**
24-
* Assert Free Tier Sign Up page is opened by link
24+
* Assert Advanced Reporting Sign Up page is opened by link.
2525
*
2626
* @param BrowserInterface $browser
2727
* @param string $advancedReportingLink
@@ -34,7 +34,7 @@ public function processAssert(BrowserInterface $browser, $advancedReportingLink)
3434
\PHPUnit_Framework_Assert::assertEquals(
3535
$advancedReportingLink,
3636
$this->browser->getUrl(),
37-
'Free Tier Sign Up page was not opened by link.'
37+
'Advanced Reporting Sign Up page was not opened by link.'
3838
);
3939
}
4040

@@ -45,6 +45,6 @@ public function processAssert(BrowserInterface $browser, $advancedReportingLink)
4545
*/
4646
public function toString()
4747
{
48-
return 'Free Tier Sign Up page is opened by link';
48+
return 'Advanced Reporting Sign Up page is opened by link';
4949
}
5050
}

dev/tests/functional/tests/app/Magento/Analytics/Test/Page/Adminhtml/Dashboard.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<page name="Dashboard" area="Adminhtml" mca="admin/dashboard" module="Magento_Backend">
1010
<block name="subscriptionBlock" class="Magento\Analytics\Test\Block\Adminhtml\Dashboard\Analytics\SubscriptionBlock" locator=".analytics_subscription_form_analytics_subscription_form_analytics_subscription_modal" strategy="css selector" />
1111
<block name="modalBlock" class="Magento\Ui\Test\Block\Adminhtml\Modal" locator="._show[data-role=modal]" strategy="css selector" />
12-
<block name="pageActionsBlock" class="Magento\Analytics\Test\Block\Adminhtml\Dashboard\Page\Actions" locator=".page-actions:not([data-mage-init])" strategy="css selector" />
12+
<block name="advancedReportingBlock" class="Magento\Analytics\Test\Block\Adminhtml\Dashboard\Analytics\AdvancedReportingBlock" locator=".dashboard-advanced-reports" strategy="css selector" />
1313
</page>
1414
</config>

dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/FreeTierButtonTest.php renamed to dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/AdvancedReportingButtonTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
/**
1212
* Steps:
1313
* 1. Log in to backend.
14-
* 2. Click on page actions button.
14+
* 2. Click on Advanced Reporting link.
1515
* 3. Perform asserts.
1616
*
1717
* @ZephyrId MAGETWO-34874
1818
*/
19-
class FreeTierButtonTest extends Injectable
19+
class AdvancedReportingButtonTest extends Injectable
2020
{
2121
/* tags */
2222
const MVP = 'no';
@@ -31,6 +31,6 @@ class FreeTierButtonTest extends Injectable
3131
public function test(Dashboard $dashboard)
3232
{
3333
$dashboard->open();
34-
$dashboard->getPageActionsBlock()->click();
34+
$dashboard->getAdvancedReportingBlock()->click();
3535
}
3636
}

dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/FreeTierButtonTest.xml renamed to dev/tests/functional/tests/app/Magento/Analytics/Test/TestCase/AdvancedReportingButtonTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
9-
<testCase name="Magento\Analytics\Test\TestCase\FreeTierButtonTest" summary="Navigate through Free Tier button on dashboard to Sign Up page" ticketId="MAGETWO-63715">
10-
<variation name="FreeTierButtonTest">
9+
<testCase name="Magento\Analytics\Test\TestCase\AdvancedReportingButtonTest" summary="Navigate through Advanced Reporting button on dashboard to Sign Up page" ticketId="MAGETWO-63715">
10+
<variation name="AdvancedReportingButtonTest">
1111
<data name="advancedReportingLink" xsi:type="string">https://advancedreporting.rjmetrics.com/report</data>
12-
<constraint name="Magento\Analytics\Test\Constraint\AssertFreeTierLink" />
12+
<constraint name="Magento\Analytics\Test\Constraint\AssertAdvancedReportingPage" />
1313
</variation>
1414
</testCase>
1515
</config>

0 commit comments

Comments
 (0)