Skip to content

Commit fe6c96f

Browse files
committed
Fix static tests.
1 parent d3e24ed commit fe6c96f

File tree

3 files changed

+58
-36
lines changed

3 files changed

+58
-36
lines changed

lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php

Lines changed: 45 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
use Magento\Framework\View\Layout;
99
use Magento\Framework\View\Page\Config as PageConfig;
10+
use Magento\Framework\View\Page\Config\Structure;
1011

1112
/**
1213
* Head structure reader is intended for collecting assets, title and metadata
@@ -80,40 +81,10 @@ public function interpret(
8081
}
8182

8283
ksort($orderedNodes);
83-
foreach ($orderedNodes as $nodes ) {
84+
foreach ($orderedNodes as $nodes) {
8485
/** @var \Magento\Framework\View\Layout\Element $node */
8586
foreach ($nodes as $node) {
86-
switch ($node->getName()) {
87-
case self::HEAD_CSS:
88-
case self::HEAD_SCRIPT:
89-
case self::HEAD_LINK:
90-
$this->addContentTypeByNodeName($node);
91-
$pageConfigStructure->addAssets($node->getAttribute('src'), $this->getAttributes($node));
92-
break;
93-
94-
case self::HEAD_REMOVE:
95-
$pageConfigStructure->removeAssets($node->getAttribute('src'));
96-
break;
97-
98-
case self::HEAD_TITLE:
99-
$pageConfigStructure->setTitle(new \Magento\Framework\Phrase($node));
100-
break;
101-
102-
case self::HEAD_META:
103-
$this->setMetadata($pageConfigStructure, $node);
104-
break;
105-
106-
case self::HEAD_ATTRIBUTE:
107-
$pageConfigStructure->setElementAttribute(
108-
PageConfig::ELEMENT_TYPE_HEAD,
109-
$node->getAttribute('name'),
110-
$node->getAttribute('value')
111-
);
112-
break;
113-
114-
default:
115-
break;
116-
}
87+
$this->processNode($node, $pageConfigStructure);
11788
}
11889
}
11990
return $this;
@@ -151,4 +122,46 @@ private function setMetadata($pageConfigStructure, $node)
151122

152123
$pageConfigStructure->setMetadata($metadataName, $node->getAttribute('content'));
153124
}
125+
126+
/**
127+
* Process given node based on it's name.
128+
*
129+
* @param Layout\Element $node
130+
* @param Structure $pageConfigStructure
131+
* @return void
132+
*/
133+
private function processNode(Layout\Element $node, Structure $pageConfigStructure)
134+
{
135+
switch ($node->getName()) {
136+
case self::HEAD_CSS:
137+
case self::HEAD_SCRIPT:
138+
case self::HEAD_LINK:
139+
$this->addContentTypeByNodeName($node);
140+
$pageConfigStructure->addAssets($node->getAttribute('src'), $this->getAttributes($node));
141+
break;
142+
143+
case self::HEAD_REMOVE:
144+
$pageConfigStructure->removeAssets($node->getAttribute('src'));
145+
break;
146+
147+
case self::HEAD_TITLE:
148+
$pageConfigStructure->setTitle(new \Magento\Framework\Phrase($node));
149+
break;
150+
151+
case self::HEAD_META:
152+
$this->setMetadata($pageConfigStructure, $node);
153+
break;
154+
155+
case self::HEAD_ATTRIBUTE:
156+
$pageConfigStructure->setElementAttribute(
157+
PageConfig::ELEMENT_TYPE_HEAD,
158+
$node->getAttribute('name'),
159+
$node->getAttribute('value')
160+
);
161+
break;
162+
163+
default:
164+
break;
165+
}
166+
}
154167
}

lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/HeadTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ protected function setUp()
6060
);
6161
}
6262

63+
/**
64+
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
65+
*/
6366
public function testProcess()
6467
{
6568
$generatorContextMock = $this->createMock(Context::class);
@@ -120,10 +123,10 @@ public function testProcess()
120123
->with('file-url-css', 'css', ['attributes' => ['media' => 'all']]);
121124
$this->pageConfigMock->expects($this->at(1))
122125
->method('addRemotePageAsset')
123-
->with('file-url-css-last','css', ['attributes' => ['media' => 'all' ] , 'order' => 30]);
126+
->with('file-url-css-last', 'css', ['attributes' => ['media' => 'all' ] , 'order' => 30]);
124127
$this->pageConfigMock->expects($this->at(2))
125128
->method('addRemotePageAsset')
126-
->with('file-url-css-first','css', ['attributes' => ['media' => 'all'] , 'order' => 10]);
129+
->with('file-url-css-first', 'css', ['attributes' => ['media' => 'all'] , 'order' => 10]);
127130
$this->pageConfigMock->expects($this->at(3))
128131
->method('addRemotePageAsset')
129132
->with('file-url-link', Head::VIRTUAL_CONTENT_TYPE_LINK, ['attributes' => ['media' => 'all']]);

lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Reader/HeadTest.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,18 @@ public function testInterpret()
8484

8585
$structureMock->expects($this->at(9))
8686
->method('addAssets')
87-
->with('path/file-1.css', ['src' => 'path/file-1.css', 'media' => 'all', 'content_type' => 'css', 'order' => 10])
87+
->with(
88+
'path/file-1.css',
89+
['src' => 'path/file-1.css', 'media' => 'all', 'content_type' => 'css', 'order' => 10]
90+
)
8891
->willReturnSelf();
8992

9093
$structureMock->expects($this->at(10))
9194
->method('addAssets')
92-
->with('path/file-2.css', ['src' => 'path/file-2.css', 'media' => 'all', 'content_type' => 'css', 'order' => 30])
95+
->with(
96+
'path/file-2.css',
97+
['src' => 'path/file-2.css', 'media' => 'all', 'content_type' => 'css', 'order' => 30]
98+
)
9399
->willReturnSelf();
94100

95101
$this->assertEquals($this->model, $this->model->interpret($readerContextMock, $element->children()[0]));

0 commit comments

Comments
 (0)