From a98c229bf64ac4de0e0ff8600c4c3775ce647f89 Mon Sep 17 00:00:00 2001
From: MoyuScript <i@moyu.moe>
Date: Sun, 11 Dec 2011 18:12:20 +0100
Subject: [PATCH] convert all tests to use tests/test.js
all tests now run from the source files directly instead of the built
verion in build/.
---
tests/background.html | 14 +-------------
tests/borders.html | 14 +-------------
tests/external-content.html | 13 ++-----------
tests/forms.html | 9 +--------
tests/images.html | 10 +++-------
tests/lists.html | 13 +++----------
tests/overflow.html | 11 +----------
tests/proxy.html | 11 +----------
tests/text-linethrough.html | 23 ++++++-----------------
tests/text-underline-lineheight.html | 16 +++-------------
tests/text-underline.html | 17 +++--------------
tests/text.html | 10 +---------
tests/visible-elements.html | 10 +---------
tests/z-index1.html | 13 +------------
tests/z-index2.html | 13 +------------
tests/z-index3.html | 13 +------------
16 files changed, 30 insertions(+), 180 deletions(-)
diff --git a/tests/background.html b/tests/background.html
index 165ef0a..5cb520c 100644
--- a/tests/background.html
+++ b/tests/background.html
@@ -8,19 +8,7 @@
<head>
<title>Background attribute tests</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
- <script type="text/javascript" src="../external/jquery-1.6.2.min.js"></script>
- <script type="text/javascript" src="../build/html2canvas.js"></script>
- <script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
- <script type="text/javascript">
- $(window).ready(function() {
-
- $('body').html2canvas({
- logging:true
- });
- });
- </script>
-
+ <script type="text/javascript" src="test.js"></script>
<style>
.small div{
diff --git a/tests/borders.html b/tests/borders.html
index f9aa961..262712a 100644
--- a/tests/borders.html
+++ b/tests/borders.html
@@ -9,19 +9,7 @@
<title>border tests</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link href="#" type="text/css" rel="stylesheet">
- <script type="text/javascript" src="../external/flashcanvas/flashcanvas.js"></script>
- <script type="text/javascript" src="../external/jquery-1.6.2.min.js"></script>
- <script type="text/javascript" src="../build/html2canvas.js"></script>
- <script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
- <script type="text/javascript">
- $(window).ready(function() {
-
- $('body').html2canvas({
- logging:true
- });
- });
- </script>
-
+ <script type="text/javascript" src="test.js"></script>
<style type="text/css">
div { font: 12px Arial; }
diff --git a/tests/external-content.html b/tests/external-content.html
index b6b7a02..62173f4 100644
--- a/tests/external-content.html
+++ b/tests/external-content.html
@@ -3,18 +3,9 @@
<head>
<title>External content tests</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <link href="#" type="text/css" rel="stylesheet">
-
- <script type="text/javascript" src="../external/jquery-1.6.2.js"></script>
- <script type="text/javascript" src="../build/html2canvas.js"></script>
- <script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
- <script type="text/javascript">
- $(window).ready(function() {
- $('body').html2canvas();
- });
- </script>
-
+ <link href="#" type="text/css" rel="stylesheet">
+ <script type="text/javascript" src="test.js"></script>
</head>
<body>
<h1>Iframe</h1>
diff --git a/tests/forms.html b/tests/forms.html
index 2963eb4..ad4497f 100644
--- a/tests/forms.html
+++ b/tests/forms.html
@@ -10,14 +10,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link href="#" type="text/css" rel="stylesheet">
- <script type="text/javascript" src="../external/jquery-1.6.2.min.js"></script>
- <script type="text/javascript" src="../build/html2canvas.js"></script>
- <script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
- <script type="text/javascript">
- $(window).ready(function() {
- $('body').html2canvas();
- });
- </script>
+ <script type="text/javascript" src="test.js"></script>
<style>
</style>
diff --git a/tests/images.html b/tests/images.html
index 82fd3dc..894e1a1 100644
--- a/tests/images.html
+++ b/tests/images.html
@@ -5,11 +5,9 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link href="#" type="text/css" rel="stylesheet">
- <script type="text/javascript" src="../external/jquery-1.6.2.min.js"></script>
- <script type="text/javascript" src="../build/html2canvas.js"></script>
- <script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
+ <script type="text/javascript" src="test.js"></script>
<script type="text/javascript">
- $(window).ready(function() {
+ function setUp() {
var ctx = $('#testcanvas')[0].getContext('2d');
ctx.fillStyle = "rgb(200,0,0)";
@@ -17,9 +15,7 @@
ctx.fillStyle = "rgba(0, 0, 200, 0.5)";
ctx.fillRect (30, 30, 55, 50);
-
- $('body').html2canvas();
- });
+ };
</script>
<style>
diff --git a/tests/lists.html b/tests/lists.html
index 4fdb9ce..2a0f871 100644
--- a/tests/lists.html
+++ b/tests/lists.html
@@ -8,22 +8,15 @@
<head>
<title>List tests</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
+ <script type="text/javascript" src="test.js"></script>
- <script type="text/javascript" src="../external/jquery-1.6.2.min.js"></script>
- <script type="text/javascript" src="../build/html2canvas.js"></script>
- <script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
<script type="text/javascript">
- $(window).ready(function() {
+ function setUp() {
var supportedTypes = ["decimal","decimal-leading-zero","upper-roman","lower-roman","lower-alpha","upper-alpha"];
for (var i = 1;i<=100;i++){
-
$('#dynamic').append($('<li />').text(i).css('list-style-type',supportedTypes[Math.round(Math.random()*supportedTypes.length)]));
}
-
-
- $('body').html2canvas();
- });
+ }
</script>
<style>
diff --git a/tests/overflow.html b/tests/overflow.html
index 63c700f..21b18fc 100644
--- a/tests/overflow.html
+++ b/tests/overflow.html
@@ -4,16 +4,7 @@
<title>Overflow tests</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link href="#" type="text/css" rel="stylesheet">
-
- <script type="text/javascript" src="../external/jquery-1.6.2.min.js"></script>
- <script type="text/javascript" src="../build/html2canvas.js"></script>
- <script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
- <script type="text/javascript">
- $(window).ready(function() {
- $('body').html2canvas({letterRendering:true});
- });
- </script>
-
+ <script type="text/javascript" src="test.js"></script>
<style>
.small{
font-size:14px;
diff --git a/tests/proxy.html b/tests/proxy.html
index db66c1c..c918e10 100644
--- a/tests/proxy.html
+++ b/tests/proxy.html
@@ -3,16 +3,7 @@
<head>
<title>External content tests</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-
- <script type="text/javascript" src="../external/jquery-1.6.2.js"></script>
- <script type="text/javascript" src="../build/html2canvas.js"></script>
- <script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
- <script type="text/javascript">
- $(window).ready(function() {
- $('body').html2canvas();
- });
- </script>
+ <script type="text/javascript" src="test.js"></script>
<base href="http://www.google.com/" />
</head>
diff --git a/tests/text-linethrough.html b/tests/text-linethrough.html
index 9703048..9326803 100644
--- a/tests/text-linethrough.html
+++ b/tests/text-linethrough.html
@@ -10,28 +10,17 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link href="#" type="text/css" rel="stylesheet">
- <script type="text/javascript" src="../external/jquery-1.6.2.min.js"></script>
- <script type="text/javascript" src="../build/html2canvas.js"></script>
- <script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
+ <script type="text/javascript" src="test.js"></script>
<script type="text/javascript">
- $(window).ready(function() {
+ function setUp() {
$('body').empty();
$.each(['arial','verdana','tahoma','courier new'],function(i,e){
-
var div = $('<div />').css('font-family',e).appendTo('body');
-
- for(var i=0;i<=20;i++){
- $('<div />').text('Testing texts').css('margin-top',1).css('border','1px solid black').css('font-size',(16+i*6)).appendTo(div);
- }
-
+ for(var i=0;i<=20;i++){
+ $('<div />').text('Testing texts').css('margin-top',1).css('border','1px solid black').css('font-size',(16+i*6)).appendTo(div);
+ }
});
-
-
- window.setTimeout(function(){
- $('body').html2canvas();
- },100);
-
- });
+ }
</script>
<style>
diff --git a/tests/text-underline-lineheight.html b/tests/text-underline-lineheight.html
index 4a4445c..ead7b5a 100644
--- a/tests/text-underline-lineheight.html
+++ b/tests/text-underline-lineheight.html
@@ -10,28 +10,18 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link href="#" type="text/css" rel="stylesheet">
- <script type="text/javascript" src="../external/jquery-1.6.2.min.js"></script>
- <script type="text/javascript" src="../build/html2canvas.js"></script>
- <script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
+ <script type="text/javascript" src="test.js"></script>
<script type="text/javascript">
- $(window).ready(function() {
+ function setUp() {
$('body').empty();
$.each(['arial','verdana','tahoma','courier new'],function(i,e){
-
var div = $('<div />').css('font-family',e).appendTo('body');
-
for(var i=0;i<=20;i++){
$('<div />').text('Testing texts').css('margin-top',1).css('border','1px solid black').css('font-size',(16+i*6)).appendTo(div);
}
});
-
-
-
- window.setTimeout(function(){
- $('body').html2canvas();
- },100);
- });
+ }
</script>
<style>
diff --git a/tests/text-underline.html b/tests/text-underline.html
index 5026861..530a569 100644
--- a/tests/text-underline.html
+++ b/tests/text-underline.html
@@ -10,29 +10,18 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link href="#" type="text/css" rel="stylesheet">
- <script type="text/javascript" src="../external/jquery-1.6.2.min.js"></script>
- <script type="text/javascript" src="../build/html2canvas.js"></script>
- <script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
+ <script type="text/javascript" src="test.js"></script>
<script type="text/javascript">
- $(window).ready(function() {
-
+ function setUp() {
$('body').empty();
$.each(['arial','verdana','tahoma','courier new'],function(i,e){
-
var div = $('<div />').css('font-family',e).appendTo('body');
-
for(var i=0;i<=20;i++){
$('<div />').text('Testing texts').css('margin-top',1).css('border','1px solid black').css('font-size',(16+i*6)).appendTo(div);
}
});
-
-
-
- window.setTimeout(function(){
- $('body').html2canvas();
- },100);
- });
+ }
</script>
<style>
diff --git a/tests/text.html b/tests/text.html
index 7b7f519..e4f83c9 100644
--- a/tests/text.html
+++ b/tests/text.html
@@ -10,15 +10,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link href="#" type="text/css" rel="stylesheet">
- <script type="text/javascript" src="../external/jquery-1.6.2.min.js"></script>
- <script type="text/javascript" src="../build/html2canvas.js"></script>
- <script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
- <script type="text/javascript">
- $(window).ready(function() {
- $('body').html2canvas();
- });
- </script>
-
+ <script type="text/javascript" src="test.js"></script>
<style>
.small{
font-size:14px;
diff --git a/tests/visible-elements.html b/tests/visible-elements.html
index 92212ff..90e5ca0 100644
--- a/tests/visible-elements.html
+++ b/tests/visible-elements.html
@@ -10,15 +10,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link href="#" type="text/css" rel="stylesheet">
- <script type="text/javascript" src="../external/jquery-1.6.2.min.js"></script>
- <script type="text/javascript" src="../build/html2canvas.js"></script>
- <script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
- <script type="text/javascript">
- $(window).ready(function() {
- new html2canvas($('body').get(0));
- });
- </script>
-
+ <script type="text/javascript" src="test.js"></script>
<style>
div{
border:2px solid black;
diff --git a/tests/z-index1.html b/tests/z-index1.html
index 2b26f75..ac00d78 100644
--- a/tests/z-index1.html
+++ b/tests/z-index1.html
@@ -9,18 +9,7 @@
<title>z-index tests #1</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link href="#" type="text/css" rel="stylesheet">
- <script type="text/javascript" src="../external/jquery-1.6.2.min.js"></script>
- <script type="text/javascript" src="../build/html2canvas.js?12"></script>
- <script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
- <script type="text/javascript">
- $(window).ready(function() {
-
- $('body').html2canvas({
- logging:true
- });
- });
- </script>
-
+ <script type="text/javascript" src="test.js"></script>
<style>
div { font: 12px Arial; }
diff --git a/tests/z-index2.html b/tests/z-index2.html
index 4bbb27e..0622d7b 100644
--- a/tests/z-index2.html
+++ b/tests/z-index2.html
@@ -9,18 +9,7 @@
<title>z-index tests #2</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link href="#" type="text/css" rel="stylesheet">
- <script type="text/javascript" src="../external/jquery-1.6.2.min.js"></script>
- <script type="text/javascript" src="../build/html2canvas.js"></script>
- <script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
- <script type="text/javascript">
- $(window).ready(function() {
-
- $('body').html2canvas({
- logging:true
- });
- });
- </script>
-
+ <script type="text/javascript" src="test.js"></script>
<style type="text/css">
div { font: 12px Arial; }
diff --git a/tests/z-index3.html b/tests/z-index3.html
index dcce378..b9189bc 100644
--- a/tests/z-index3.html
+++ b/tests/z-index3.html
@@ -9,18 +9,7 @@
<title>z-index tests #3</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link href="#" type="text/css" rel="stylesheet">
- <script type="text/javascript" src="../external/jquery-1.6.2.min.js"></script>
- <script type="text/javascript" src="../build/html2canvas.js"></script>
- <script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
- <script type="text/javascript">
- $(window).ready(function() {
-
- $('body').html2canvas({
- logging:true
- });
- });
- </script>
-
+ <script type="text/javascript" src="test.js"></script>
<style type="text/css">
div { font: 12px Arial; }