Skip to content

Commit 7d5a015

Browse files
committed
MAGETWO-35064: At night (by Kiev time) some tests connected to dates are failed
1 parent 983d05f commit 7d5a015

File tree

4 files changed

+2
-21
lines changed

4 files changed

+2
-21
lines changed

app/code/Magento/Customer/Test/Unit/Controller/Account/EditPostTest.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,6 @@ class EditPostTest extends \PHPUnit_Framework_TestCase
8181
*/
8282
protected $messageManager;
8383

84-
/**
85-
* @return void
86-
*/
8784
public function setUp()
8885
{
8986
$this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -154,9 +151,6 @@ public function getController()
154151
);
155152
}
156153

157-
/**
158-
* @return void
159-
*/
160154
public function testEditPostActionWithInvalidFormKey()
161155
{
162156
$this->resultRedirectFactory
@@ -177,7 +171,6 @@ public function testEditPostActionWithInvalidFormKey()
177171
}
178172

179173
/**
180-
* @return void
181174
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
182175
*/
183176
public function testEditPostActionWithAuthenticationExceptionWhenTryingChangePassword()
@@ -303,7 +296,6 @@ public function testEditPostActionWithAuthenticationExceptionWhenTryingChangePas
303296
}
304297

305298
/**
306-
* @return void
307299
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
308300
*/
309301
public function testEditPostActionWithoutErrors()

dev/tests/static/framework/Magento/Sniffs/Annotations/Helper.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,8 @@ public function shouldFilter()
496496
// This block of the if should be removed leaving only the phtml condition when dev/tests is swept.
497497
// Skip all dev tests files
498498
$shouldFilter = true;
499+
} elseif (preg_match('#(?:/|\\\\)Test(?:/|\\\\)Unit(?:/|\\\\)#', $filename)) {
500+
$shouldFilter = true;
499501
} elseif (preg_match('/\\.phtml$/', $filename)) {
500502
// Skip all phtml files
501503
$shouldFilter = true;

lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/TemplateFileTest.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ class TemplateFileTest extends \PHPUnit_Framework_TestCase
3838
*/
3939
protected $assetConfig;
4040

41-
/**
42-
* @return void
43-
*/
4441
protected function setUp()
4542
{
4643
$this->resolver = $this->getMock('Magento\Framework\View\Design\FileResolution\Fallback\ResolverInterface');
@@ -57,7 +54,6 @@ protected function setUp()
5754

5855
/**
5956
* Cover getFile when mode is developer
60-
* @return void
6157
*/
6258
public function testGetFileWhenStateDeveloper()
6359
{
@@ -85,7 +81,6 @@ public function testGetFileWhenStateDeveloper()
8581
* Cover getFile when mode is default
8682
* @param string $mode
8783
* @param string $method
88-
* @return void
8984
* @dataProvider getMinifiedDataProvider
9085
*/
9186
public function testGetFileWhenModifiedNeeded($mode, $method)
@@ -115,9 +110,6 @@ public function testGetFileWhenModifiedNeeded($mode, $method)
115110
$this->assertSame($expectedMinified, $actual);
116111
}
117112

118-
/**
119-
* @return void
120-
*/
121113
public function testGetFileIfMinificationIsDisabled()
122114
{
123115
$this->assetConfig

lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ class MinifierTest extends \PHPUnit_Framework_TestCase
2828

2929
/**
3030
* Initialize testable object
31-
*
32-
* @return void
3331
*/
3432
public function setUp()
3533
{
@@ -54,7 +52,6 @@ public function setUp()
5452
/**
5553
* Covered method getPathToMinified
5654
* @test
57-
* @return void
5855
*/
5956
public function testGetPathToMinified()
6057
{
@@ -78,7 +75,6 @@ public function testGetPathToMinified()
7875
/**
7976
* Covered method minify and test regular expressions
8077
* @test
81-
* @return void
8278
*/
8379
public function testMinify()
8480
{
@@ -161,7 +157,6 @@ public function testMinify()
161157
/**
162158
* Contain method modify and getPathToModified
163159
* @test
164-
* @return void
165160
*/
166161
public function testGetMinified()
167162
{

0 commit comments

Comments
 (0)