sapphire 0.7.26 → 0.8.0

data/lib/sapphire.rb

@@ -1,40 +1,51 @@
-$:.unshift File.expand_path("..", __FILE__)
-
-require 'rubygems'
-require 'Platform'
-require 'yaml'
-require 'selenium-webdriver'
-require 'delegate'
-require 'Forwardable'
-
-require 'sapphire/Adapters'
-require 'sapphire/Testing'
-require 'sapphire/Web'
-require 'sapphire/DSL'
-require 'sapphire/Extensions'
-require 'sapphire/CommandLine'
-require 'sapphire/Configuration'
-require 'sapphire/Data'
-require 'sapphire/Virtualization'
-require 'sapphire/TeamCity'
-
-module Sapphire
-  module Sapphire
-    include DSL
-    include DSL::Scenarios
-    include DSL::Browser
-    include DSL::Configuration
-    include DSL::Data
-    include DSL::TestPlans
-    include DSL::Coverage
-    include Configuration
-    include DataAbstractions
-    include JobAbstractions
-    include WebAbstractions
-    include Testing
-    include Testing::TeamCity
-    include UI
-  end
-end
-
-$driver = Sapphire::WebAbstractions::MetaBrowser.new(nil)
+$:.unshift File.expand_path("..", __FILE__)
+
+require 'rubygems'
+require 'Platform'
+require 'yaml'
+require 'selenium-webdriver'
+require 'delegate'
+require 'Forwardable'
+
+require 'sapphire/Observable'
+require 'sapphire/Adapters'
+require 'sapphire/Testing'
+require 'sapphire/Web'
+require 'sapphire/DSL'
+require 'sapphire/Extensions'
+require 'sapphire/CommandLine'
+require 'sapphire/Configuration'
+require 'sapphire/Data'
+require 'sapphire/Virtualization'
+require 'sapphire/TeamCity'
+require 'sapphire/Observers'
+
+module Sapphire
+  module Sapphire
+    include DSL
+    include DSL::Scenarios
+    include DSL::Browser
+    include DSL::Configuration
+    include DSL::Data
+    include DSL::TestPlans
+    include DSL::Coverage
+    include Configuration
+    include DataAbstractions
+    include JobAbstractions
+    include WebAbstractions
+    include Testing
+    include Testing::TeamCity
+    include Observers
+    include UI
+  end
+end
+
+$driver = Sapphire::WebAbstractions::MetaBrowser.new(nil)
+
+Sapphire.sub_modules.each do |m|
+  m.sub_classes.each do |s|
+    m.const_get(s).observe() if m.const_get(s).respond_to? :observe
+    Sapphire::Observers::ObserverRepository.instance.Add(m.const_get(s).new) if m.const_get(s).respond_to? :IsObserver
+  end
+end
+

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

@@ -175,118 +175,72 @@ module Sapphire
         return temp
       end
 
-      def FindItem(array, comparator = nil)
+      def FindItem(by, value, comparator = nil)
 
         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
-
-          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
-
-        end if array.is_a? Array
+        begin
+          x = self.FindElement by, value
+        rescue
+          #do nothing, let it keep looping
+        end
 
-        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)
+      def FindItemWithWait(by, value, comparator=nil)
         masterWait = Selenium::WebDriver::Wait.new(:timeout => 20)
 
         element = masterWait.until {
-          x = FindItem(array, comparator)
+          x = FindItem(by, value, 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
+
+        raise "Could not find control using lookup #{by} and value #{value}."
 
       end
 
-      def FindItemWithoutWait(array, comparator=nil)
+      def FindItemWithoutWait(by, value, comparator=nil)
 
-        element = FindItem(array, comparator)
+        element = FindItem(by, value, 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
+        raise "Could not find control using lookup #{by} and value #{value}."
 
       end
 
-      def FindAllItems(array)
+      def FindAllItems(by, value)
         masterWait = Selenium::WebDriver::Wait.new(:timeout => 20)
 
         element = masterWait.until {
           x = nil
-          array.each do |item|
-
-            if item.is_a? Hash
-                begin
-                  x = self.FindElements item.keys.first, item.fetch(item.keys.first)
-                  x = nil if x.is_a? Array and x.empty?
-                rescue
-                  #do nothing, let it keep looping
-                end
-            end
-
-            x = self.FindElements item[0], item[1] if item.is_a? Array
+          begin
+            x = self.FindElements by, value
             x = nil if x.is_a? Array and x.empty?
-            return x if x != nil
-
-          end if array.is_a? Array
+          rescue
+            #do nothing, let it keep looping
+          end
 
-          x = self.FindElement array.keys.first, array.fetch(array.keys.first) if array.is_a? Hash
+          x = nil if x.is_a? Array and x.empty?
           return x if x != nil
+
         }
         return element if element != nil
-        raise "Could not find control for array: " + array.to_s
-      end
-
-      def Spectate(discriminator, selector)
-        if ENV["spectator"] == "true"
-          begin
-            if(discriminator == :id)
-              self.ExecuteScript("document.getElementById('#{selector}').style.backgroundColor = '#FFF467'; ")
-            elsif (discriminator == :name )
-              self.ExecuteScript("document.getElementByName('#{selector}').style.backgroundColor = '#FFF467'; ")
-            elsif (discriminator == :xpath)
-              self.ExecuteScript("document.evaluate( '#{selector}', document, null, XPathResult.ANY_TYPE, null ).iterateNext().style.backgroundColor = '#FFF467'; ")
-            end
-
-            sleep 1
-
-            if(discriminator == :id)
-              self.ExecuteScript("document.getElementById('#{selector}').style.backgroundColor = '#ACD372'; ")
-            elsif (discriminator == :name )
-              self.ExecuteScript("document.getElementByName('#{selector}').style.backgroundColor = '#ACD372'; ")
-            elsif (discriminator == :xpath)
-              self.ExecuteScript("document.evaluate( '#{selector}', document, null, XPathResult.ANY_TYPE, null ).iterateNext().style.backgroundColor = '#ACD372'; ")
-            end
-          rescue
-          end
-        end
+        raise "Could not find control using lookup #{by} and value #{value}."
       end
 
       def FindElement(discriminator, selector)
-        self.Spectate(discriminator, selector)
         self.Browser().find_element discriminator, selector
       end
 
       def FindElements(discriminator, selector)
-        self.Spectate(discriminator, selector)
         self.Browser().find_elements discriminator, selector
       end
 
@@ -297,6 +251,8 @@ module Sapphire
       def Create(type)
         Selenium::WebDriver.for type
       end
+
+      include Sapphire::Observable
     end
   end
 end

data/lib/sapphire/DSL.rb

@@ -1,16 +1,18 @@
-require File.expand_path(File.dirname(__FILE__) +'/DSL/Evaluators/Evaluator.rb', __FILE__)
-require File.expand_path(File.dirname(__FILE__) +'/DSL/Comparisons/Comparison.rb', __FILE__)
-Dir[File.dirname(__FILE__) + '/DSL/Evaluators/*.rb'].each {|file| require file }
-Dir[File.dirname(__FILE__) + '/DSL/Comparisons/*.rb'].each {|file| require file }
-Dir[File.dirname(__FILE__) + '/DSL/Evaluations/*.rb'].each {|file| require file }
-Dir[File.dirname(__FILE__) + '/DSL/TestPlans/*.rb'].each {|file| require file }
-Dir[File.dirname(__FILE__) + '/DSL/Browser/*.rb'].each {|file| require file }
-Dir[File.dirname(__FILE__) + '/DSL/Browser/Fluff/*.rb'].each {|file| require file }
-Dir[File.dirname(__FILE__) + '/DSL/Browser/Nouns/*.rb'].each {|file| require file }
-Dir[File.dirname(__FILE__) + '/DSL/Browser/Verbs/*.rb'].each {|file| require file }
-Dir[File.dirname(__FILE__) + '/DSL/Browser/Keys/*.rb'].each {|file| require file }
-Dir[File.dirname(__FILE__) + '/DSL/Configuration/*.rb'].each {|file| require file }
-Dir[File.dirname(__FILE__) + '/DSL/Data/*.rb'].each {|file| require file }
-Dir[File.dirname(__FILE__) + '/DSL/Scenarios/*.rb'].each {|file| require file }
-Dir[File.dirname(__FILE__) + '/DSL/Events/*.rb'].each {|file| require file }
-Dir[File.dirname(__FILE__) + '/DSL/Coverage/*.rb'].each {|file| require file }
+require File.expand_path(File.dirname(__FILE__) +'/DSL/Evaluators/Evaluator.rb', __FILE__)
+require File.expand_path(File.dirname(__FILE__) +'/DSL/Comparisons/Comparison.rb', __FILE__)
+require File.expand_path(File.dirname(__FILE__) +'/DSL/Evaluations/Evaluation.rb', __FILE__)
+Dir[File.dirname(__FILE__) + '/DSL/Evaluators/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/DSL/Comparisons/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/DSL/Evaluations/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/DSL/TestPlans/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/DSL/Browser/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/DSL/Browser/Fluff/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/DSL/Browser/Nouns/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/DSL/Browser/Verbs/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/DSL/Browser/Keys/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/DSL/Configuration/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/DSL/Data/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/DSL/Scenarios/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/DSL/Events/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/DSL/Profiles/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/DSL/Coverage/*.rb'].each {|file| require file }

data/lib/sapphire/DSL/Browser/Create.rb

@@ -1,10 +1,10 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Create(item, &block)
-        item.Create(item) do block.call end
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Create(item, &block)
+        item.Create(item) do block.call end
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/ExecuteAgainstControl.rb

@@ -1,20 +1,20 @@
-module Sapphire
-  module DSL
-    module Browser
-      def ExecuteHashAgainstControl(hash, &block)
-        hash.keys.each do |key|
-          return block.call($page.Get(key), hash[key]) if($page.Contains key)
-        end
-
-        raise "Cannot find control matching " + hash.to_s + " for page " + $page.to_s
-      end
-
-      def ExecuteAgainstControl(item, &block)
-        return block.call($page.Get(item), item) if($page.Contains item)
-
-        raise "Cannot find controls matching: " + item.to_s + "for page " + $page.to_s
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def ExecuteHashAgainstControl(hash, &block)
+        hash.keys.each do |key|
+          return block.call($page.Get(key), hash[key]) if($page.Contains key)
+        end
+
+        raise "Cannot find control matching " + hash.to_s + " for page " + $page.to_s
+      end
+
+      def ExecuteAgainstControl(item, &block)
+        return block.call($page.Get(item), item) if($page.Contains item)
+
+        raise "Cannot find controls matching: " + item.to_s + "for page " + $page.to_s
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/Fluff/By.rb

@@ -1,10 +1,10 @@
-module Sapphire
-  module DSL
-    module Browser
-      def By(value)
-        value
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def By(value)
+        value
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/Fluff/To.rb

@@ -1,10 +1,10 @@
-module Sapphire
-  module DSL
-    module Browser
-      def To(item)
-        item
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def To(item)
+        item
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/Fluff/With.rb

@@ -1,10 +1,10 @@
-module Sapphire
-  module DSL
-    module Browser
-      def With(item)
-        item
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def With(item)
+        item
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/Nouns/Browser.rb

@@ -1,17 +1,17 @@
-module Sapphire
-  module DSL
-    module Browser
-      class Browser
-        def Close
-          sleep(2)
-          $driver.Close
-        end
-
-        def Switch
-          $driver.Switch
-        end
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      class Browser
+        def Close
+          sleep(2)
+          $driver.Close
+        end
+
+        def Switch
+          $driver.Switch
+        end
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Browser/Nouns/Enter.rb

@@ -1,11 +1,11 @@
-module Sapphire
-  module DSL
-    module Browser
-      class Enter
-          def Press
-            $driver.Type("\n")
-          end
-      end
-    end
-  end
+module Sapphire
+  module DSL
+    module Browser
+      class Enter
+          def Press
+            $driver.Type("\n")
+          end
+      end
+    end
+  end
 end