sapphire 0.7.26 → 0.8.0

data/lib/sapphire/Virtualization.rb

@@ -1,8 +1,8 @@
-require File.expand_path(File.dirname(__FILE__) +'/UI/ProcessBuilder.rb', File.dirname(__FILE__)) if Platform::OS == :win32
-require File.expand_path(File.dirname(__FILE__) +'/UI/VirtualUI.rb', File.dirname(__FILE__)) if Platform::OS == :win32
-
-module Sapphire
-  module UI
-
-  end
+require File.expand_path(File.dirname(__FILE__) +'/UI/ProcessBuilder.rb', File.dirname(__FILE__)) if Platform::OS == :win32
+require File.expand_path(File.dirname(__FILE__) +'/UI/VirtualUI.rb', File.dirname(__FILE__)) if Platform::OS == :win32
+
+module Sapphire
+  module UI
+
+  end
 end

data/lib/sapphire/Web.rb

@@ -1,3 +1,3 @@
-Dir[File.dirname(__FILE__) + '/WebAbstractions/Controls/Base/*.rb'].each {|file| require file }
-Dir[File.dirname(__FILE__) + '/WebAbstractions/Controls/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/WebAbstractions/Controls/Base/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/WebAbstractions/Controls/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/WebAbstractions/Browsers/*.rb'].each {|file| require file }

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

@@ -1,21 +1,21 @@
-module Sapphire
-  module WebAbstractions
-    class AlertBox < Control
-      def Accept
-        $driver.AcceptAlert
-      end
-
-      def Set(text)
-        $driver.SetAlert(text)
-      end
-
-      def Visible()
-        Evaluation.new($driver.AlertShown(), true)
-      end
-
-      def Find(comparator = nil)
-        return $driver.FindAlert
-      end
-    end
-  end
+module Sapphire
+  module WebAbstractions
+    class AlertBox < Control
+      def Accept
+        $driver.AcceptAlert
+      end
+
+      def Set(text)
+        $driver.SetAlert(text)
+      end
+
+      def Visible()
+        Evaluation.new($driver.AlertShown(), true)
+      end
+
+      def Find(comparator = nil)
+        return $driver.FindAlert
+      end
+    end
+  end
 end

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

@@ -1,20 +1,47 @@
 module Sapphire
   module WebAbstractions
     class Control
-      def initialize(hash)
+
+      attr_reader :found_by_type
+      attr_reader :found_by_value
+
+      def initialize(args)
+        return if args.nil?
+
+        hash = {}
+        hash = args if args.is_a? Hash
+
+        args.each do |item|
+          hash.merge! item if item.is_a? Hash
+        end if args.is_a? Array
+
         @hash = hash
+        @by = hash.keys.first
+        @value = hash[hash.keys.first]
+        @control = hash.fetch :instance if hash.has_key? :instance
+
+        @found_by_type = @by
+        @found_by_value = @value
       end
 
       def Find(comparator = nil)
-        $driver.FindItemWithWait(@hash, comparator)
+        @control ||= $driver.FindItemWithWait(@by, @value, comparator)
+        @control
       end
 
       def FindAll
-        $driver.FindAllItems(@hash)
+        items = $driver.FindAllItems(@by, @value)
+        list = []
+        items.each do |item|
+          hash = {@by => @value, :instance => item}
+          list << Control.new(hash)
+        end
+
+        list
       end
 
       def FindWithoutWait(comparator = nil)
-        $driver.FindItemWithoutWait(@hash, comparator)
+        $driver.FindItemWithoutWait(@by, @value, comparator)
       end
 
       def Text
@@ -28,22 +55,12 @@ module Sapphire
       end
 
       def MouseOver
-        if @hash.is_a? Hash
-          if(@hash.has_key?(:id))
-            $driver.ExecuteScript("document.getElementById('"+ @hash.fetch(:id) +"').style.visibility = 'visible'; ")
-          elsif (@hash.has_key?(:name))
-            $driver.ExecuteScript("document.getElementByName('"+ @hash.fetch(:name) +"').style.visibility = 'visible'; ")
-          elsif (@hash.has_key?(:xpath))
-            $driver.ExecuteScript("document.evaluate( '" + @hash.fetch(:xpath) + "', document, null, XPathResult.ANY_TYPE, null ).iterateNext().style.visibility = 'visible'; ")
-          end
-        elsif @hash.is_a? Array
-          if(@hash[0].has_key?(:id))
-            $driver.ExecuteScript("document.getElementById('"+ @hash[0].fetch(:id) +"').style.visibility = 'visible'; ")
-          elsif (@hash[0].has_key?(:name))
-            $driver.ExecuteScript("document.getElementByName('"+ @hash[0].fetch(:name) +"').style.visibility = 'visible'; ")
-          elsif (@hash[0].has_key?(:xpath))
-            $driver.ExecuteScript("document.evaluate( '" + @hash[0].fetch(:xpath) + "', document, null, XPathResult.ANY_TYPE, null ).iterateNext().style.visibility = 'visible'; ")
-          end
+        if(@by == :id)
+          $driver.ExecuteScript("document.getElementById('"+ @value +"').style.visibility = 'visible'; ")
+        elsif (@by == :name)
+          $driver.ExecuteScript("document.getElementByName('"+ @value +"').style.visibility = 'visible'; ")
+        elsif (@by == :xpath)
+          $driver.ExecuteScript("document.evaluate( '" + @value + "', document, null, XPathResult.ANY_TYPE, null ).iterateNext().style.visibility = 'visible'; ")
         end
 
         sleep(1)
@@ -52,28 +69,28 @@ module Sapphire
       def Visible(shouldWait = true)
         control = self.Find if shouldWait
         control = self.FindWithoutWait if !shouldWait
-        Evaluation.new(control.displayed?, true)
+        ControlEvaluation.new(control.displayed?, true, self)
       end
 
       def Equals(value, comparator)
-        evaluation = Evaluation.new(self.Text, value)
+        evaluation = ControlEvaluation.new(self.Text, value, self)
         EqualsComparison.new(evaluation)
       end
 
       def Contain(value)
-        return ContainsComparison.new(Evaluation.new(value, self.Text))
+        return ContainsComparison.new(ControlEvaluation.new(value, self.Text, self))
       end
 
       def In(values, comparator)
         text = self.Text
         values.each do |value|
           if comparator.Compare(text, value)
-            return Evaluation.new(text, value)
+            return ControlEvaluation.new(text, value, self)
           end
         end
 
         #error land
-        return Evaluation.new(text, values)
+        return ControlEvaluation.new(text, values, self)
       end
 
       def Evaluate(key, arg, comparator, block)
@@ -96,7 +113,7 @@ module Sapphire
 
           return result
         rescue
-          return Evaluation.new(evaluation.left, evaluation.right)
+          return ControlEvaluation.new(evaluation.left, evaluation.right, self)
         end
       end
 

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

@@ -1,7 +1,7 @@
-module Sapphire
-  module WebAbstractions
-    class Button < Control
-    end
-  end
-end
-
+module Sapphire
+  module WebAbstractions
+    class Button < Control
+    end
+  end
+end
+

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

@@ -5,11 +5,11 @@ module Sapphire
         checked = self.Checked().Evaluate()
 
         if value && checked
-          return;
+          return
         end
 
         if !value && !checked
-          return;
+          return
         end
 
         self.Click
@@ -17,7 +17,7 @@ module Sapphire
 
       def Checked
         radio = self.Find
-        Evaluation.new(radio.attribute("checked") != nil, true)
+        ControlEvaluation.new(radio.attribute("checked") != nil, true, self)
       end
 
       def Clear

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

@@ -1,12 +1,12 @@
-module Sapphire
-  module WebAbstractions
-    class Date < Control
-
-      def Text
-        control = self.Find
-        return DateTime.strptime(control.text, "%m/%d/%Y %H:%M:%S %p").to_date
-      end
-
-    end
-  end
+module Sapphire
+  module WebAbstractions
+    class Date < Control
+
+      def Text
+        control = self.Find
+        return DateTime.strptime(control.text, "%m/%d/%Y %H:%M:%S %p").to_date
+      end
+
+    end
+  end
 end

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

@@ -31,25 +31,23 @@ module Sapphire
         items = ddl.find_elements(:tag_name, "option")
         items.each do |item|
           if item.text == value
-            return Evaluation.new(item.text, value)
+            return ControlEvaluation.new(item.text, value, self)
           end
         end
 
-        return Evaluation.new("Value not found in list", value)
+        return ControlEvaluation.new("Value not found in list", value, self)
       end
 
       def Count(value)
         ddl = self.Find
         items = ddl.find_elements(:tag_name, "option")
-        return Evaluation.new(items.count, value)
+        return ControlEvaluation.new(items.count, value, self)
       end
 
       def Clear
-        @hash.each do |item|
-          if item.has_key? :default
-            self.Set(item[:default])
-            return
-          end
+        if @hash.has_key? :default
+          self.Set(@hash[:default])
+          return
         end
 
         raise "no :default set for DropDown"

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

@@ -1,8 +1,8 @@
-module Sapphire
-  module WebAbstractions
-    class Hyperlink < Control
-
-    end
-  end
-end
-
+module Sapphire
+  module WebAbstractions
+    class Hyperlink < Control
+
+    end
+  end
+end
+

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

@@ -1,19 +1,19 @@
-module Sapphire
-  module WebAbstractions
-    class Image < Control
-      def Source(value, comparator)
-        image = self.Find
-        evaluation = Evaluation.new(image.attribute("src"), value)
-        EqualsComparison.new(evaluation)
-      end
-
-      def AltText(value, comparator)
-        image = self.Find
-        evaluation = Evaluation.new(image.attribute("alt"), value)
-        EqualsComparison.new(evaluation)
-      end
-    end
-  end
-end
-
-
+module Sapphire
+  module WebAbstractions
+    class Image < Control
+      def Source(value, comparator)
+        image = self.Find
+        evaluation = ControlEvaluation.new(image.attribute("src"), value, self)
+        EqualsComparison.new(evaluation)
+      end
+
+      def AltText(value, comparator)
+        image = self.Find
+        evaluation = ControlEvaluation.new(image.attribute("alt"), value, self)
+        EqualsComparison.new(evaluation)
+      end
+    end
+  end
+end
+
+

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

@@ -1,8 +1,8 @@
-module Sapphire
-  module WebAbstractions
-    class Label < Control
-
-    end
-  end
-end
-
+module Sapphire
+  module WebAbstractions
+    class Label < Control
+
+    end
+  end
+end
+

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

@@ -3,33 +3,33 @@ module Sapphire
     class List < Control
 
       def initialize(hash)
-        @hash = hash
         @retryAttempts = 0
+        super hash
       end
 
       def Equals(value, comparator)
         x = self.FindAll
         x.each do |item|
-          if comparator.Compare(item.text, value)
-            return  EqualsComparison.new(Evaluation.new(item.text, value))
+          if comparator.Compare(item.Text, value)
+            return  EqualsComparison.new(ControlEvaluation.new(item.Text, value, item))
           end
         end
 
         #if here then it couldnt make a match, build up the list of values
         alltext = []
         x.each do |item|
-          alltext << item.text
+          alltext << item.Text
         end
 
-        return  EqualsComparison.new(Evaluation.new(alltext, value))
+        return EqualsComparison.new(ControlEvaluation.new(alltext, value, self))
       end
 
       def In(values, comparator)
         x = self.FindAll
         x.each do |item|
           values.each do |value|
-            if comparator.Compare(item.text, value)
-              return Evaluation.new(item.text, value)
+            if comparator.Compare(item.Text, value)
+              return ControlEvaluation.new(item.Text, value, item)
             end
           end
         end
@@ -37,21 +37,21 @@ module Sapphire
         #if here then it couldnt make a match, build up the list of values
         alltext = []
         x.each do |item|
-          alltext << item.text
+          alltext << item.Text
         end
 
-        return Evaluation.new(values, alltext)
+        return ControlEvaluation.new(values, alltext, self)
       end
 
       def Contain(value)
         x = self.FindAll
         x.each do |item|
-          if item.text.include? value
-            return ContainsComparison.new(Evaluation.new(value, item.text))
+          if item.Text.include? value
+            return ContainsComparison.new(ControlEvaluation.new(value, item.Text, item))
           end
         end
 
-        return Evaluation.new("Value not found in list", value)
+        return ControlEvaluation.new("Value not found in list", value, self)
       end
 
       def Click
@@ -59,8 +59,8 @@ module Sapphire
         begin
           clicked = wait.until { items = self.FindAll
             if items.empty? == false
-              if items.first.displayed? == true
-                items.first.click
+              if items.first.Visible == true
+                items.first.Click
                 return true
               end
             end
@@ -80,14 +80,14 @@ module Sapphire
 
       def Count(value)
         items = self.FindAll
-        return Evaluation.new(items.count, value)
+        return ControlEvaluation.new(items.count, value, self)
       end
 
       def Text
         values = []
         x = self.FindAll
         x.each do |item|
-          values << item.text
+          values << item.Text
         end
 
         return values