sapphire 0.7.16 → 0.7.17

data/lib/sapphire/Adapters/Selenium/RubySeleniumWebDriver.rb

@@ -176,34 +176,54 @@ module Sapphire
       end
 
       def FindItem(array, comparator = nil)
-        masterWait = Selenium::WebDriver::Wait.new(:timeout => 5)
 
-        element = masterWait.until {
-          x = nil
-          array.each do |item|
+        x = nil
+        array.each do |item|
 
-            if item.is_a? Hash
-                begin
-                  x = self.FindElement item.keys.first, item.fetch(item.keys.first)
-                rescue
-                  #do nothing, let it keep looping
-                end
-            end
+          if item.is_a? Hash
+              begin
+                x = self.FindElement item.keys.first, item.fetch(item.keys.first)
+              rescue
+                #do nothing, let it keep looping
+              end
+          end
 
-            x = self.FindElement item[0], item[1] if item.is_a? Array
+          x = self.FindElement item[0], item[1] if item.is_a? Array
 
-            return x if x != nil
-            return x if comparator.Compare(x != nil, true) if comparator != nil
+          return x if x != nil
+          return x if comparator.Compare(x != nil, true) if comparator != nil
 
-          end if array.is_a? Array
+        end if array.is_a? Array
 
-          x = self.FindElement array.keys.first, array.fetch(array.keys.first) if array.is_a? Hash
+        x = self.FindElement array.keys.first, array.fetch(array.keys.first) if array.is_a? Hash
+        return x if x != nil
+        return x if comparator.Compare(x != nil, true) if comparator != nil
+
+      end
+
+      def FindItemWithWait(array, comparator=nil)
+        masterWait = Selenium::WebDriver::Wait.new(:timeout => 5)
+
+        element = masterWait.until {
+          x = FindItem(array, comparator)
           return x if x != nil
           return x if comparator.Compare(x != nil, true) if comparator != nil
         }
+
         return element if element != nil
         return element if comparator.Compare(element != nil, true) if comparator != nil
         raise "Could not find control for array: " + array.to_s
+
+      end
+
+      def FindItemWithoutWait(array, comparator=nil)
+
+        element = FindItem(array, comparator)
+
+        return element if element != nil
+        return element if comparator.Compare(element != nil, true) if comparator != nil
+        raise "Could not find control for array: " + array.to_s
+
       end
 
       def FindAllItems(array)
@@ -239,6 +259,7 @@ module Sapphire
          self.Browser().find_element discriminator, selector
       end
 
+
       def FindElements(discriminator, selector)
         self.Browser().find_elements discriminator, selector
       end

data/lib/sapphire/Configuration/AppConfig.rb

@@ -14,7 +14,7 @@ module Sapphire
       end
 
       def Browser
-        case($config["Browser"])
+        case(ENV["browser"] || $config["Browser"])
           when "Firefox" then FireFoxBrowser.new
           when "Chrome" then ChromeBrowser.new
           when "IE" then InternetExplorerBrowser.new
@@ -22,7 +22,7 @@ module Sapphire
       end
 
       def ConfiguredBrowser
-        $config["Browser"]
+        ENV["browser"] || $config["Browser"]
       end
 
     end

data/lib/sapphire/DSL/Browser/Verbs/Exists.rb

@@ -4,8 +4,7 @@ module Sapphire
       def Exists(symbol)
         if($page.Contains symbol)
           begin
-            x = $page.Get(symbol).FindWithoutWait
-            return x.displayed?
+            return $page.Get(symbol).Visible(false).Evaluate()
           rescue
             return false
           end

data/lib/sapphire/WebAbstractions/Controls/Base/Control.rb

@@ -6,15 +6,15 @@ module Sapphire
       end
 
       def Find(comparator = nil)
-        $driver.FindItem(@hash, comparator)
+        $driver.FindItemWithWait(@hash, comparator)
       end
 
       def FindAll
         $driver.FindAllItems(@hash)
       end
 
-      def FindWithoutWait
-        $driver.FindElement @hash[0].keys.first, @hash[0].fetch(@hash[0].keys.first)
+      def FindWithoutWait(comparator = nil)
+        $driver.FindItemWithoutWait(@hash, comparator)
       end
 
       def Text
@@ -49,8 +49,9 @@ module Sapphire
         sleep(1)
       end
 
-      def Visible
-        control = self.Find
+      def Visible(shouldWait = true)
+        control = self.Find if shouldWait
+        control = self.FindWithoutWait if !shouldWait
         Evaluation.new(control.displayed?, true)
       end
 

data/lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.7.16"
+  VERSION = "0.7.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.7.16
+  version: 0.7.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-22 00:00:00.000000000Z
+date: 2012-03-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &9892788 !ruby/object:Gem::Requirement
+  requirement: &9864360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9892788
+  version_requirements: *9864360
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &9892536 !ruby/object:Gem::Requirement
+  requirement: &9864108 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9892536
+  version_requirements: *9864108
 - !ruby/object:Gem::Dependency
   name: Platform
-  requirement: &9892284 !ruby/object:Gem::Requirement
+  requirement: &9863856 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9892284
+  version_requirements: *9863856
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email: