Merge pull request #73 from ot-chris-holt/master

increased timeouts, 0.7.25

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

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

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

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

lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.7.24"
+  VERSION = "0.7.25"
 end

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)

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
 

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