Skip to content

Commit 5abbe7e

Browse files
committed
MC-5806: Detection of URL dependencies does not work for the Dependency static test
-- fix merge conflict
1 parent b2e35f2 commit 5abbe7e

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
67

7-
/**
8-
* Coverage of obsolete nodes in layout
9-
*/
108
namespace Magento\Test\Legacy;
119

1210
use Magento\Framework\Component\ComponentRegistrar;
1311

1412
/**
15-
* Layout test
13+
* Coverage of obsolete nodes in layout
1614
*/
1715
class LayoutTest extends \PHPUnit\Framework\TestCase
1816
{
@@ -370,8 +368,6 @@ public function getAllowedActionNodeMethods()
370368
'unsetChildren',
371369
'updateButton',
372370
'setIsProductListingContext',
373-
'checkCompanyStatus', // MAGETWO-88965
374-
'setRendererType', // MAGETWO-88965
375371
];
376372
}
377373
}

0 commit comments

Comments
 (0)