Skip to content

Commit 99bc3b4

Browse files
s-ludwigs-ludwig
authored
Merge pull request #175 from MartinNowak/test_cases
run integration tests
2 parents 8a42071 + 384adf2 commit 99bc3b4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+3051
-2179
lines changed

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@
44
node_modules
55
test/screenshots/*.diff.png
66
test/screenshots/*.fail.png
7+
tests/*/test.json
8+
tests/*/__dummy.html
9+
tests/*/docs/file_hashes.json
10+
tests/timestamp/docs/

‎.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
language: d
2-
sudo: false
2+
services:
3+
- docker
34
addons:
45
apt:
56
packages:

‎test/screenshots/class_main_contents.png

-57.1 KB
Loading

‎test/screenshots/code_example.png

-38.9 KB
Loading

‎test/screenshots/declaration_prototype.png

-10.7 KB
Loading

‎test/screenshots/function_parameters.png

-7.2 KB
Loading

‎test/test.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
var fs = require('fs'),
2+
system = require('system'),
23
phantomcss = require(fs.workingDirectory + '/node_modules/phantomcss/phantomcss.js');
34

5+
var listen_addr = system.env['LISTEN_ADDR'];
6+
47
casper.test.begin('ddox visual test', function(test) {
58
var options = {
69
rebase: casper.cli.get( "rebase" ),
@@ -15,7 +18,7 @@ casper.test.begin('ddox visual test', function(test) {
1518
var tests = ['declaration_prototype', 'function_parameters', 'code_example', 'class_main_contents'];
1619

1720
casper
18-
.start('http://localhost:8080/vibe.web.rest/registerRestInterface')
21+
.start(listen_addr + '/vibe.web.rest/registerRestInterface')
1922
.viewport(1024, 768)
2023
.then(function() {
2124
phantomcss.screenshot('#main-contents > div:nth-child(3)', tests[0]);
@@ -26,7 +29,7 @@ casper.test.begin('ddox visual test', function(test) {
2629
.then(function() {
2730
phantomcss.screenshot('#main-contents > section:nth-child(7)', tests[2]);
2831
})
29-
.thenOpen('http://localhost:8080/vibe.web.rest/RestInterfaceClient')
32+
.thenOpen(listen_addr + '/vibe.web.rest/RestInterfaceClient')
3033
.then(function() {
3134
phantomcss.screenshot('#main-contents', tests[3]);
3235
});

‎tests/issue110_xref_to_package_d/docs/index.html

Lines changed: 39 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,80 +5,75 @@
55
<title>API documentation</title>
66
<link rel="stylesheet" type="text/css" href="./styles/ddox.css"/>
77
<link rel="stylesheet" href="./prettify/prettify.css" type="text/css"/>
8-
<script type="text/javascript" src="./scripts/jquery.js">/**/</script>
9-
<script type="text/javascript" src="./prettify/prettify.js">/**/</script>
10-
<script type="text/javascript" src="./scripts/ddox.js">/**/</script>
8+
<script type="text/javascript" src="./scripts/jquery.js">/**/</script><script type="text/javascript" src="./scripts/ddox.js">/**/</script>
119
</head>
12-
<body onload="prettyPrint(); setupDdox();">
10+
<body onload="setupDdox();">
1311
<nav id="main-nav">
14-
<ul>
15-
<li>
16-
<a href="./mod/pack.html">mod.pack</a>
17-
</li>
18-
<li>
19-
<a href="./mod.html">mod</a>
20-
</li>
21-
<li>
22-
<a href="./test.html">test</a>
23-
</li>
24-
</ul>
25-
<noscript>
26-
<p style="color: red">The search functionality needs JavaScript enabled</p>
27-
</noscript>
28-
<div id="symbolSearchPane" style="display: none">
29-
<p>
30-
<input id="symbolSearch" type="text" placeholder="Search for symbols" onchange="performSymbolSearch(24);" onkeypress="this.onchange();" onpaste="this.onchange();" oninput="this.onchange();"/>
31-
</p>
32-
<ul id="symbolSearchResults" style="display: none"></ul>
33-
<script type="application/javascript" src="./symbols.js"></script>
34-
<script type="application/javascript">
35-
var symbolSearchRootDir = "./";
36-
$('#symbolSearchPane').show();
37-
</script>
38-
</div>
12+
<noscript>
13+
<p style="color: red">The search functionality needs JavaScript enabled</p>
14+
</noscript>
15+
<div id="symbolSearchPane" style="display: none">
16+
<form action="#" method="GET">
17+
<input id="symbolSearch" type="text" name="q" placeholder="Search for symbols" autocomplete="off" onchange="performSymbolSearch(40);" onkeypress="this.onchange();" onpaste="this.onchange();" oninput="this.onchange();"/>
18+
</form>
19+
<ul id="symbolSearchResults" class="symbolList" style="display: none"></ul><script type="application/javascript" src="./symbols.js"></script><script type="application/javascript">var symbolSearchRootDir = "./";
20+
$('#symbolSearchPane').show();</script>
21+
</div>
22+
<ul class="tree-view">
23+
<li class="tree-view ">
24+
<div class="package ">
25+
<a href="./mod.html">mod</a>
26+
</div>
27+
<ul class="tree-view">
28+
<li>
29+
<div class="module ">
30+
<a href="./mod/foo.html">foo</a>
31+
</div>
32+
</li>
33+
</ul>
34+
</li>
35+
<li>
36+
<div class="module ">
37+
<a href="./test.html">test</a>
38+
</div>
39+
</li>
40+
</ul>
3941
</nav>
4042
<div id="main-contents">
4143
<h1>API documentation</h1>
4244
<table>
4345
<col class="caption"/>
4446
<tr>
45-
<th>Module</th>
46-
<th>Description</th>
47+
<th>Module</th><th>Description</th>
4748
</tr>
4849
<tr>
4950
<td>
50-
<a href="./mod/pack.html">mod.pack</a>
51+
<a href="./mod/foo.html">mod.foo</a>
5152
</td>
5253
<td>
53-
54+
5455
</td>
5556
</tr>
5657
<tr>
5758
<td>
5859
<a href="./mod.html">mod</a>
5960
</td>
6061
<td>
61-
62+
6263
</td>
6364
</tr>
6465
<tr>
6566
<td>
6667
<a href="./test.html">test</a>
6768
</td>
6869
<td>
69-
70+
7071
</td>
7172
</tr>
7273
</table>
73-
<section>
74-
<h2>Authors</h2>
75-
</section>
76-
<section>
77-
<h2>Copyright</h2>
78-
</section>
79-
<section>
80-
<h2>License</h2>
81-
</section>
74+
<footer>
75+
<p class="faint">Generated using the DDOX documentation generator</p>
76+
</footer>
8277
</div>
8378
</body>
8479
</html>

‎tests/issue110_xref_to_package_d/docs/mod.html

Lines changed: 55 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,55 +5,66 @@
55
<title>Module mod</title>
66
<link rel="stylesheet" type="text/css" href="./styles/ddox.css"/>
77
<link rel="stylesheet" href="./prettify/prettify.css" type="text/css"/>
8-
<script type="text/javascript" src="./scripts/jquery.js">/**/</script>
9-
<script type="text/javascript" src="./prettify/prettify.js">/**/</script>
10-
<script type="text/javascript" src="./scripts/ddox.js">/**/</script>
8+
<script type="text/javascript" src="./scripts/jquery.js">/**/</script><script type="text/javascript" src="./scripts/ddox.js">/**/</script>
119
</head>
12-
<body onload="prettyPrint(); setupDdox();">
10+
<body onload="setupDdox();">
1311
<nav id="main-nav">
14-
<ul>
15-
<li>
16-
<a href="./mod/pack.html">mod.pack</a>
17-
</li>
18-
<li>
19-
<a href="./mod.html">mod</a>
20-
</li>
21-
<li>
22-
<a href="./test.html">test</a>
23-
</li>
24-
</ul>
25-
<noscript>
26-
<p style="color: red">The search functionality needs JavaScript enabled</p>
27-
</noscript>
28-
<div id="symbolSearchPane" style="display: none">
29-
<p>
30-
<input id="symbolSearch" type="text" placeholder="Search for symbols" onchange="performSymbolSearch(24);" onkeypress="this.onchange();" onpaste="this.onchange();" oninput="this.onchange();"/>
31-
</p>
32-
<ul id="symbolSearchResults" style="display: none"></ul>
33-
<script type="application/javascript" src="./symbols.js"></script>
34-
<script type="application/javascript">
35-
var symbolSearchRootDir = "./";
36-
$('#symbolSearchPane').show();
37-
</script>
38-
</div>
12+
<noscript>
13+
<p style="color: red">The search functionality needs JavaScript enabled</p>
14+
</noscript>
15+
<div id="symbolSearchPane" style="display: none">
16+
<form action="#" method="GET">
17+
<input id="symbolSearch" type="text" name="q" placeholder="Search for symbols" autocomplete="off" onchange="performSymbolSearch(40);" onkeypress="this.onchange();" onpaste="this.onchange();" oninput="this.onchange();"/>
18+
</form>
19+
<ul id="symbolSearchResults" class="symbolList" style="display: none"></ul><script type="application/javascript" src="./symbols.js"></script><script type="application/javascript">var symbolSearchRootDir = "./";
20+
$('#symbolSearchPane').show();</script>
21+
</div>
22+
<ul class="tree-view">
23+
<li class="tree-view ">
24+
<div class="package selected">
25+
<a href="./mod.html">mod</a>
26+
</div>
27+
<ul class="tree-view">
28+
<li>
29+
<div class="module ">
30+
<a href="./mod/foo.html">foo</a>
31+
</div>
32+
</li>
33+
</ul>
34+
</li>
35+
<li>
36+
<div class="module ">
37+
<a href="./test.html">test</a>
38+
</div>
39+
</li>
40+
</ul>
3941
</nav>
4042
<div id="main-contents">
41-
<h1>Module mod</h1>
42-
<p></p>
43-
43+
<h1>Module mod</h1><p></p>
4444
<section></section>
45-
<section>
46-
<h2>Authors</h2>
47-
48-
</section>
49-
<section>
50-
<h2>Copyright</h2>
51-
52-
</section>
53-
<section>
54-
<h2>License</h2>
55-
56-
</section>
45+
<footer>
46+
<table class="license-info">
47+
<tr>
48+
<th>Authors</th>
49+
<td>
50+
51+
</td>
52+
</tr>
53+
<tr>
54+
<th>Copyright</th>
55+
<td>
56+
57+
</td>
58+
</tr>
59+
<tr>
60+
<th>License</th>
61+
<td>
62+
63+
</td>
64+
</tr>
65+
</table>
66+
<p class="faint">Generated using the DDOX documentation generator</p>
67+
</footer>
5768
</div>
5869
</body>
5970
</html>

‎tests/issue110_xref_to_package_d/docs/mod/foo.html

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="UTF-8"/>
5+
<title>Module mod.foo</title>
6+
<link rel="stylesheet" type="text/css" href="../styles/ddox.css"/>
7+
<link rel="stylesheet" href="../prettify/prettify.css" type="text/css"/>
8+
<script type="text/javascript" src="../scripts/jquery.js">/**/</script><script type="text/javascript" src="../scripts/ddox.js">/**/</script>
9+
</head>
10+
<body onload="setupDdox();">
11+
<nav id="main-nav">
12+
<noscript>
13+
<p style="color: red">The search functionality needs JavaScript enabled</p>
14+
</noscript>
15+
<div id="symbolSearchPane" style="display: none">
16+
<form action="#" method="GET">
17+
<input id="symbolSearch" type="text" name="q" placeholder="Search for symbols" autocomplete="off" onchange="performSymbolSearch(40);" onkeypress="this.onchange();" onpaste="this.onchange();" oninput="this.onchange();"/>
18+
</form>
19+
<ul id="symbolSearchResults" class="symbolList" style="display: none"></ul><script type="application/javascript" src="../symbols.js"></script><script type="application/javascript">var symbolSearchRootDir = "../";
20+
$('#symbolSearchPane').show();</script>
21+
</div>
22+
<ul class="tree-view">
23+
<li class="tree-view ">
24+
<div class="package ">
25+
<a href="../mod.html">mod</a>
26+
</div>
27+
<ul class="tree-view">
28+
<li>
29+
<div class="module selected">
30+
<a href="../mod/foo.html">foo</a>
31+
</div>
32+
</li>
33+
</ul>
34+
</li>
35+
<li>
36+
<div class="module ">
37+
<a href="../test.html">test</a>
38+
</div>
39+
</li>
40+
</ul>
41+
</nav>
42+
<div id="main-contents">
43+
<h1>Module mod.foo</h1><p></p>
44+
<section></section>
45+
<footer>
46+
<table class="license-info">
47+
<tr>
48+
<th>Authors</th>
49+
<td>
50+
51+
</td>
52+
</tr>
53+
<tr>
54+
<th>Copyright</th>
55+
<td>
56+
57+
</td>
58+
</tr>
59+
<tr>
60+
<th>License</th>
61+
<td>
62+
63+
</td>
64+
</tr>
65+
</table>
66+
<p class="faint">Generated using the DDOX documentation generator</p>
67+
</footer>
68+
</div>
69+
</body>
70+
</html>

0 commit comments

Comments
 (0)