sapphire 0.6.7 → 0.7.0

data/lib/sapphire/Virtualization.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) +'/UI/Functions.rb', File.dirname(__FILE__)) if Platform::OS == :win32
+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

data/lib/sapphire/WebAbstractions/Browsers/Chrome.rb

@@ -1,21 +1,22 @@
-module Sapphire
-  module WebAbstractions
-    def Chrome(url)
-      ChromeBrowser.new
-    end
-
-    class ChromeBrowser
-      include RubySeleniumWebDriver
-
-      attr_reader :browser
-
-      def initialize()
-        @browser = self.Create :chrome
-        super @browser
-        $browser = self
-      end
-    end
-  end
-end
-
-
+module Sapphire
+  module WebAbstractions
+    def Chrome(url)
+      @rootUrl = url
+      ChromeBrowser.new
+    end
+
+    class ChromeBrowser
+      include RubySeleniumWebDriver
+
+      attr_reader :browser
+
+      def initialize()
+        @browser = self.Create :chrome
+        super @browser
+        $driver = self
+      end
+    end
+  end
+end
+
+

data/lib/sapphire/WebAbstractions/Browsers/FireFox.rb

@@ -1,22 +1,24 @@
-module Sapphire
-  module WebAbstractions
-    class FireFoxBrowser
-      include RubySeleniumWebDriver
-
-      attr_reader :browser
-
-      def initialize()
-        @browser = self.Create :firefox
-        super(@browser)
-        $browser = self
-      end
-
-    end
-
-    def FireFox(url)
-      FireFoxBrowser.new
-    end
-  end
-end
-
-
+module Sapphire
+  module WebAbstractions
+    class FireFoxBrowser
+      include RubySeleniumWebDriver
+
+      attr_reader :browser
+
+      def initialize()
+        @browser = self.Create :firefox
+        super(@browser)
+        $driver = self
+      end
+
+    end
+
+    def FireFox(url)
+      @rootUrl = url
+      return FireFoxBrowser.new
+    end
+
+  end
+end
+
+

data/lib/sapphire/WebAbstractions/Browsers/InternetExplorer.rb

@@ -1,21 +1,22 @@
-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
-
+module Sapphire
+  module WebAbstractions
+    def InternetExplorer(url)
+      @rootUrl = url
+      driver = InternetExplorerBrowser.new
+      driver
+    end
+
+    class InternetExplorerBrowser
+      include RubySeleniumWebDriver
+
+      attr_reader :browser
+
+      def initialize
+        @browser = self.Create :ie
+        super(@browser)
+        $driver = self
+      end
+    end
+  end
+end
+

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

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

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

@@ -2,19 +2,19 @@ module Sapphire
   module WebAbstractions
     class Control
       def initialize(hash)
-          @hash = hash
+        @hash = hash
       end
 
-      def Find
-        $browser.FindItem(@hash)
+      def Find(comparator = nil)
+        $driver.FindItem(@hash, comparator)
       end
 
       def FindAll
-        $browser.FindAllItems(@hash)
+        $driver.FindAllItems(@hash)
       end
 
       def FindWithoutWait
-        $browser.FindElement @hash[0].keys.first, @hash[0].fetch(@hash[0].keys.first)
+        $driver.FindElement @hash[0].keys.first, @hash[0].fetch(@hash[0].keys.first)
       end
 
       def Text
@@ -30,31 +30,49 @@ module Sapphire
       def MouseOver
         if @hash.is_a? Hash
           if(@hash.has_key?(:id))
-            $browser.ExecuteScript("document.getElementById('"+ @hash.fetch(:id) +"').style.visibility = 'visible'; ")
+            $driver.ExecuteScript("document.getElementById('"+ @hash.fetch(:id) +"').style.visibility = 'visible'; ")
           elsif (@hash.has_key?(:name))
-            $browser.ExecuteScript("document.getElementByName('"+ @hash.fetch(:name) +"').style.visibility = 'visible'; ")
+            $driver.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'; ")
+            $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))
-            $browser.ExecuteScript("document.getElementById('"+ @hash[0].fetch(:id) +"').style.visibility = 'visible'; ")
+            $driver.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'; ")
+            $driver.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'; ")
+            $driver.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)
-         return Evaluation.new(self.Text, value)
+      def Visible
+        control = self.Find
+        control.displayed?
+      end
+
+      def Equals(value, comparator)
+        evaluation = Evaluation.new(self.Text, value)
+        EqualsComparison.new(evaluation)
       end
 
       def Contain(value)
-         return ContainsEvaluation.new(self.Text, value)
+        return ContainsComparison.new(Evaluation.new(value, self.Text))
+      end
+
+      def In(values, comparator)
+        text = self.Text
+        values.each do |value|
+          if comparator.Compare(text, value)
+            return Evaluation.new(text, value)
+          end
+        end
+
+        #error land
+        return Evaluation.new(text, values)
       end
     end
   end

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

@@ -1,65 +1,74 @@
-module Sapphire
-  module WebAbstractions
-    class Page
-
-      def AlternateUrls
-        []
-      end
-
-      attr_reader :fields
-
-      def initialize()
-        @fields = []
-      end
-
-      def DropDown(*args)
-        @fields << { args.first => DropDown.new(args[1..args.length]) }
-      end
-
-      def TextBox(*args)
-        @fields << { args.first => TextBox.new(args[1..args.length]) }
-      end
-
-      def RadioButton(*args)
-        @fields << { args.first => RadioButton.new(args[1..args.length]) }
-      end
-
-      def CheckBox(*args)
-        @fields << { args.first => CheckBox.new(args[1..args.length]) }
-      end
-
-      def Button(*args)
-        @fields << { args.first => Button.new(args[1..args.length]) }
-      end
-
-      def Label(*args)
-        @fields << { args.first => Label.new(args[1..args.length]) }
-      end
-
-      def Image(*args)
-        @fields << { args.first => Image.new(args[1..args.length]) }
-      end
-
-      def Hyperlink(*args)
-        @fields << { args.first => Hyperlink.new(args[1..args.length]) }
-      end
-
-      def List(*args)
-        @fields << { args.first => List.new(args[1..args.length]) }
-      end
-
-      def Date(*args)
-        @fields << { args.first => Date.new(args[1..args.length]) }
-      end
-
-      def Date(*args)
-        @fields << { args.first => Date.new(args[1]) }
-      end
-
-      def Contains(item)
-        @fields.has_key? item
-      end
-
-    end
-  end
-end
+module Sapphire
+  module WebAbstractions
+    class Page
+
+      def AlternateUrls
+        []
+      end
+
+      attr_reader :fields
+
+      def initialize()
+        @fields = {}
+        self.Init()
+      end
+
+      def Title(*args)
+        @fields = @fields.merge! args.first => Title.new(nil)
+      end
+
+      def DropDown(*args)
+        @fields = @fields.merge! args.first => DropDown.new(args[1..args.length])
+      end
+
+      def TextBox(*args)
+        @fields = @fields.merge! args.first => TextBox.new(args[1..args.length])
+      end
+
+      def RadioButton(*args)
+        @fields = @fields.merge! args.first => RadioButton.new(args[1..args.length])
+      end
+
+      def CheckBox(*args)
+        @fields = @fields.merge!  args.first => CheckBox.new(args[1..args.length])
+      end
+
+      def Button(*args)
+        @fields = @fields.merge! args.first => Button.new(args[1..args.length])
+      end
+
+      def Label(*args)
+        @fields = @fields.merge! args.first => Label.new(args[1..args.length])
+      end
+
+      def Image(*args)
+        @fields = @fields.merge! args.first => Image.new(args[1..args.length])
+      end
+
+      def Hyperlink(*args)
+        @fields = @fields.merge! args.first => Hyperlink.new(args[1..args.length])
+      end
+
+      def List(*args)
+        @fields = @fields.merge! args.first => List.new(args[1..args.length])
+      end
+
+      def Date(*args)
+        @fields = @fields.merge! args.first => Date.new(args[1])
+      end
+
+      def AlertBox(*args)
+        @fields = @fields.merge! args.first => AlertBox.new(nil)
+      end
+
+      def Contains(item)
+        @fields.has_key? item
+      end
+
+      def Get(item)
+        @fields[item]
+      end
+
+    end
+  end
+end

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

@@ -1,28 +1,29 @@
-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)
+        checked = self.Checked
+
+        if value && checked
+          return;
+        end
+
+        if !value && !checked
+          return;
+        end
+
+        self.Click
+      end
+
+      def Checked
+        radio = self.Find
+        radio.attribute("checked") != nil
+      end
+
+      def Clear
+        self.Check false
+      end
+    end
+  end
+end
+