From 84d4e71d3e9d3afe55bbce837def3e08a118999a Mon Sep 17 00:00:00 2001
From: Alexey Verkhovsky <averkhov@thoughtworks.com>
Date: Thu, 18 Aug 2005 03:34:13 +0000
Subject: [PATCH] Patch for Watir test from Bret Pettichord

---
 test/watir/e2e.rb | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/test/watir/e2e.rb b/test/watir/e2e.rb
index 90cb9af3..bee13a35 100644
--- a/test/watir/e2e.rb
+++ b/test/watir/e2e.rb
@@ -4,6 +4,7 @@ require 'test/unit'
 require 'rexml/document'
 
 INSTIKI_ROOT = File.expand_path(File.dirname(__FILE__) + "/../..")
+
 require(File.expand_path(File.dirname(__FILE__) + "/../../config/environment"))
 
 # Use instiki/../watir, if such a directory exists; This can be a CVS HEAD version of Watir. 
@@ -19,8 +20,9 @@ class E2EInstikiTest < Test::Unit::TestCase
   def startup
     @@instiki = InstikiController.start
 
-    sleep 5
+    sleep 8
     @@ie = Watir::IE.start(HOME)
+    @@ie.set_fast_speed if (ARGV & ['-d', '--demo', '-demo', 'demo']).empty?
 
     setup_web
     setup_home_page
@@ -268,19 +270,19 @@ class E2EInstikiTest < Test::Unit::TestCase
   end
 
   def setup_web
-    assert_equal 'Wiki', ie.textField(:name, 'web_name').value
-    assert_equal 'wiki', ie.textField(:name, 'web_address').value
-    assert_equal '', ie.textField(:name, 'password').value
-    assert_equal '', ie.textField(:name, 'password_check').value
+    assert_equal 'Wiki', ie.text_field(:name, 'web_name').value
+    assert_equal 'wiki', ie.text_field(:name, 'web_address').value
+    assert_equal '', ie.text_field(:name, 'password').value
+    assert_equal '', ie.text_field(:name, 'password_check').value
     
-    ie.textField(:name, 'password').set('123')
-    ie.textField(:name, 'password_check').set('123')
+    ie.text_field(:name, 'password').set('123')
+    ie.text_field(:name, 'password_check').set('123')
     ie.button(:value, 'Setup').click
     assert_equal url(:new, 'HomePage'), ie.url
   end
 
   def setup_home_page
-    ie.textField(:name, 'content').set('Homepage of a test wiki')
+    ie.text_field(:name, 'content').set('Homepage of a test wiki')
     ie.button(:value, 'Submit').click
     assert_equal url(:show, 'HomePage'), ie.url
   end