diff options
| author | Nick White <git@njw.me.uk> | 2010-11-15 00:24:46 +0000 |
|---|---|---|
| committer | Nick White <git@njw.me.uk> | 2010-11-15 00:24:46 +0000 |
| commit | cba8e7d8f263c6b5ac456a5f2a626e2e1b06fc63 (patch) | |
| tree | 85641aecb434dca168d2719add4e1d7dfaedb4b2 /tests | |
| parent | 68eb363dc0c535a309f2ae533cedf27b92f6cd8e (diff) | |
Use more reliable test js bug workaround
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/html/wikireading.html.simple | 2 | ||||
| -rw-r--r-- | tests/showsimple.js | 4 | ||||
| -rwxr-xr-x | tests/webkittest.sh | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/tests/html/wikireading.html.simple b/tests/html/wikireading.html.simple index ccd89ef..1aa37d1 100644 --- a/tests/html/wikireading.html.simple +++ b/tests/html/wikireading.html.simple @@ -2,8 +2,6 @@ - - <div style="width:38em; margin:auto; text-align:justify; font-family:sans;"><h1 style="text-align: center">Slow reading - Wikipedia, the free encyclopedia</h1> <!-- tagline --> <div id="siteSub">From Wikipedia, the free encyclopedia</div> diff --git a/tests/showsimple.js b/tests/showsimple.js index 86dfbe7..8339956 100644 --- a/tests/showsimple.js +++ b/tests/showsimple.js @@ -1,8 +1,4 @@ (function() { - stag = document.createElement("script"); - stag.src="file://./simplyread.js"; - document.body.appendChild(stag); - window.alert('Click me quick'); // this seems to make simplyread.js register.. simplyread(); console.log(document.body.innerHTML); })(); diff --git a/tests/webkittest.sh b/tests/webkittest.sh index 412474b..71b87f1 100755 --- a/tests/webkittest.sh +++ b/tests/webkittest.sh @@ -8,6 +8,13 @@ test $# -ne 2 && echo usage $0 testhtml expectedoutput && exit 1 testjs=tests/showsimple.js htmlloadtime=2 scriptloadtime=3 +scriptjs=$HOME/.surf/script.js + +touch $scriptjs +test $scriptjs && mv $scriptjs $scriptjs.real +cp simplyread.js $scriptjs + +trap 'rm -f testxid testoutput testoutputbody $scriptjs;mv $scriptjs.real $scriptjs' EXIT surf -x "file://./$1" > testxid 2>testoutput & pid=$! @@ -22,5 +29,4 @@ sed 's/^\*\* Message:[^<]*//g' < testoutput > testoutputbody diff "$2" testoutputbody result=$? -rm -f testxid testoutput testoutputbody exit $result |