Skip to content

Commit af699f8

Browse files
author
Ji Lu
committed
MAGETWO-52332: Moved cache tests to PageCache module and other code refactoring.
1 parent 2087543 commit af699f8

27 files changed

+155
-110
lines changed

dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertCacheFlushStaticFilesInProductionMode.php

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

dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertStoreCanBeLocalized.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use Magento\Mtf\Constraint\AbstractConstraint;
1111
use Magento\Backend\Test\Page\Adminhtml\SystemConfig;
1212
use Magento\Cms\Test\Page\CmsIndex;
13-
use Magento\Backend\Test\Page\Adminhtml\AdminCache;
13+
use Magento\PageCache\Test\Page\Adminhtml\AdminCache;
1414

1515
/**
1616
* Assert that store can be localized.

dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/CacheFlushStaticFilesInProductionModeTest.xml

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

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<data name="cacheTags" xsi:type="array">
6161
<item name="0" xsi:type="string">FPC</item>
6262
</data>
63-
<constraint name="Magento\Backend\Test\Constraint\AssertCacheIsRefreshableAndInvalidated" />
63+
<constraint name="Magento\PageCache\Test\Constraint\AssertCacheIsRefreshableAndInvalidated" />
6464
<constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchProductByAttribute" />
6565
</variation>
6666
</testCase>

dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/AbstractCatalogRuleEntityTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace Magento\CatalogRule\Test\TestCase;
88

9-
use Magento\Backend\Test\Page\Adminhtml\AdminCache;
9+
use Magento\PageCache\Test\Page\Adminhtml\AdminCache;
1010
use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex;
1111
use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleNew;
1212
use Magento\Mtf\Fixture\FixtureFactory;

dev/tests/functional/tests/app/Magento/Backend/Test/Block/Cache.php renamed to dev/tests/functional/tests/app/Magento/PageCache/Test/Block/Cache.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Magento\Backend\Test\Block;
7+
namespace Magento\PageCache\Test\Block;
88

99
use Magento\Mtf\Block\Block;
1010
use Magento\Mtf\Client\Locator;

dev/tests/functional/tests/app/Magento/Backend/Test/Block/Cache/Additional.php renamed to dev/tests/functional/tests/app/Magento/PageCache/Test/Block/Cache/Additional.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Magento\Backend\Test\Block\Cache;
7+
namespace Magento\PageCache\Test\Block\Cache;
88

99
use Magento\Mtf\Block\Block;
1010
use Magento\Mtf\Client\Locator;
@@ -40,7 +40,11 @@ public function clickFlushCache($flushButtonName)
4040
*/
4141
public function isFlushCacheButtonVisible($flushButtonName)
4242
{
43-
return $this->_rootElement->find(sprintf($this->flushButton, $flushButtonName), Locator::SELECTOR_XPATH)
44-
->isVisible();
43+
try {
44+
return $this->_rootElement->find(sprintf($this->flushButton, $flushButtonName), Locator::SELECTOR_XPATH)
45+
->isVisible();
46+
} catch (\PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
47+
return false;
48+
}
4549
}
4650
}

dev/tests/functional/tests/app/Magento/Backend/Test/Block/Cache/Grid.php renamed to dev/tests/functional/tests/app/Magento/PageCache/Test/Block/Cache/Grid.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Magento\Backend\Test\Block\Cache;
7+
namespace Magento\PageCache\Test\Block\Cache;
88

99
use Magento\Backend\Test\Block\Widget\Grid as ParentGrid;
1010

dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertCacheManagementAction.php renamed to dev/tests/functional/tests/app/Magento/PageCache/Test/Constraint/AssertCacheFlushSuccessMessage.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Magento\Backend\Test\Constraint;
7+
namespace Magento\PageCache\Test\Constraint;
88

9-
use Magento\Backend\Test\Page\Adminhtml\AdminCache;
9+
use Magento\PageCache\Test\Page\Adminhtml\AdminCache;
1010
use Magento\Mtf\Constraint\AbstractConstraint;
1111

1212
/**
13-
* Assert Cache Management Action.
13+
* Class AssertCacheFlushSuccessMessage
1414
*/
15-
class AssertCacheManagementAction extends AbstractConstraint
15+
class AssertCacheFlushSuccessMessage extends AbstractConstraint
1616
{
1717
/**
18-
* Assert success message for cache flush.
18+
* Assert that success message is displayed after cache flush.
1919
*
2020
* @param AdminCache $adminCache
2121
* @param string $successMessage
@@ -37,6 +37,6 @@ public function processAssert(AdminCache $adminCache, $successMessage)
3737
*/
3838
public function toString()
3939
{
40-
return 'Cache management action is successful.';
40+
return 'Flush additional caches are successful.';
4141
}
4242
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Magento\Backend\Test\Constraint;
7+
namespace Magento\PageCache\Test\Constraint;
88

99
use Magento\Mtf\Constraint\AbstractConstraint;
10-
use Magento\Backend\Test\Page\Adminhtml\AdminCache;
10+
use Magento\PageCache\Test\Page\Adminhtml\AdminCache;
1111

1212
/**
1313
* Assert Cache is Invalidated and Refreshable.

0 commit comments

Comments
 (0)