From 5ad9fd4e2a2941e074f9483b8ec6f657eb338091 Mon Sep 17 00:00:00 2001
From: ot-chris-holt <cholt@onetechnologies.net>
Date: Tue, 17 Apr 2012 14:11:01 -0500
Subject: [PATCH 1/3] added some tests

---
 tests/BasicPage/BasicPage.html                | 4 ++++
 tests/BasicPage/Pages/BasicPage.rb            | 1 +
 tests/BasicPage/Specs/Evaluators/ShowSpecs.rb | 6 ++++++
 3 files changed, 11 insertions(+)

diff --git a/tests/BasicPage/BasicPage.html b/tests/BasicPage/BasicPage.html
index 6e654a8..52ba373 100644
--- a/tests/BasicPage/BasicPage.html
+++ b/tests/BasicPage/BasicPage.html
@@ -96,6 +96,10 @@ <h1 id="welcome">Welcome</h1>
     <br>
     <input type="text" value="Jane Doe" readonly="readonly" id="read_only">
 
+    <br>
+    <br>
+    <span id="credit_score">600</span>
+
     <script type="text/javascript">
         $(document).ready(function() {
             setTimeout(function() {$("#ajax").html("ajax loaded");}, 4000)
diff --git a/tests/BasicPage/Pages/BasicPage.rb b/tests/BasicPage/Pages/BasicPage.rb
index 190883e..64a9a48 100644
--- a/tests/BasicPage/Pages/BasicPage.rb
+++ b/tests/BasicPage/Pages/BasicPage.rb
@@ -34,6 +34,7 @@ def Init
     TextArea    :notes, :id => "notes"
     Button      :click_me_to_add_note!, :id => "add_note"
     TextBox     :read_only, :id => "read_only"
+    Label       :credit_score, :id => "credit_score"
 
   end
 
diff --git a/tests/BasicPage/Specs/Evaluators/ShowSpecs.rb b/tests/BasicPage/Specs/Evaluators/ShowSpecs.rb
index 2654795..87ffb67 100644
--- a/tests/BasicPage/Specs/Evaluators/ShowSpecs.rb
+++ b/tests/BasicPage/Specs/Evaluators/ShowSpecs.rb
@@ -21,6 +21,12 @@
       And "the first name should not be Jane" do
         Should Not Show :first_name => "Jane"
       end
+      And "the credit score should be 600" do
+        Should Not Show :credit_score => "600"
+      end
+      And "the credit score should not be 601" do
+        Should Not Show :credit_score => "601"
+      end
       And "the page should not be the incorrect page" do
         Should Not Show IncorrectPage
       end

From 371d279df5f294ad736d392b26d8d015628b343c Mon Sep 17 00:00:00 2001
From: ot-chris-holt <cholt@onetechnologies.net>
Date: Tue, 17 Apr 2012 14:20:54 -0500
Subject: [PATCH 2/3] updated sapphire timeout to 60 seconds for page
 transitions and 20 seconds for checking an element

---
 lib/sapphire/Adapters/Selenium/RubySeleniumWebDriver.rb | 8 ++++----
 lib/sapphire/DSL/Browser/Verbs/Remove.rb                | 2 +-
 lib/sapphire/WebAbstractions/Controls/Base/Control.rb   | 2 +-
 lib/sapphire/WebAbstractions/Controls/List.rb           | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/sapphire/Adapters/Selenium/RubySeleniumWebDriver.rb b/lib/sapphire/Adapters/Selenium/RubySeleniumWebDriver.rb
index fc0d472..78e8825 100644
--- a/lib/sapphire/Adapters/Selenium/RubySeleniumWebDriver.rb
+++ b/lib/sapphire/Adapters/Selenium/RubySeleniumWebDriver.rb
@@ -90,7 +90,7 @@ def NavigateTo(page)
       end
 
       def CurrentUrl
-        wait = Selenium::WebDriver::Wait.new(:timeout => 20)
+        wait = Selenium::WebDriver::Wait.new(:timeout => 60)
         url = wait.until { x = self.Browser().current_url
             x unless x == nil
         }
@@ -128,7 +128,7 @@ def ShouldNavigateTo(page, comparator)
         $page ||= page
 
         timeout = GetValue(page, :wait)
-        timeout ||= 20
+        timeout ||= 60
 
         $page.Init
 
@@ -202,7 +202,7 @@ def FindItem(array, comparator = nil)
       end
 
       def FindItemWithWait(array, comparator=nil)
-        masterWait = Selenium::WebDriver::Wait.new(:timeout => 5)
+        masterWait = Selenium::WebDriver::Wait.new(:timeout => 20)
 
         element = masterWait.until {
           x = FindItem(array, comparator)
@@ -227,7 +227,7 @@ def FindItemWithoutWait(array, comparator=nil)
       end
 
       def FindAllItems(array)
-        masterWait = Selenium::WebDriver::Wait.new(:timeout => 5)
+        masterWait = Selenium::WebDriver::Wait.new(:timeout => 20)
 
         element = masterWait.until {
           x = nil
diff --git a/lib/sapphire/DSL/Browser/Verbs/Remove.rb b/lib/sapphire/DSL/Browser/Verbs/Remove.rb
index 84e670e..8edaf14 100644
--- a/lib/sapphire/DSL/Browser/Verbs/Remove.rb
+++ b/lib/sapphire/DSL/Browser/Verbs/Remove.rb
@@ -3,7 +3,7 @@ module DSL
     module Browser
       def Remove(item)
         ExecuteHashAgainstControl(item) do |control, arg|
-            wait = Selenium::WebDriver::Wait.new(:timeout => 5)
+            wait = Selenium::WebDriver::Wait.new(:timeout => 20)
             begin
               evaluation = wait.until { x = control
                 val = x.Text
diff --git a/lib/sapphire/WebAbstractions/Controls/Base/Control.rb b/lib/sapphire/WebAbstractions/Controls/Base/Control.rb
index 0f1ef93..b67637e 100644
--- a/lib/sapphire/WebAbstractions/Controls/Base/Control.rb
+++ b/lib/sapphire/WebAbstractions/Controls/Base/Control.rb
@@ -80,7 +80,7 @@ def Evaluate(key, arg, comparator, block)
 
         value = GetValue(arg, key)
         timeout = GetValue(arg, :wait)
-        timeout ||= 5
+        timeout ||= 20
 
         begin
           value = value.Text if value.is_a? Control
diff --git a/lib/sapphire/WebAbstractions/Controls/List.rb b/lib/sapphire/WebAbstractions/Controls/List.rb
index 5f2c4c1..7bfd0e9 100644
--- a/lib/sapphire/WebAbstractions/Controls/List.rb
+++ b/lib/sapphire/WebAbstractions/Controls/List.rb
@@ -55,7 +55,7 @@ def Contain(value)
       end
 
       def Click
-        wait = Selenium::WebDriver::Wait.new(:timeout => 3)
+        wait = Selenium::WebDriver::Wait.new(:timeout => 20)
         begin
           clicked = wait.until { items = self.FindAll
             if items.empty? == false

From 626079ab9880a53431ee323529419af5cfd4e189 Mon Sep 17 00:00:00 2001
From: ot-chris-holt <cholt@onetechnologies.net>
Date: Tue, 17 Apr 2012 14:21:24 -0500
Subject: [PATCH 3/3] updated sapphire to 0.7.25

---
 lib/sapphire/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/sapphire/version.rb b/lib/sapphire/version.rb
index 4b1a53b..6742558 100644
--- a/lib/sapphire/version.rb
+++ b/lib/sapphire/version.rb
@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.7.24"
+  VERSION = "0.7.25"
 end