sapphire 0.5.2 → 0.5.3

data/lib/sapphire/WebAbstractions/{Controls/Browsers → Browsers}/InternetExplorer.rb

@@ -1,21 +1,21 @@
-module Sapphire
-  module WebAbstractions
-    def InternetExplorer(url)
-      driver = InternetExplorerBrowser.new
-      driver
-    end
-
-    class InternetExplorerBrowser < DelegateClass(Selenium::WebDriver::IE::Bridge)
-      include WebBrowser
-
-      attr_reader :browser
-
-      def initialize
-        @browser = Selenium::WebDriver.for :ie
-        super(@browser)
-        $browser = @browser
-      end
-    end
-  end
-end
-
+module Sapphire
+  module WebAbstractions
+    def InternetExplorer(url)
+      driver = InternetExplorerBrowser.new
+      driver
+    end
+
+    class InternetExplorerBrowser
+      include RubySeleniumWebDriver
+
+      attr_reader :browser
+
+      def initialize
+        @browser = self.Create :ie
+        super(@browser)
+        $browser = self
+      end
+    end
+  end
+end
+

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

@@ -1,99 +1,59 @@
-module Sapphire
-  module WebAbstractions
-    class Control
-      def initialize(browser, hash)
-          @browser = browser
-          @hash = hash
-      end
-
-      def Find
-        masterWait = Selenium::WebDriver::Wait.new(:timeout => 30)
-
-        element = masterWait.until {
-          @hash.each do |item|
-            wait = Selenium::WebDriver::Wait.new(:timeout => 1)
-            begin
-              y = wait.until {
-                x = @browser.find_element item.keys.first, item.fetch(item.keys.first) if item.is_a? Hash
-                x = @browser.find_element item[0], item[1] if item.is_a? Array
-                return x if x != nil
-              }
-              return y if y != nil
-            rescue
-            end
-          end if @hash.is_a? Array
-
-          x = @browser.find_element @hash.keys.first, @hash.fetch(@hash.keys.first) if @hash.is_a? Hash
-          return x if x != nil
-          }
-        return element if element != nil
-        raise "Could not find control for symbol: " + @hash.to_s
-      end
-
-      def FindAll
-        masterWait = Selenium::WebDriver::Wait.new(:timeout => 30)
-
-        element = masterWait.until {
-          @hash.each do |item|
-            wait = Selenium::WebDriver::Wait.new(:timeout => 1)
-            begin
-              y = wait.until {
-                x = @browser.find_elements item.keys.first, item.fetch(item.keys.first) if item.is_a? Hash
-                x = @browser.find_elements item[0], item[1] if item.is_a? Array
-                return x if x != nil
-              }
-              return y if y != nil
-            rescue
-            end
-          end if @hash.is_a? Array
-
-          x = @browser.find_elements @hash.keys.first, @hash.fetch(@hash.keys.first) if @hash.is_a? Hash
-          return x if x != nil
-          }
-        return element if element != nil
-        raise "Could not find control for symbol: " + @hash.to_s
-      end
-
-      def FindWithoutWait
-        @browser.find_element @hash[0].keys.first, @hash[0].fetch(@hash[0].keys.first)
-      end
-
-      def Text
-        text = self.Find
-        text.text
-      end
-
-      def Click
-        control = self.Find
-        control.click
-      end
-
-      def MouseOver
-        if @hash.is_a? Hash
-          if(@hash.has_key?(:id))
-            @browser.execute_script("document.getElementById('"+ @hash.fetch(:id) +"').style.visibility = 'visible'; ")
-          elsif (@hash.has_key?(:name))
-            @browser.execute_script("document.getElementByName('"+ @hash.fetch(:name) +"').style.visibility = 'visible'; ")
-          elsif (@hash.has_key?(:xpath))
-            @browser.execute_script("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))
-            @browser.execute_script("document.getElementById('"+ @hash[0].fetch(:id) +"').style.visibility = 'visible'; ")
-          elsif (@hash[0].has_key?(:name))
-            @browser.execute_script("document.getElementByName('"+ @hash[0].fetch(:name) +"').style.visibility = 'visible'; ")
-          elsif (@hash[0].has_key?(:xpath))
-            @browser.execute_script("document.evaluate( '" + @hash[0].fetch(:xpath) + "', document, null, XPathResult.ANY_TYPE, null ).iterateNext().style.visibility = 'visible'; ")
-          end
-        end
-
-        sleep(1)
-      end
-
-      def Equals(value)
-         Evaluation.new(self.Text, value)
-      end
-    end
-  end
-end
-
+module Sapphire
+  module WebAbstractions
+    class Control
+      def initialize(browser, hash)
+          @browser = browser
+          @hash = hash
+      end
+
+      def Find
+        @browser.FindItem(@hash)
+      end
+
+      def FindAll
+        @browser.FindAllItems(@hash)
+      end
+
+      def FindWithoutWait
+        @browser.FindElement @hash[0].keys.first, @hash[0].fetch(@hash[0].keys.first)
+      end
+
+      def Text
+        text = self.Find
+        text.text
+      end
+
+      def Click
+        control = self.Find
+        control.click
+      end
+
+      def MouseOver
+        if @hash.is_a? Hash
+          if(@hash.has_key?(:id))
+            @browser.ExecuteScript("document.getElementById('"+ @hash.fetch(:id) +"').style.visibility = 'visible'; ")
+          elsif (@hash.has_key?(:name))
+            @browser.ExecuteScript("document.getElementByName('"+ @hash.fetch(:name) +"').style.visibility = 'visible'; ")
+          elsif (@hash.has_key?(:xpath))
+            @browser.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))
+            @browser.ExecuteScript("document.getElementById('"+ @hash[0].fetch(:id) +"').style.visibility = 'visible'; ")
+          elsif (@hash[0].has_key?(:name))
+            @browser.ExecuteScript("document.getElementByName('"+ @hash[0].fetch(:name) +"').style.visibility = 'visible'; ")
+          elsif (@hash[0].has_key?(:xpath))
+            @browser.ExecuteScript("document.evaluate( '" + @hash[0].fetch(:xpath) + "', document, null, XPathResult.ANY_TYPE, null ).iterateNext().style.visibility = 'visible'; ")
+          end
+        end
+
+        sleep(1)
+      end
+
+      def Equals(value)
+         Evaluation.new(self.Text, value)
+      end
+    end
+  end
+end
+

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

@@ -1,62 +1,62 @@
-module Sapphire
-  module WebAbstractions
-    class Page
-
-      def AlternateUrls
-        []
-      end
-
-      attr_reader :fields
-
-      def initialize(browser)
-        @browser = browser
-        @fields = []
-      end
-
-      def DropDown(*args)
-        @fields << { args.first => DropDown.new(@browser, args[1..args.length]) }
-      end
-
-      def TextBox(*args)
-        @fields << { args.first => TextBox.new(@browser, args[1..args.length]) }
-      end
-
-      def RadioButton(*args)
-        @fields << { args.first => RadioButton.new(@browser, args[1..args.length]) }
-      end
-
-      def CheckBox(*args)
-        @fields << { args.first => CheckBox.new(@browser, args[1..args.length]) }
-      end
-
-      def Button(*args)
-        @fields << { args.first => Button.new(@browser, args[1..args.length]) }
-      end
-
-      def Label(*args)
-        @fields << { args.first => Label.new(@browser, args[1..args.length]) }
-      end
-
-      def Image(*args)
-        @fields << { args.first => Image.new(@browser, args[1..args.length]) }
-      end
-
-      def Hyperlink(*args)
-        @fields << { args.first => Hyperlink.new(@browser, args[1..args.length]) }
-      end
-
-      def List(*args)
-        @fields << { args.first => List.new(@browser, args[1..args.length]) }
-      end
-
-      def Date(*args)
-        @fields << { args.first => Date.new(@browser, args[1..args.length]) }
-      end
-
-      def Date(*args)
-        @fields << { args.first => Date.new(@browser, args[1]) }
-      end
-
-    end
-  end
-end
+module Sapphire
+  module WebAbstractions
+    class Page
+
+      def AlternateUrls
+        []
+      end
+
+      attr_reader :fields
+
+      def initialize(browser)
+        @browser = browser
+        @fields = []
+      end
+
+      def DropDown(*args)
+        @fields << { args.first => DropDown.new(@browser, args[1..args.length]) }
+      end
+
+      def TextBox(*args)
+        @fields << { args.first => TextBox.new(@browser, args[1..args.length]) }
+      end
+
+      def RadioButton(*args)
+        @fields << { args.first => RadioButton.new(@browser, args[1..args.length]) }
+      end
+
+      def CheckBox(*args)
+        @fields << { args.first => CheckBox.new(@browser, args[1..args.length]) }
+      end
+
+      def Button(*args)
+        @fields << { args.first => Button.new(@browser, args[1..args.length]) }
+      end
+
+      def Label(*args)
+        @fields << { args.first => Label.new(@browser, args[1..args.length]) }
+      end
+
+      def Image(*args)
+        @fields << { args.first => Image.new(@browser, args[1..args.length]) }
+      end
+
+      def Hyperlink(*args)
+        @fields << { args.first => Hyperlink.new(@browser, args[1..args.length]) }
+      end
+
+      def List(*args)
+        @fields << { args.first => List.new(@browser, args[1..args.length]) }
+      end
+
+      def Date(*args)
+        @fields << { args.first => Date.new(@browser, args[1..args.length]) }
+      end
+
+      def Date(*args)
+        @fields << { args.first => Date.new(@browser, args[1]) }
+      end
+
+    end
+  end
+end

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

@@ -1,9 +1,9 @@
-require File.expand_path('../../WebAbstractions/Controls/Base/Control', File.dirname(__FILE__))
-
-module Sapphire
-  module WebAbstractions
-    class Button < Control
-    end
-  end
-end
-
+require File.expand_path('../../WebAbstractions/Controls/Base/Control', File.dirname(__FILE__))
+
+module Sapphire
+  module WebAbstractions
+    class Button < Control
+    end
+  end
+end
+

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

@@ -1,28 +1,28 @@
-module Sapphire
-  module WebAbstractions
-    class CheckBox < Control
-       def Check (value)
-
-        if value && self.IsChecked
-          return;
-        end
-
-        if !value && !self.IsChecked
-          return;
-        end
-
-        radio = self.Find
-        radio.click
-
-      end
-
-      def IsChecked
-
-        radio = self.Find
-        radio.attribute("checked")
-
-      end
-    end
-  end
-end
-
+module Sapphire
+  module WebAbstractions
+    class CheckBox < Control
+       def Check (value)
+
+        if value && self.IsChecked
+          return;
+        end
+
+        if !value && !self.IsChecked
+          return;
+        end
+
+        radio = self.Find
+        radio.click
+
+      end
+
+      def IsChecked
+
+        radio = self.Find
+        radio.attribute("checked")
+
+      end
+    end
+  end
+end
+

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

@@ -1,27 +1,27 @@
-module Sapphire
-  module WebAbstractions
-    class DropDown < Control
-      def Selected= (value)
-        Set(value)
-      end
-
-      def Selected
-        text = self.Find
-        text.value
-      end
-
-      def Text
-        text = self.Find
-        text.attribute("value")
-      end
-
-      def Set(value)
-        text = self.Find
-        options = text.find_elements(:tag_name, "option")
-        selection = options.find{|o| o.text == value.to_s}
-        raise "could not find the value " + value.to_s if selection.nil?
-        selection.click
-      end
-    end
-  end
+module Sapphire
+  module WebAbstractions
+    class DropDown < Control
+      def Selected= (value)
+        Set(value)
+      end
+
+      def Selected
+        text = self.Find
+        text.value
+      end
+
+      def Text
+        text = self.Find
+        text.attribute("value")
+      end
+
+      def Set(value)
+        text = self.Find
+        options = text.find_elements(:tag_name, "option")
+        selection = options.find{|o| o.text == value.to_s}
+        raise "could not find the value " + value.to_s if selection.nil?
+        selection.click
+      end
+    end
+  end
 end