sapphire 0.8.6 → 0.8.7

data/lib/sapphire/Extensions/Symbol.rb

@@ -56,7 +56,7 @@ class Symbol
 
   def Show(item, comparator)
     Examine(item, comparator) do |field, value|
-      field.Visible
+      field.Visible true, comparator
     end
   end
 
@@ -70,7 +70,6 @@ class Symbol
 
     element = field.Find(comparator)
     return Evaluation.new(true, true) if element.nil? and comparator.Compare(true, false)
-
     return Fix(field.Evaluate(key, item, comparator, block), comparator)
   end
 

data/lib/sapphire/Plugins/Highlighters/FailedControlHighlighter.rb

@@ -19,11 +19,11 @@ module Sapphire
 
         begin
           if(discriminator == :id)
-            $driver.ExecuteScript("document.getElementById('#{selector}').style.border = '1px solid #FF0000'; ")
+            $driver.ExecuteScript("document.getElementById('#{selector}').style.backgroundColor = '#FF0000'; ")
           elsif (discriminator == :name )
-            $driver.ExecuteScript("document.getElementByName('#{selector}').style.border = '1px solid #FF0000'; ")
+            $driver.ExecuteScript("document.getElementByName('#{selector}').style.backgroundColor = '#FF0000'; ")
           elsif (discriminator == :xpath)
-            $driver.ExecuteScript("document.evaluate( '#{selector}', document, null, XPathResult.ANY_TYPE, null ).iterateNext().style.border = '1px solid #FF0000'; ")
+            $driver.ExecuteScript("document.evaluate( '#{selector}', document, null, XPathResult.ANY_TYPE, null ).iterateNext().style.backgroundColor = '#FF0000'; ")
           end
 
         rescue

data/lib/sapphire/Plugins/Highlighters/PassedControlHighlighter.rb

@@ -20,11 +20,11 @@ module Sapphire
 
         begin
           if(discriminator == :id)
-            $driver.ExecuteScript("document.getElementById('#{selector}').style.border = '1px solid #00FF00'; ")
+            $driver.ExecuteScript("document.getElementById('#{selector}').style.backgroundColor = '#00FF00'; ")
           elsif (discriminator == :name )
-            $driver.ExecuteScript("document.getElementByName('#{selector}').style.border = '1px solid #00FF00'; ")
+            $driver.ExecuteScript("document.getElementByName('#{selector}').style.backgroundColor = '#00FF00'; ")
           elsif (discriminator == :xpath)
-            $driver.ExecuteScript("document.evaluate( '#{selector}', document, null, XPathResult.ANY_TYPE, null ).iterateNext().style.border = '1px solid #00FF00'; ")
+            $driver.ExecuteScript("document.evaluate( '#{selector}', document, null, XPathResult.ANY_TYPE, null ).iterateNext().style.backgroundColor = '#00FF00'; ")
           end
 
         rescue

data/lib/sapphire/WebAbstractions/Controls/AlertBox.rb

@@ -9,7 +9,8 @@ module Sapphire
         $driver.SetAlert(text)
       end
 
-      def Visible()
+      def Visible(shouldWait = true, comparator = nil)
+        return Evaluation.new(comparator.Compare($driver.AlertShown(), true), true) if !comparator.nil?
         Evaluation.new($driver.AlertShown(), true)
       end
 

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

@@ -61,9 +61,10 @@ module Sapphire
         sleep(1)
       end
 
-      def Visible(shouldWait = true)
-        control = self.Find if shouldWait
-        control = self.FindWithoutWait if !shouldWait
+      def Visible(shouldWait = true, comparator = nil)
+        control = self.Find comparator if shouldWait
+        control = self.FindWithoutWait comparator if !shouldWait
+        return ControlEvaluation.new(comparator.Compare(control.displayed?, true), true, self) if !comparator.nil?
         ControlEvaluation.new(control.displayed?, true, self)
       end
 
@@ -99,12 +100,12 @@ module Sapphire
           evaluation = block.call(self, value)
 
           wait = Selenium::WebDriver::Wait.new(:timeout => timeout)
-            result = wait.until {
-              evaluation = block.call(self, value)
-              y = evaluation.Evaluate()
-              comparator = EqualsComparison.new(evaluation) if evaluation == nil
-              evaluation if comparator.Compare(y == true, true)
-            }
+          result = wait.until {
+            evaluation = block.call(self, value)
+            y = evaluation.Evaluate()
+            comparator = EqualsComparison.new(evaluation) if evaluation == nil
+            evaluation if comparator.Compare(y == true, true)
+          }
 
           return result
         rescue

data/lib/sapphire/WebAbstractions/Controls/RadioButton.rb

@@ -17,8 +17,8 @@ module Sapphire
         return ControlEvaluation.new(val != nil, true, self)
       end
 
-      def Visible
-        radio = self.Find
+      def Visible(shouldWait = true, comparator = nil)
+        radio = self.Find comparator
         x = radio.attribute("disabled")
         ControlEvaluation.new((x == "false" || x.nil?), true, self)
       end

data/lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.8.6"
+  VERSION = "0.8.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000Z
+date: 2012-10-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &27803976 !ruby/object:Gem::Requirement
+  requirement: &22494372 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27803976
+  version_requirements: *22494372
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &27803676 !ruby/object:Gem::Requirement
+  requirement: &23007840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *27803676
+  version_requirements: *23007840
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &27803424 !ruby/object:Gem::Requirement
+  requirement: &23020320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27803424
+  version_requirements: *23020320
 - !ruby/object:Gem::Dependency
   name: Platform
-  requirement: &27803148 !ruby/object:Gem::Requirement
+  requirement: &23032620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27803148
+  version_requirements: *23032620
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email: