Skip to content

Commit 019fdfa

Browse files
dencodenco
committed
fix tests
1 parent cd2e032 commit 019fdfa

File tree

7 files changed

+231
-132
lines changed

7 files changed

+231
-132
lines changed

‎src/test/suite/fixtures/expected/issues.html‎

Lines changed: 64 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,21 @@ <h1>
2323
<h4>Table without heading</h4>
2424
</p>
2525
<p>
26-
<tr>
27-
<table>
28-
<td>test</td>
29-
<td>test</td>
30-
</tr>
31-
</p>
32-
<p>
33-
<tr>
34-
<td>simple table</td>
35-
<td>two</td>
36-
</tr>
37-
</p>
38-
<p></table>
26+
<table>
27+
<tbody>
28+
<tr>
29+
<td>test</td>
30+
<td>test</td>
31+
</tr>
32+
</p>
33+
<p>
34+
<tr>
35+
<td>simple table</td>
36+
<td>two</td>
37+
</tr>
38+
</p>
39+
<p></tbody>
40+
</table>
3941
</p>
4042
<p>
4143
<a href='https://github.com/denco/vscode-confluence-markup/issues/6'>#6</a>: Intenting</p>
@@ -224,4 +226,52 @@ <h3>third header</h3>
224226
<p>h244000c8</p>
225227
<p>
226228
<code style='font-family: Menlo, Monaco, Consolas, monospace'>monospace</code>
227-
</p>
229+
</p>
230+
<p>
231+
<a href='https://github.com/denco/vscode-confluence-markup/issues/37'>#37</a>move out of preview</p>
232+
<p>move out of preview, and bump to version: 1.0.0</p>
233+
<p>
234+
<a href='https://github.com/denco/vscode-confluence-markup/issues/38'>#38</a>Preview is not working using links inside a table</p>
235+
<p>
236+
<table>
237+
<tbody>
238+
<tr>
239+
<th>heading 1</th>
240+
<th>heading 2</th>
241+
<th>heading 3</th>
242+
</tr>
243+
</p>
244+
<p>
245+
<tr>
246+
<td>cell A1</td>
247+
<td>cell A2</td>
248+
<td>cell A3</td>
249+
</tr>
250+
</p>
251+
<p>
252+
<tr>
253+
<td>cell B1</td>
254+
<td>cell B2</td>
255+
<td>cell B3</td>
256+
</tr>
257+
</p>
258+
<p>
259+
<tr>
260+
<td>
261+
<a href='www.example.com'>example</a>
262+
</td>
263+
<td>
264+
<a href='www.google.com'>google</a>
265+
</td>
266+
<td>
267+
<a href='https://code.visualstudio.com/'>vscode</a>
268+
</td>
269+
</tr>
270+
</p>
271+
<p></tbody>
272+
</table>
273+
</p>
274+
<p>
275+
<a href='https://github.com/denco/vscode-confluence-markup/issues/39'>#39</a>Local image preview</p>
276+
<p>
277+
<img src="vscode-resource:_TEST_EXTENSION_PATH_PLACEHOLDER_/src/test/suite/fixtures/testfiles/media/testing_cat.gif"/></p>

‎src/test/suite/fixtures/expected/scoped/tables.html‎

Lines changed: 108 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -3,115 +3,131 @@ <h1>Tables</h1>
33
</p>
44
<p>
55
<h2>Column heading</h2>
6-
</p>
7-
<p>
8-
<tr>
9-
<table>
10-
<th>header c1</th>
11-
<th>header c2</th>
12-
</tr>
136
</p>
147
<p>
15-
<tr>
16-
<td>data 1.1</td>
17-
<td>data 1.2</td>
18-
</tr>
8+
<table>
9+
<tbody>
10+
<tr>
11+
<th>header c1</th>
12+
<th>header c2</th>
13+
</tr>
14+
</p>
15+
<p>
16+
<tr>
17+
<td>data 1.1</td>
18+
<td>data 1.2</td>
19+
</tr>
20+
</p>
21+
<p>
22+
<tr>
23+
<td>data 2.1</td>
24+
<td>data 2.2</td>
25+
</tr>
26+
</p>
27+
<p></tbody>
28+
</table>
1929
</p>
2030
<p>
21-
<tr>
22-
<td>data 2.1</td>
23-
<td>data 2.2</td>
24-
</tr>
25-
</p>
26-
<p></table>
27-
</p>
28-
<p>
2931
<h2>Row heading</h2>
3032
</p>
3133
<p>
32-
<tr>
33-
<table>
34-
<th>header r1</td>
35-
<td>data 1.1</td>
36-
<td>data 1.2</tr>
34+
<table>
35+
<tbody>
36+
<tr>
37+
<th>header r1</th>
38+
<td>data 1.1</td>
39+
<td>data 1.2</td>
40+
</tr>
3741
</p>
3842
<p>
3943
<tr>
40-
<th>header r2</td>
44+
<th>header r2</th>
4145
<td>data 2.1</td>
42-
<td>data 2.2</tr>
43-
</p>
44-
<p>
45-
<tr>
46-
<th>header r3</td>
47-
<td>data 3.1</td>
48-
<td>data 3.2</tr>
46+
<td>data 2.2</td>
47+
</tr>
48+
</p>
49+
<p>
50+
<tr>
51+
<th>header r3</th>
52+
<td>data 3.1</td>
53+
<td>data 3.2</td>
54+
</tr>
55+
</p>
56+
<p></tbody>
57+
</table>
58+
</p>
59+
<p>
60+
<h2>Column and row heading</h2>
4961
</p>
50-
<p></table>
51-
</p>
52-
<p>
53-
<h2>Column and row heading</h2>
54-
</p>
55-
<p>
56-
<tr>
57-
<table>
58-
<th></th>
59-
<th>header c1</th>
60-
<th>header c2</tr>
61-
</p>
62-
<p>
63-
<tr>
64-
<th>header r1</td>
65-
<td>data 1.1</td>
66-
<td>data 1.2</td>
67-
</tr>
68-
</p>
69-
<p>
70-
<tr>
71-
<th>header r2</td>
72-
<td>data 2.1</td>
73-
<td>data 2.2</td>
74-
</tr>
75-
</p>
76-
<p></table>
62+
<p>
63+
<table>
64+
<tbody>
65+
<tr>
66+
<th></th>
67+
<th>header c1</th>
68+
<th>header c2</th>
69+
</tr>
70+
</p>
71+
<p>
72+
<tr>
73+
<th>header r1</th>
74+
<td>data 1.1</td>
75+
<td>data 1.2</td>
76+
</tr>
77+
</p>
78+
<p>
79+
<tr>
80+
<th>header r2</th>
81+
<td>data 2.1</td>
82+
<td>data 2.2</td>
83+
</tr>
84+
</p>
85+
<p></tbody>
86+
</table>
7787
</p>
7888
<p>
79-
<h2>Without heading</h2>
89+
<h2>Without heading</h2>
8090
</p>
8191
<p>
82-
<tr>
83-
<table>
84-
<td>data 1.1</td>
85-
<td>data 1.2</td>
86-
</tr>
87-
</p>
88-
<p>
89-
<tr>
90-
<td>data 2.1</td>
91-
<td>data 2.2</td>
92-
</tr>
93-
</p>
94-
<p></table>
92+
<table>
93+
<tbody>
94+
<tr>
95+
<td>data 1.1</td>
96+
<td>data 1.2</td>
97+
</tr>
98+
</p>
99+
<p>
100+
<tr>
101+
<td>data 2.1</td>
102+
<td>data 2.2</td>
103+
</tr>
104+
</p>
105+
<p></tbody>
106+
</table>
95107
</p>
96108
<p>
97-
<h2>Table with nested macros (not supported yet)</h2>
109+
<h2>Table with nested macros (not supported yet)</h2>
98110
</p>
99111
<p>
100-
<tr>
101-
<table>
102-
<th>Heading 1</th>
103-
<th>Heading 2</th>
104-
</tr>
105-
</p>
106-
<p>
107-
<tr>
108-
<td>
109-
<strong>Item 1
110-
<br/>
111-
</strong>Item 2
112-
<br/>* Item 3</td>
113-
<td># Item 1
114-
<br/># Item 2
115-
<br/># Item 3</td>
116-
</tr>
117-
</p>
112+
<table>
113+
<tbody>
114+
<tr>
115+
<th>Heading 1</th>
116+
<th>Heading 2</th>
117+
</tr>
118+
</p>
119+
<p>
120+
<tr>
121+
<td>
122+
<strong>Item 1
123+
<br/>
124+
</strong>Item 2
125+
<br/>* Item 3</td>
126+
<td># Item 1
127+
<br/># Item 2
128+
<br/># Item 3</td>
129+
</tr>
130+
</p>
131+
<p></tbody>
132+
</table>
133+
</p>

‎src/test/suite/fixtures/expected/test.html‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -224,28 +224,31 @@ <h2>
224224
</h2>
225225
</p>
226226
<p>
227-
<tr>
228-
<table>
229-
<th>heading 1</th>
230-
<th>heading 2</th>
231-
<th>heading 3</th>
232-
</tr>
233-
</p>
234-
<p>
235-
<tr>
236-
<td>cell A1</td>
237-
<td>cell A2</td>
238-
<td>cell A3</td>
239-
</tr>
240-
</p>
241-
<p>
242-
<tr>
243-
<td>cell B1</td>
244-
<td>cell B2</td>
245-
<td>cell B3</td>
246-
</tr>
247-
</p>
248-
<p></table>
227+
<table>
228+
<tbody>
229+
<tr>
230+
<th>heading 1</th>
231+
<th>heading 2</th>
232+
<th>heading 3</th>
233+
</tr>
234+
</p>
235+
<p>
236+
<tr>
237+
<td>cell A1</td>
238+
<td>cell A2</td>
239+
<td>cell A3</td>
240+
</tr>
241+
</p>
242+
<p>
243+
<tr>
244+
<td>cell B1</td>
245+
<td>cell B2</td>
246+
<td>cell B3</td>
247+
</tr>
248+
</p>
249+
<p>
250+
</tbody>
251+
</table>
249252
</p>
250253
<p>
251254
<hr /></p>

‎src/test/suite/fixtures/testfiles/nix/issues.confluence‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,19 @@ yet _another_ line
109109

110110
h244000c8
111111

112-
{{monospace}}
112+
{{monospace}}
113+
114+
[#37|https://github.com/denco/vscode-confluence-markup/issues/37] move out of preview
115+
116+
move out of preview, and bump to version: 1.0.0
117+
118+
[#38|https://github.com/denco/vscode-confluence-markup/issues/38] Preview is not working using links inside a table
119+
120+
||heading 1||heading 2||heading 3
121+
|cell A1|cell A2|cell A3
122+
|cell B1|cell B2|cell B3
123+
|[example|www.example.com]|[google|www.google.com]|[vscode|https://code.visualstudio.com/]
124+
125+
[#39|https://github.com/denco/vscode-confluence-markup/issues/39] Local image preview
126+
127+
!../media/testing_cat.gif!

‎src/test/suite/fixtures/testfiles/nix/scoped/tables.confluence‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ h2. Without heading
2626
h2. Table with nested macros (not supported yet)
2727

2828
||Heading 1||Heading 2||
29-
|* Item 1\\* Item 2\\* Item 3|# Item 1 \\# Item 2\\# Item 3|
29+
|* Item 1\\* Item 2\\* Item 3|# Item 1 \\# Item 2\\# Item 3|

0 commit comments

Comments
 (0)