Skip to content

Commit 444f226

Browse files
author
olysenko
committed
MAGETWO-63737: [FT] Analytics Subscription Tests are failing on CI
1 parent 04ce051 commit 444f226

File tree

5 files changed

+68
-7
lines changed

5 files changed

+68
-7
lines changed

dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertAcceptSubscriptionPopup.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
use Magento\Mtf\Constraint\AbstractConstraint;
1010

1111
/**
12-
* Verify that admin user accept analytics pop-up
12+
* Verify that admin user accepted analytics pop-up
1313
*/
1414
class AssertAcceptSubscriptionPopup extends AbstractConstraint
1515
{
1616
/**
17-
* Verify whether customer has logged in to the Backend.
17+
* Verify that admin user accepted analytics pop-up
1818
*
1919
* @param Dashboard $dashboard
2020
* @return void

dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertConfigAnalyticsDisabled.php

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
use Magento\Mtf\Constraint\AbstractConstraint;
99
use Magento\Analytics\Test\Page\Adminhtml\ConfigAnalytics;
10+
use Magento\Backend\Test\Page\Adminhtml\Dashboard;
11+
use Magento\Backend\Test\Page\Adminhtml\SystemConfigEdit;
1012

1113
/**
1214
* Assert Analytics is disabled in Stores>Configuration>General>Analytics->General menu.
@@ -16,14 +18,29 @@ class AssertConfigAnalyticsDisabled extends AbstractConstraint
1618
/**
1719
* Assert Analytics is disabled in Stores > Configuration > General > Analytics menu.
1820
*
21+
* @param Dashboard $dashboard
22+
* @param SystemConfigEdit $systemConfigPage
1923
* @param ConfigAnalytics $configAnalytics
2024
* @return void
2125
*/
22-
public function processAssert(ConfigAnalytics $configAnalytics)
23-
{
26+
public function processAssert(
27+
Dashboard $dashboard,
28+
SystemConfigEdit $systemConfigPage,
29+
ConfigAnalytics $configAnalytics
30+
) {
31+
$dashboard->open();
32+
$dashboard->getMenuBlock()->navigate('Stores > Configuration');
33+
$systemConfigPage->getForm()->getGroup('analytics', 'general');
34+
2435
\PHPUnit_Framework_Assert::assertFalse(
2536
(bool)$configAnalytics->getAnalyticsForm()->isAnalyticsEnabled(),
26-
'Magento Analytics is enabled'
37+
'Magento Analytics is not disabled'
38+
);
39+
40+
\PHPUnit_Framework_Assert::assertEquals(
41+
$configAnalytics->getAnalyticsForm()->getAnalyticsStatus(),
42+
'Subscription status: Disabled',
43+
'Magento Analytics status is not disabled'
2744
);
2845
}
2946

dev/tests/functional/tests/app/Magento/Analytics/Test/Constraint/AssertConfigAnalyticsEnabled.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ public function processAssert(
3131
$dashboard->getMenuBlock()->navigate('Stores > Configuration');
3232
$systemConfigPage->getForm()->getGroup('analytics', 'general');
3333

34-
\PHPUnit_Framework_Assert::assertTrue(
34+
\PHPUnit_Framework_Assert::assertFalse(
3535
(bool)$configAnalytics->getAnalyticsForm()->isAnalyticsEnabled(),
36-
'Magento Analytics is disabled'
36+
'Magento Analytics is not enabled'
3737
);
3838

3939
\PHPUnit_Framework_Assert::assertEquals(
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
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\Constraint;
7+
8+
use Magento\Backend\Test\Page\Adminhtml\Dashboard;
9+
use Magento\Mtf\Constraint\AbstractConstraint;
10+
11+
/**
12+
* Verify that admin user declined analytics pop-up
13+
*/
14+
class AssertDeclineSubscriptionPopup extends AbstractConstraint
15+
{
16+
/**
17+
* Verify that admin user declined analytics pop-up
18+
*
19+
* @param Dashboard $dashboard
20+
* @return void
21+
*/
22+
public function processAssert(Dashboard $dashboard)
23+
{
24+
$dashboard->open();
25+
$dashboard->getSubscriptionBlock()->enableCheckbox();
26+
$dashboard->getModalBlock()->dismissWarning();
27+
\PHPUnit_Framework_Assert::assertFalse(
28+
$dashboard->getSubscriptionBlock()->isVisible(),
29+
'Subscription pop-up was not declined'
30+
);
31+
}
32+
33+
/**
34+
* Returns success message if equals to expected message.
35+
*
36+
* @return string
37+
*/
38+
public function toString()
39+
{
40+
return 'Subscription pop-up was declined';
41+
}
42+
}

dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
<constraint name="Magento\Install\Test\Constraint\AssertKeyCreated" />
2626
<constraint name="Magento\User\Test\Constraint\AssertUserSuccessLogin" />
2727
<constraint name="Magento\Install\Test\Constraint\AssertCurrencySelected" />
28+
<constraint name="Magento\Analytics\Test\Constraint\AssertDeclineSubscriptionPopup" />
29+
<constraint name="Magento\Analytics\Test\Constraint\AssertConfigAnalyticsDisabled" />
2830
</variation>
2931
<variation name="InstallTestVariation3" summary="Install with table prefix">
3032
<data name="user/dataset" xsi:type="string">default</data>

0 commit comments

Comments
 (0)