Skip to content

Commit 7a0f58a

Browse files
author
Oleksii Kolesnyk
committed
MTA-2723: Functional test maintenance. Part 2
- get messages refactored
1 parent c103541 commit 7a0f58a

File tree

128 files changed

+169
-151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+169
-151
lines changed

‎dev/tests/functional/tests/app/Magento/Backend/Test/Block/Cache.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function flushCacheStorage()
6868
*/
6969
public function isStorageCacheFlushed()
7070
{
71-
return $this->getMessagesBlock()->getSuccessMessages() == $this->messagesText['cache_storage_flushed'];
71+
return $this->getMessagesBlock()->getSuccessMessage() == $this->messagesText['cache_storage_flushed'];
7272
}
7373

7474
/**
@@ -78,7 +78,7 @@ public function isStorageCacheFlushed()
7878
*/
7979
public function isMagentoCacheFlushed()
8080
{
81-
return $this->getMessagesBlock()->getSuccessMessages() == $this->messagesText['cache_magento_flushed'];
81+
return $this->getMessagesBlock()->getSuccessMessage() == $this->messagesText['cache_magento_flushed'];
8282
}
8383

8484
/**

‎dev/tests/functional/tests/app/Magento/Backend/Test/Block/Messages.php

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ class Messages extends Block
2121
*/
2222
protected $successMessage = '[data-ui-id$=message-success]';
2323

24+
/**
25+
* Last success message selector.
26+
*
27+
* @var string
28+
*/
29+
protected $lastSuccessMessage = '[data-ui-id$=message-success]:last-child';
30+
2431
/**
2532
* Message link.
2633
*
@@ -62,7 +69,7 @@ public function waitSuccessMessage()
6269
/**
6370
* Get all success messages which are present on the page.
6471
*
65-
* @return string|array
72+
* @return array
6673
*/
6774
public function getSuccessMessages()
6875
{
@@ -74,7 +81,19 @@ public function getSuccessMessages()
7481
$messages[] = $element->getText();
7582
}
7683

77-
return count($messages) > 1 ? $messages : $messages[0];
84+
return $messages;
85+
}
86+
87+
/**
88+
* Get last success message which is present on the page.
89+
*
90+
* @return string
91+
*/
92+
public function getSuccessMessage()
93+
{
94+
$this->waitForElementVisible($this->successMessage);
95+
96+
return $this->_rootElement->find($this->lastSuccessMessage)->getText();
7897
}
7998

8099
/**
@@ -96,25 +115,25 @@ function () use ($browser, $selector, $strategy) {
96115
}
97116

98117
/**
99-
* Get all error messages which are present on the page.
118+
* Get all error message which is present on the page.
100119
*
101120
* @return string
102121
*/
103-
public function getErrorMessages()
122+
public function getErrorMessage()
104123
{
105124
return $this->_rootElement
106125
->find($this->errorMessage, Locator::SELECTOR_CSS)
107126
->getText();
108127
}
109128

110129
/**
111-
* Click on link in the messages which are present on the page.
130+
* Click on link in the message which is present on the page.
112131
*
113132
* @param string $messageType
114133
* @param string $linkText
115134
* @return void
116135
*/
117-
public function clickLinkInMessages($messageType, $linkText)
136+
public function clickLinkInMessage($messageType, $linkText)
118137
{
119138
if ($this->isVisibleMessage($messageType)) {
120139
$this->_rootElement
@@ -162,7 +181,7 @@ public function assertNoticeMessage()
162181
*
163182
* @return string
164183
*/
165-
public function getNoticeMessages()
184+
public function getNoticeMessage()
166185
{
167186
$this->waitForElementVisible($this->noticeMessage);
168187
return $this->_rootElement->find($this->noticeMessage)->getText();
@@ -173,7 +192,7 @@ public function getNoticeMessages()
173192
*
174193
* @return string
175194
*/
176-
public function getWarningMessages()
195+
public function getWarningMessage()
177196
{
178197
$this->waitForElementVisible($this->warningMessage);
179198
return $this->_rootElement->find($this->warningMessage)->getText();

‎dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertCacheIsRefreshableAndInvalidated.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function processAssert(AdminCache $adminCache, $cacheTags)
4141

4242
\PHPUnit_Framework_Assert::assertEquals(
4343
sprintf(self::SUCCESS_MESSAGE, count($items)),
44-
$adminCache->getMessagesBlock()->getSuccessMessages(),
44+
$adminCache->getMessagesBlock()->getSuccessMessage(),
4545
'Cache is Invalid and refreshable.'
4646
);
4747
}

‎dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertCacheManagementAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function processAssert(AdminCache $adminCache, $successMessage)
2525
{
2626
\PHPUnit_Framework_Assert::assertEquals(
2727
$successMessage,
28-
$adminCache->getMessagesBlock()->getSuccessMessages(),
28+
$adminCache->getMessagesBlock()->getSuccessMessage(),
2929
'Action is not successful.'
3030
);
3131
}

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySaveMessage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class AssertCategorySaveMessage extends AbstractConstraint
2828
*/
2929
public function processAssert(CatalogCategoryEdit $catalogCategoryEdit)
3030
{
31-
$actualMessage = $catalogCategoryEdit->getMessagesBlock()->getSuccessMessages();
31+
$actualMessage = $catalogCategoryEdit->getMessagesBlock()->getSuccessMessage();
3232
\PHPUnit_Framework_Assert::assertEquals(
3333
self::SUCCESS_MESSAGE,
3434
$actualMessage,

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySuccessDeleteMessage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class AssertCategorySuccessDeleteMessage extends AbstractConstraint
2828
*/
2929
public function processAssert(CatalogCategoryEdit $categoryEdit)
3030
{
31-
$actualMessage = $categoryEdit->getMessagesBlock()->getSuccessMessages();
31+
$actualMessage = $categoryEdit->getMessagesBlock()->getSuccessMessage();
3232
\PHPUnit_Framework_Assert::assertEquals(
3333
self::SUCCESS_DELETE_MESSAGE,
3434
$actualMessage,

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertMassProductUpdateSuccessMessage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function processAssert(CatalogProductIndex $productGrid, $products = [])
3030
{
3131
$countProducts = count($products) ? count($products) : 1;
3232
$expectedMessage = sprintf(self::SUCCESS_MESSAGE, $countProducts);
33-
$actualMessage = $productGrid->getMessagesBlock()->getSuccessMessages();
33+
$actualMessage = $productGrid->getMessagesBlock()->getSuccessMessage();
3434
\PHPUnit_Framework_Assert::assertEquals(
3535
$expectedMessage,
3636
$actualMessage,

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSaveMessage.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
*/
1515
class AssertProductAttributeSaveMessage extends AbstractConstraint
1616
{
17+
/**
18+
* Product attribute success save message.
19+
*/
1720
const SUCCESS_MESSAGE = 'You saved the product attribute.';
1821

1922
/**
@@ -24,12 +27,13 @@ class AssertProductAttributeSaveMessage extends AbstractConstraint
2427
*/
2528
public function processAssert(CatalogProductAttributeIndex $attributeIndex)
2629
{
30+
$actualMessage = $attributeIndex->getMessagesBlock()->getSuccessMessage();
2731
\PHPUnit_Framework_Assert::assertEquals(
2832
self::SUCCESS_MESSAGE,
29-
$attributeIndex->getMessagesBlock()->getSuccessMessages(),
33+
$actualMessage,
3034
'Wrong success message is displayed.'
3135
. "\nExpected: " . self::SUCCESS_MESSAGE
32-
. "\nActual: " . $attributeIndex->getMessagesBlock()->getSuccessMessages()
36+
. "\nActual: " . $actualMessage
3337
);
3438
}
3539

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSuccessDeleteMessage.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,13 @@ class AssertProductAttributeSuccessDeleteMessage extends AbstractConstraint
2525
*/
2626
public function processAssert(CatalogProductAttributeIndex $attributeIndex)
2727
{
28+
$actualMessage = $attributeIndex->getMessagesBlock()->getSuccessMessages();
2829
\PHPUnit_Framework_Assert::assertEquals(
2930
self::SUCCESS_MESSAGE,
30-
$attributeIndex->getMessagesBlock()->getSuccessMessages(),
31+
$actualMessage,
3132
'Wrong success message is displayed.'
3233
. "\nExpected: " . self::SUCCESS_MESSAGE
33-
. "\nActual: " . $attributeIndex->getMessagesBlock()->getSuccessMessages()
34+
. "\nActual: " . $actualMessage
3435
);
3536
}
3637

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessAddMessage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class AssertProductCompareSuccessAddMessage extends AbstractConstraint
3131
public function processAssert(CatalogProductView $catalogProductView, FixtureInterface $product)
3232
{
3333
$successMessage = sprintf(self::SUCCESS_MESSAGE, $product->getName());
34-
$actualMessage = $catalogProductView->getMessagesBlock()->getSuccessMessages();
34+
$actualMessage = $catalogProductView->getMessagesBlock()->getSuccessMessage();
3535
\PHPUnit_Framework_Assert::assertEquals(
3636
$successMessage,
3737
$actualMessage,

0 commit comments

Comments
 (0)