Skip to content

Commit bc26394

Browse files
weaverryanweaverryan
committed
Removing non-bod text from "block" tests and asserting exact HTML with spacing
1 parent 42e515e commit bc26394

37 files changed

+57
-510
lines changed

‎src/Templates/default/html/paragraph.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% set text = paragraphNode.value.render()|trim %}
22

3-
{% if text %}
4-
<p{% if paragraphNode.classes %} class="{{ paragraphNode.classesString }}"{% endif %}>{{ text|raw }}</p>
3+
{%- if text %}
4+
<p{% if paragraphNode.classes %} class="{{ paragraphNode.classesString }}"{% endif %}>{{ text|raw }}</p>
55
{% endif %}

‎tests/IntegrationTest.php

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function integrationProvider()
8585
/**
8686
* @dataProvider parserUnitBlockProvider
8787
*/
88-
public function testParseUnitBlock(string $blockName, bool $useIndenter = true)
88+
public function testParseUnitBlock(string $blockName)
8989
{
9090
$configuration = new Configuration();
9191
$configuration->setCustomTemplateDirs([__DIR__.'/Templates']);
@@ -96,19 +96,15 @@ public function testParseUnitBlock(string $blockName, bool $useIndenter = true)
9696

9797
$sourceFile = sprintf('%s/fixtures/source/blocks/%s.rst', __DIR__, $blockName);
9898

99-
$document = $parser->parseFile($sourceFile)->renderDocument();
99+
$actualHtml = $parser->parseFile($sourceFile)->renderDocument();
100+
$expectedHtml = file_get_contents(sprintf('%s/fixtures/expected/blocks/%s.html', __DIR__, $blockName));
100101

101-
$indenter = $this->createIndenter();
102-
103-
$expectedFile = sprintf('%s/fixtures/expected/blocks/%s.html', __DIR__, $blockName);
104-
105-
if (!$useIndenter) {
106-
$this->assertSame(file_get_contents($expectedFile), $document);
107-
}
102+
$actualCrawler = new Crawler($actualHtml);
103+
$expectedCrawler = new Crawler($expectedHtml);
108104

109105
$this->assertSame(
110-
str_replace(" \n", "\n", $indenter->indent(file_get_contents($expectedFile))),
111-
str_replace(" \n", "\n", $indenter->indent($document))
106+
trim($expectedCrawler->filter('body')->html()),
107+
trim($actualCrawler->filter('body')->html())
112108
);
113109
}
114110

@@ -204,7 +200,6 @@ public function parserUnitBlockProvider()
204200

205201
yield 'reference-and-code' => [
206202
'blockName' => 'references/reference-and-code',
207-
'useIndenter' => false,
208203
];
209204

210205
yield 'code-block-php' => [

‎tests/fixtures/expected/blocks/code-blocks/bash.html

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<meta charset="utf-8" />
5-
6-
7-
</head>
8-
9-
<body>
10-
<div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-bash">
1+
<div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-bash">
112
<div class="codeblock-scroll">
123
<pre class="codeblock-lines">1</pre>
134
<pre class="codeblock-code"><code>git <span class="hljs-built_in">clone</span> git@github.com:symfony/symfony.git
145
</code></pre>
156
</div>
167
</div>
17-
18-
</body>
19-
</html>

‎tests/fixtures/expected/blocks/code-blocks/html-php.html

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<meta charset="utf-8" />
5-
6-
7-
</head>
8-
9-
<body>
10-
<div translate="no" class="notranslate codeblock codeblock-loc-2 codeblock-html+php codeblock-html">
1+
<div translate="no" class="notranslate codeblock codeblock-loc-2 codeblock-html+php codeblock-html">
112
<div class="codeblock-scroll">
123
<pre class="codeblock-lines">1
134
2
@@ -35,7 +26,3 @@
3526
<span class="hljs-tag">&lt;/<span class="hljs-name">html</span>&gt;</span>
3627
</code></pre>
3728
</div>
38-
</div>
39-
40-
</body>
41-
</html>

‎tests/fixtures/expected/blocks/code-blocks/html-twig.html

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<meta charset="utf-8" />
5-
6-
7-
</head>
8-
9-
<body>
10-
<div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-html+twig codeblock-twig">
1+
<div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-html+twig codeblock-twig">
112
<div class="codeblock-scroll">
123
<pre class="codeblock-lines">1
134
2</pre>
@@ -16,6 +7,3 @@
167
</span></code></pre>
178
</div>
189
</div>
19-
20-
</body>
21-
</html>

‎tests/fixtures/expected/blocks/code-blocks/html.html

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<meta charset="utf-8" />
5-
6-
7-
</head>
8-
9-
<body>
10-
<div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-html">
1+
<div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-html">
112
<div class="codeblock-scroll">
123
<pre class="codeblock-lines">1</pre>
134
<pre class="codeblock-code"><code><span class="hljs-comment">&lt;!-- some code --&gt;</span>
145
</code></pre>
156
</div>
16-
</div>
17-
18-
</body>
19-
</html>

‎tests/fixtures/expected/blocks/code-blocks/ini.html

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<meta charset="utf-8" />
5-
6-
7-
</head>
8-
9-
<body>
10-
<div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-ini">
1+
<div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-ini">
112
<div class="codeblock-scroll">
123
<pre class="codeblock-lines">1</pre>
134
<pre class="codeblock-code"><code><span class="hljs-attr">fetch</span> = +refs/notes/*:refs/notes/*
145
</code></pre>
156
</div>
167
</div>
17-
18-
</body>
19-
</html>

‎tests/fixtures/expected/blocks/code-blocks/php-annotations.html

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<meta charset="utf-8" />
5-
6-
7-
</head>
8-
9-
<body>
10-
<div translate="no" class="notranslate codeblock codeblock-loc-2 codeblock-php-annotations codeblock-php">
1+
<div translate="no" class="notranslate codeblock codeblock-loc-2 codeblock-php-annotations codeblock-php">
112
<div class="codeblock-scroll">
123
<pre class="codeblock-lines">1
134
2
@@ -40,6 +31,3 @@
4031
</code></pre>
4132
</div>
4233
</div>
43-
44-
</body>
45-
</html>

‎tests/fixtures/expected/blocks/code-blocks/php.html

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<meta charset="utf-8" />
5-
6-
7-
</head>
8-
9-
<body>
10-
<div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-php">
1+
<div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-php">
112
<div class="codeblock-scroll">
123
<pre class="codeblock-lines">1
134
2
@@ -26,6 +17,3 @@
2617
</code></pre>
2718
</div>
2819
</div>
29-
30-
</body>
31-
</html>

‎tests/fixtures/expected/blocks/code-blocks/terminal.html

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<meta charset="utf-8" />
5-
6-
7-
</head>
8-
9-
<body>
10-
<div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-terminal codeblock-bash">
11-
<div class="codeblock-scroll">
12-
<pre class="codeblock-lines">1</pre>
13-
<pre class="codeblock-code"><code>git <span class="hljs-built_in">clone</span> git@github.com:symfony/symfony.git
14-
</code></pre>
15-
</div>
16-
</div>
17-
181
<div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-terminal codeblock-bash">
192
<div class="codeblock-scroll">
203
<pre class="codeblock-lines">1
@@ -43,6 +26,3 @@
4326
</pre>
4427
</div>
4528
</div>
46-
47-
</body>
48-
</html>

‎tests/fixtures/expected/blocks/code-blocks/text.html

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<meta charset="utf-8" />
5-
6-
7-
</head>
8-
9-
<body>
10-
<div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-text">
1+
<div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-text">
112
<div class="codeblock-scroll">
123
<pre class="codeblock-lines">1</pre>
134
<pre class="codeblock-code"><code>some text
145
</code></pre>
156
</div>
167
</div>
17-
18-
</body>
19-
</html>

‎tests/fixtures/expected/blocks/code-blocks/twig.html

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<meta charset="utf-8" />
5-
6-
7-
</head>
8-
9-
<body>
10-
<div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-twig">
1+
<div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-twig">
112
<div class="codeblock-scroll">
123
<pre class="codeblock-lines">1</pre>
134
<pre class="codeblock-code"><code><span class="hljs-comment">{# some code #}</span><span class="xml">
145
</span></code></pre>
156
</div>
167
</div>
17-
18-
</body>
19-
</html>

‎tests/fixtures/expected/blocks/code-blocks/xml.html

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<meta charset="utf-8" />
5-
6-
7-
</head>
8-
9-
<body>
10-
<div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-xml">
1+
<div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-xml">
112
<div class="codeblock-scroll">
123
<pre class="codeblock-lines">1</pre>
134
<pre class="codeblock-code"><code><span class="hljs-comment">&lt;!-- some code --&gt;</span>
145
</code></pre>
156
</div>
167
</div>
17-
18-
</body>
19-
</html>

‎tests/fixtures/expected/blocks/code-blocks/yaml.html

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<meta charset="utf-8" />
5-
6-
7-
</head>
8-
9-
<body>
10-
<div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-yaml">
1+
<div translate="no" class="notranslate codeblock codeblock-loc-1 codeblock-yaml">
112
<div class="codeblock-scroll">
123
<pre class="codeblock-lines">1</pre>
134
<pre class="codeblock-code"><code><span class="hljs-comment"># some code</span>
145
</code></pre>
156
</div>
167
</div>
17-
18-
</body>
19-
</html>

‎tests/fixtures/expected/blocks/directives/admonition.html

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<meta charset="utf-8" />
5-
6-
7-
</head>
8-
9-
<body>
10-
<div class="admonition admonition-default screencast_class">
1+
<div class="admonition admonition-default screencast_class">
112
<p class="admonition-title">
123
Screencast
134
</p><p>Do you prefer video tutorials? Check out the the screencasts.</p>
145
</div>
15-
16-
</body>
17-
</html>

‎tests/fixtures/expected/blocks/directives/best-practice.html

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<meta charset="utf-8" />
5-
6-
7-
</head>
8-
9-
<body>
10-
<div class="admonition admonition-best-practice ">
1+
<div class="admonition admonition-best-practice ">
112
<p class="admonition-title">
123
Best Practice
134
</p><p>Use the bcrypt encoder for hashing your users' passwords.</p>
145
</div>
15-
16-
</body>
17-
</html>

‎tests/fixtures/expected/blocks/directives/caution.html

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
<!DOCTYPE html>
2-
<html>
3-
<head>
4-
<meta charset="utf-8" />
5-
6-
7-
</head>
8-
9-
<body>
10-
<div class="admonition admonition-caution ">
1+
<div class="admonition admonition-caution ">
112
<p class="admonition-title">
123
<svg xmlns="http://www.w3.org/2000/svg" fill="none" width="24" height="24" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
134
Caution
145
</p><p>Using too many sidebars or caution directives can be distracting!</p>
156
</div>
16-
17-
</body>
18-
</html>

0 commit comments

Comments
 (0)