Skip to content

Commit 04d3482

Browse files
committed
change unit test for callout stripping to be based on pygments output
1 parent 61d8409 commit 04d3482

File tree

1 file changed

+20
-26
lines changed

1 file changed

+20
-26
lines changed

tests/examples.py

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
</div>"""
3636

3737

38-
3938
SERVER_COMMAND = """<div class="listingblock server-commands">
4039
<div class="content">
4140
<pre><code>elspeth@server:$ <strong>sudo do stuff</strong></code></pre>
@@ -70,14 +69,14 @@
7069
</pre></div></div></div>"""
7170

7271

73-
COMMAND_MADE_WITH_ATS="""
72+
COMMAND_MADE_WITH_ATS = """
7473
<div class="listingblock">
7574
<div class="content">
7675
<pre><code>$ <strong>grep id_new_item functional_tests/tests/test*</strong></code></pre>
7776
</div></div>
7877
"""
7978

80-
OUTPUT_WITH_SKIPME="""
79+
OUTPUT_WITH_SKIPME = """
8180
<div class="listingblock skipme">
8281
<div class="content"><div class="highlight"><pre><span class="k">try</span><span class="p">:</span>
8382
<span class="n">item</span><span class="o">.</span><span class="n">save</span><span class="p">()</span>
@@ -166,33 +165,28 @@
166165

167166

168167
CODE_LISTING_WITH_ASCIIDOCTOR_CALLOUTS = """
169-
<div class="listingblock sourcecode">
170-
<div class="title">lists/static/tests/tests.html</div>
168+
<div class="exampleblock sourcecode">
169+
<div class="title">src/lists/templates/base.html (ch16l004)</div>
171170
<div class="content">
172-
<pre class="CodeRay highlight"><code data-lang="html"> <span class="tag">&lt;div</span> <span class="attribute-name">id</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">qunit-fixture</span><span class="delimiter">&quot;</span></span><span class="tag">&gt;</span><span class="tag">&lt;/div&gt;</span>
173-
174-
<span class="tag">&lt;form&gt;</span> <i class="conum" data-value="1"></i><b>(1)</b>
175-
<span class="tag">&lt;input</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">text</span><span class="delimiter">&quot;</span></span> <span class="tag">/&gt;</span>
176-
<span class="tag">&lt;div</span> <span class="attribute-name">class</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">has-error</span><span class="delimiter">&quot;</span></span><span class="tag">&gt;</span>Error text<span class="tag">&lt;/div&gt;</span>
177-
<span class="tag">&lt;/form&gt;</span>
178-
179-
<span class="tag">&lt;script</span> <span class="attribute-name">src</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">http://code.jquery.com/jquery.min.js</span><span class="delimiter">&quot;</span></span><span class="tag">&gt;</span><span class="tag">&lt;/script&gt;</span>
180-
<span class="tag">&lt;script</span> <span class="attribute-name">src</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">qunit.js</span><span class="delimiter">&quot;</span></span><span class="tag">&gt;</span><span class="tag">&lt;/script&gt;</span>
181-
<span class="tag">&lt;script&gt;</span>
182-
<span class="inline"><span class="comment">/*global $, test, equal */</span>
183-
184-
test(<span class="string"><span class="delimiter">&quot;</span><span class="content">smoke test</span><span class="delimiter">&quot;</span></span>, <span class="keyword">function</span> () {
185-
equal(<span class="predefined">$</span>(<span class="string"><span class="delimiter">'</span><span class="content">.has-error</span><span class="delimiter">'</span></span>).is(<span class="string"><span class="delimiter">'</span><span class="content">:visible</span><span class="delimiter">'</span></span>), <span class="predefined-constant">true</span>); <i class="conum" data-value="2"></i><b>(2)</b> <i class="conum" data-value="3"></i><b>(3)</b>
186-
<span class="predefined">$</span>(<span class="string"><span class="delimiter">'</span><span class="content">.has-error</span><span class="delimiter">'</span></span>).hide(); <i class="conum" data-value="4"></i><b>(4)</b>
187-
equal(<span class="predefined">$</span>(<span class="string"><span class="delimiter">'</span><span class="content">.has-error</span><span class="delimiter">'</span></span>).is(<span class="string"><span class="delimiter">'</span><span class="content">:visible</span><span class="delimiter">'</span></span>), <span class="predefined-constant">false</span>); <i class="conum" data-value="5"></i><b>(5)</b>
188-
});</span>
189-
190-
<span class="tag">&lt;/script&gt;</span></code></pre>
171+
<div class="listingblock">
172+
<div class="content">
173+
<pre class="pygments highlight"><code data-lang="html"><span></span> <span class="tok-p">&lt;/</span><span class="tok-nt">div</span><span class="tok-p">&gt;</span>
174+
175+
<span class="tok-p">&lt;</span><span class="tok-nt">script</span><span class="tok-p">&gt;</span>
176+
<span class="tok-w"> </span><span class="tok-kd">const</span><span class="tok-w"> </span><span class="tok-nx">textInput</span><span class="tok-w"> </span><span class="tok-o">=</span><span class="tok-w"> </span><span class="tok-nb">document</span><span class="tok-p">.</span><span class="tok-nx">querySelector</span><span class="tok-p">(</span><span class="tok-s2">&quot;#id_text&quot;</span><span class="tok-p">);</span><span class="tok-w"> </span><i class="conum" data-value="1"></i><b>(1)</b>
177+
<span class="tok-w"> </span><span class="tok-nx">textInput</span><span class="tok-p">.</span><span class="tok-nx">oninput</span><span class="tok-w"> </span><span class="tok-o">=</span><span class="tok-w"> </span><span class="tok-p">()</span><span class="tok-w"> </span><span class="tok-p">=&gt;</span><span class="tok-w"> </span><span class="tok-p">{</span><span class="tok-w"> </span><i class="conum" data-value="2"></i><b>(2)</b> <i class="conum" data-value="3"></i><b>(3)</b>
178+
<span class="tok-w"> </span><span class="tok-kd">const</span><span class="tok-w"> </span><span class="tok-nx">errorMsg</span><span class="tok-w"> </span><span class="tok-o">=</span><span class="tok-w"> </span><span class="tok-nb">document</span><span class="tok-p">.</span><span class="tok-nx">querySelector</span><span class="tok-p">(</span><span class="tok-s2">&quot;.invalid-feedback&quot;</span><span class="tok-p">);</span>
179+
<span class="tok-w"> </span><span class="tok-nx">errorMsg</span><span class="tok-p">.</span><span class="tok-nx">style</span><span class="tok-p">.</span><span class="tok-nx">display</span><span class="tok-w"> </span><span class="tok-o">=</span><span class="tok-w"> </span><span class="tok-s2">&quot;none&quot;</span><span class="tok-p">;</span><span class="tok-w"> </span><i class="conum" data-value="4"></i><b>(4)</b>
180+
<span class="tok-w"> </span><span class="tok-p">}</span>
181+
<span class="tok-w"> </span><span class="tok-p">&lt;/</span><span class="tok-nt">script</span><span class="tok-p">&gt;</span></code></pre>
182+
</div>
183+
</div>
191184
</div>
192185
</div>
193186
"""
194187

195-
OUTPUT_WITH_CALLOUTS = '''<div class="listingblock">
188+
189+
OUTPUT_WITH_CALLOUTS = """<div class="listingblock">
196190
<div class="content">
197191
<pre>$ <strong>python manage.py test functional_tests.test_list_item_validation</strong>
198192
Creating test database for alias 'default'...
@@ -222,7 +216,7 @@
222216
223217
FAILED (errors=1)</pre>
224218
</div>
225-
</div>'''
219+
</div>"""
226220

227221
EXAMPLE_DIFF_LISTING = """
228222
<div class="exampleblock sourcecode small-code">

0 commit comments

Comments
 (0)