Skip to content

Commit 4dba62e

Browse files
cobexercobexer
committed
convert all tests to use tests/test.js
all tests now run from the source files directly instead of the built verion in build/.
1 parent 2e494bd commit 4dba62e

16 files changed

Lines changed: 30 additions & 180 deletions

‎tests/background.html‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,7 @@
88
<head>
99
<title>Background attribute tests</title>
1010
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
11-
12-
<script type="text/javascript" src="../external/jquery-1.6.2.min.js"></script>
13-
<script type="text/javascript" src="../build/html2canvas.js"></script>
14-
<script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
15-
<script type="text/javascript">
16-
$(window).ready(function() {
17-
18-
$('body').html2canvas({
19-
logging:true
20-
});
21-
});
22-
</script>
23-
11+
<script type="text/javascript" src="test.js"></script>
2412
<style>
2513

2614
.small div{

‎tests/borders.html‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,7 @@
99
<title>border tests</title>
1010
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
1111
<link href="#" type="text/css" rel="stylesheet">
12-
<script type="text/javascript" src="../external/flashcanvas/flashcanvas.js"></script>
13-
<script type="text/javascript" src="../external/jquery-1.6.2.min.js"></script>
14-
<script type="text/javascript" src="../build/html2canvas.js"></script>
15-
<script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
16-
<script type="text/javascript">
17-
$(window).ready(function() {
18-
19-
$('body').html2canvas({
20-
logging:true
21-
});
22-
});
23-
</script>
24-
12+
<script type="text/javascript" src="test.js"></script>
2513
<style type="text/css">
2614

2715
div { font: 12px Arial; }

‎tests/external-content.html‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,9 @@
33
<head>
44
<title>External content tests</title>
55
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
6-
<link href="#" type="text/css" rel="stylesheet">
7-
8-
<script type="text/javascript" src="../external/jquery-1.6.2.js"></script>
9-
<script type="text/javascript" src="../build/html2canvas.js"></script>
10-
<script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
11-
<script type="text/javascript">
12-
$(window).ready(function() {
13-
$('body').html2canvas();
14-
});
15-
</script>
16-
6+
<link href="#" type="text/css" rel="stylesheet">
177

8+
<script type="text/javascript" src="test.js"></script>
189
</head>
1910
<body>
2011
<h1>Iframe</h1>

‎tests/forms.html‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,7 @@
1010
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
1111
<link href="#" type="text/css" rel="stylesheet">
1212

13-
<script type="text/javascript" src="../external/jquery-1.6.2.min.js"></script>
14-
<script type="text/javascript" src="../build/html2canvas.js"></script>
15-
<script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
16-
<script type="text/javascript">
17-
$(window).ready(function() {
18-
$('body').html2canvas();
19-
});
20-
</script>
13+
<script type="text/javascript" src="test.js"></script>
2114
<style>
2215

2316
</style>

‎tests/images.html‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,17 @@
55
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
66
<link href="#" type="text/css" rel="stylesheet">
77

8-
<script type="text/javascript" src="../external/jquery-1.6.2.min.js"></script>
9-
<script type="text/javascript" src="../build/html2canvas.js"></script>
10-
<script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
8+
<script type="text/javascript" src="test.js"></script>
119
<script type="text/javascript">
12-
$(window).ready(function() {
10+
function setUp() {
1311
var ctx = $('#testcanvas')[0].getContext('2d');
1412

1513
ctx.fillStyle = "rgb(200,0,0)";
1614
ctx.fillRect (10, 10, 55, 50);
1715

1816
ctx.fillStyle = "rgba(0, 0, 200, 0.5)";
1917
ctx.fillRect (30, 30, 55, 50);
20-
21-
$('body').html2canvas();
22-
});
18+
};
2319
</script>
2420

2521
<style>

‎tests/lists.html‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,15 @@
88
<head>
99
<title>List tests</title>
1010
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
11-
11+
<script type="text/javascript" src="test.js"></script>
1212

13-
<script type="text/javascript" src="../external/jquery-1.6.2.min.js"></script>
14-
<script type="text/javascript" src="../build/html2canvas.js"></script>
15-
<script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
1613
<script type="text/javascript">
17-
$(window).ready(function() {
14+
function setUp() {
1815
var supportedTypes = ["decimal","decimal-leading-zero","upper-roman","lower-roman","lower-alpha","upper-alpha"];
1916
for (var i = 1;i<=100;i++){
20-
2117
$('#dynamic').append($('<li />').text(i).css('list-style-type',supportedTypes[Math.round(Math.random()*supportedTypes.length)]));
2218
}
23-
24-
25-
$('body').html2canvas();
26-
});
19+
}
2720
</script>
2821

2922
<style>

‎tests/overflow.html‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,7 @@
44
<title>Overflow tests</title>
55
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
66
<link href="#" type="text/css" rel="stylesheet">
7-
8-
<script type="text/javascript" src="../external/jquery-1.6.2.min.js"></script>
9-
<script type="text/javascript" src="../build/html2canvas.js"></script>
10-
<script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
11-
<script type="text/javascript">
12-
$(window).ready(function() {
13-
$('body').html2canvas({letterRendering:true});
14-
});
15-
</script>
16-
7+
<script type="text/javascript" src="test.js"></script>
178
<style>
189
.small{
1910
font-size:14px;

‎tests/proxy.html‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,7 @@
33
<head>
44
<title>External content tests</title>
55
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
6-
7-
8-
<script type="text/javascript" src="../external/jquery-1.6.2.js"></script>
9-
<script type="text/javascript" src="../build/html2canvas.js"></script>
10-
<script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
11-
<script type="text/javascript">
12-
$(window).ready(function() {
13-
$('body').html2canvas();
14-
});
15-
</script>
6+
<script type="text/javascript" src="test.js"></script>
167

178
<base href="http://www.google.com/" />
189
</head>

‎tests/text-linethrough.html‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,17 @@
1010
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
1111
<link href="#" type="text/css" rel="stylesheet">
1212

13-
<script type="text/javascript" src="../external/jquery-1.6.2.min.js"></script>
14-
<script type="text/javascript" src="../build/html2canvas.js"></script>
15-
<script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
13+
<script type="text/javascript" src="test.js"></script>
1614
<script type="text/javascript">
17-
$(window).ready(function() {
15+
function setUp() {
1816
$('body').empty();
1917
$.each(['arial','verdana','tahoma','courier new'],function(i,e){
20-
2118
var div = $('<div />').css('font-family',e).appendTo('body');
22-
23-
for(var i=0;i<=20;i++){
24-
$('<div />').text('Testing texts').css('margin-top',1).css('border','1px solid black').css('font-size',(16+i*6)).appendTo(div);
25-
}
26-
19+
for(var i=0;i<=20;i++){
20+
$('<div />').text('Testing texts').css('margin-top',1).css('border','1px solid black').css('font-size',(16+i*6)).appendTo(div);
21+
}
2722
});
28-
29-
30-
window.setTimeout(function(){
31-
$('body').html2canvas();
32-
},100);
33-
34-
});
23+
}
3524
</script>
3625

3726
<style>

‎tests/text-underline-lineheight.html‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,18 @@
1010
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
1111
<link href="#" type="text/css" rel="stylesheet">
1212

13-
<script type="text/javascript" src="../external/jquery-1.6.2.min.js"></script>
14-
<script type="text/javascript" src="../build/html2canvas.js"></script>
15-
<script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
13+
<script type="text/javascript" src="test.js"></script>
1614
<script type="text/javascript">
17-
$(window).ready(function() {
15+
function setUp() {
1816
$('body').empty();
1917
$.each(['arial','verdana','tahoma','courier new'],function(i,e){
20-
2118
var div = $('<div />').css('font-family',e).appendTo('body');
22-
2319
for(var i=0;i<=20;i++){
2420
$('<div />').text('Testing texts').css('margin-top',1).css('border','1px solid black').css('font-size',(16+i*6)).appendTo(div);
2521
}
2622

2723
});
28-
29-
30-
31-
window.setTimeout(function(){
32-
$('body').html2canvas();
33-
},100);
34-
});
24+
}
3525
</script>
3626

3727
<style>

0 commit comments

Comments
 (0)