Skip to content
Snippets Groups Projects
Commit 067a8d1c authored by James Addison's avatar James Addison :speech_balloon:
Browse files

Salsa issue #372: add expected test output.

parent 49871a42
No related branches found
No related tags found
1 merge request!141Unified diff parsing: maintain in-header boolean state to determine whether to drop from-file/to-file lines.
class="diffoscope">
<div class="difference">
<div class="diffheader">
<div class="diffcontrol diffcontrol-double"></div>
<div><span class="diffsize">296 B</span></div>
<div><span class="source">myfile1</span> vs.</div>
<div id="top"><span class="source">myfile2</span>
<a class="anchor" href="#top"></a>
</div>
</div>
<table class="diff">
<colgroup><col class="colines"/><col class="coldiff"/>
<col class="colines"/><col class="coldiff"/></colgroup>
<tr style="display:none;"><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
<tr class="diffhunk"><td colspan="2">Offset 1, 11 lines modified</td><td colspan="2">Offset 1, 11 lines modified</td></tr>
<tr class="diffunmodified"><td class="diffline">1 </td><td class="diffpresent">Line<span class="dp">·</span>1</td><td class="diffline">1 </td><td class="diffpresent">Line<span class="dp">·</span>1</td></tr>
<tr class="diffunmodified"><td class="diffline">2 </td><td class="diffpresent">Line<span class="dp">·</span>2</td><td class="diffline">2 </td><td class="diffpresent">Line<span class="dp">·</span>2</td></tr>
<tr class="diffunmodified"><td class="diffline">3 </td><td class="diffpresent">Line<span class="dp">·</span>3</td><td class="diffline">3 </td><td class="diffpresent">Line<span class="dp">·</span>3</td></tr>
<tr class="diffchanged"><td class="diffline">4 </td><td class="diffpresent">Line<span class="dp">·</span>4</td><td class="diffline">4 </td><td class="diffpresent">Line<span class="dp">·</span>4<ins>b</ins></td></tr>
<tr class="diffunmodified"><td class="diffline">5 </td><td class="diffpresent">Line<span class="dp">·</span>5</td><td class="diffline">5 </td><td class="diffpresent">Line<span class="dp">·</span>5</td></tr>
<tr class="diffunmodified"><td class="diffline">6 </td><td class="diffpresent">Line<span class="dp">·</span>6</td><td class="diffline">6 </td><td class="diffpresent">Line<span class="dp">·</span>6</td></tr>
<tr class="diffunmodified"><td class="diffline">7 </td><td class="diffpresent">Line<span class="dp">·</span>7</td><td class="diffline">7 </td><td class="diffpresent">Line<span class="dp">·</span>7</td></tr>
<tr class="diffunmodified"><td class="diffline">8 </td><td class="diffpresent">Line<span class="dp">·</span>8</td><td class="diffline">8 </td><td class="diffpresent">Line<span class="dp">·</span>8</td></tr>
<tr class="diffunmodified"><td class="diffline">9 </td><td class="diffpresent">Line<span class="dp">·</span>9</td><td class="diffline">9 </td><td class="diffpresent">Line<span class="dp">·</span>9</td></tr>
<tr class="diffunmodified"><td class="diffline">10 </td><td class="diffpresent">Line<span class="dp">·</span>10</td><td class="diffline">10 </td><td class="diffpresent">Line<span class="dp">·</span>10</td></tr>
<tr class="diffunmodified"><td class="diffline">11 </td><td class="diffpresent">Line<span class="dp">·</span>11</td><td class="diffline">11 </td><td class="diffpresent">Line<span class="dp">·</span>11</td></tr>
<tr class="diffhunk"><td colspan="2">Offset 28, 15 lines modified</td><td colspan="2">Offset 28, 15 lines modified</td></tr>
<tr class="diffunmodified"><td class="diffline">28 </td><td class="diffpresent">Line<span class="dp">·</span>28</td><td class="diffline">28 </td><td class="diffpresent">Line<span class="dp">·</span>28</td></tr>
<tr class="diffunmodified"><td class="diffline">29 </td><td class="diffpresent">Line<span class="dp">·</span>29</td><td class="diffline">29 </td><td class="diffpresent">Line<span class="dp">·</span>29</td></tr>
<tr class="diffunmodified"><td class="diffline">30 </td><td class="diffpresent">Line<span class="dp">·</span>30</td><td class="diffline">30 </td><td class="diffpresent">Line<span class="dp">·</span>30</td></tr>
<tr class="diffunmodified"><td class="diffline">31 </td><td class="diffpresent">Line<span class="dp">·</span>31</td><td class="diffline">31 </td><td class="diffpresent">Line<span class="dp">·</span>31</td></tr>
<tr class="diffunmodified"><td class="diffline">32 </td><td class="diffpresent">Line<span class="dp">·</span>32</td><td class="diffline">32 </td><td class="diffpresent">Line<span class="dp">·</span>32</td></tr>
<tr class="diffunmodified"><td class="diffline">33 </td><td class="diffpresent">Line<span class="dp">·</span>33</td><td class="diffline">33 </td><td class="diffpresent">Line<span class="dp">·</span>33</td></tr>
<tr class="diffunmodified"><td class="diffline">34 </td><td class="diffpresent">Line<span class="dp">·</span>34</td><td class="diffline">34 </td><td class="diffpresent">Line<span class="dp">·</span>34</td></tr>
<tr class="diffchanged"><td class="diffline">35 </td><td class="diffpresent">Line<span class="dp">·</span>35</td><td class="diffline">35 </td><td class="diffpresent">Line<span class="dp">·</span>35<ins>b</ins></td></tr>
<tr class="diffunmodified"><td class="diffline">36 </td><td class="diffpresent">Line<span class="dp">·</span>36</td><td class="diffline">36 </td><td class="diffpresent">Line<span class="dp">·</span>36</td></tr>
<tr class="diffunmodified"><td class="diffline">37 </td><td class="diffpresent">Line<span class="dp">·</span>37</td><td class="diffline">37 </td><td class="diffpresent">Line<span class="dp">·</span>37</td></tr>
<tr class="diffunmodified"><td class="diffline">38 </td><td class="diffpresent">Line<span class="dp">·</span>38</td><td class="diffline">38 </td><td class="diffpresent">Line<span class="dp">·</span>38</td></tr>
<tr class="diffunmodified"><td class="diffline">39 </td><td class="diffpresent">Line<span class="dp">·</span>39</td><td class="diffline">39 </td><td class="diffpresent">Line<span class="dp">·</span>39</td></tr>
<tr class="diffunmodified"><td class="diffline">40 </td><td class="diffpresent">Line<span class="dp">·</span>40</td><td class="diffline">40 </td><td class="diffpresent">Line<span class="dp">·</span>40</td></tr>
<tr class="diffunmodified"><td class="diffline">41 </td><td class="diffpresent">Line<span class="dp">·</span>41</td><td class="diffline">41 </td><td class="diffpresent">Line<span class="dp">·</span>41</td></tr>
<tr class="diffunmodified"><td class="diffline">42 </td><td class="diffpresent">Line<span class="dp">·</span>42</td><td class="diffline">42 </td><td class="diffpresent">Line<span class="dp">·</span>42</td></tr>
</table></div>
{"diffoscope-json-version": 1, "source1": "myfile1", "source2": "myfile2", "unified_diff": "@@ -1,11 +1,11 @@\n Line 1\n Line 2\n Line 3\n-Line 4\n+Line 4b\n Line 5\n Line 6\n Line 7\n Line 8\n Line 9\n Line 10\n Line 11\n@@ -28,15 +28,15 @@\n Line 28\n Line 29\n Line 30\n Line 31\n Line 32\n Line 33\n Line 34\n-Line 35\n+Line 35b\n Line 36\n Line 37\n Line 38\n Line 39\n Line 40\n Line 41\n Line 42\n"}
......@@ -219,6 +219,25 @@ def test_html_presentation_issue_363(tmpdir, capsys):
assert extract_body(f.read()) == get_data("output_expected_363.html")
def test_html_presentation_issue_372(tmpdir, capsys):
filename = "salsa-issue-372.diff.json"
diff_data = get_data(filename)
diff_path = str(tmpdir.join(filename))
with open(diff_path, "w") as fp:
fp.write(diff_data)
report_path = str(tmpdir.join("report.html"))
out = run(
capsys,
"--html",
report_path,
f"--load-existing-diff={diff_path}",
)
assert out == ""
with open(report_path, "r", encoding="utf-8") as f:
assert extract_body(f.read()) == get_data("output_expected_372.html")
def test_limited_print():
def fake(x):
return None
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment