sapphire 0.5.9 → 0.6.0

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

@@ -1,199 +1,209 @@
-module Sapphire
-  module WebAbstractions
-    module RubySeleniumWebDriver
-
-      attr_reader :rootUrl
-
-      def Init(url)
-        @rootUrl = url
-      end
-
-      def Close
-        self.browser.close
-      end
-
-      def Switch
-        self.browser.switch_to.window(self.browser.window_handles[0])
-      end
-
-      def Type(keys)
-        self.browser.action.send_keys(keys).perform()
-      end
-
-      def AcceptAlert
-        alert = self.browser.switch_to.alert
-        alert.accept()
-        self.browser.switch_to.window(self.browser.window_handles[0])
-      end
-
-      def SetAlert(text)
-        alert = self.browser.switch_to.alert
-        alert.send_keys(text)
-        alert.accept()
-        self.browser.switch_to.window(self.browser.window_handles[0])
-      end
-
-      def ClosePopup
-        self.browser.switch_to.window(self.browser.window_handles.last)
-        self.browser.close
-        self.browser.switch_to.window(self.browser.window_handles[0])
-      end
-
-      def SwitchToPopup
-        self.browser.switch_to.window(self.browser.window_handles.last)
-      end
-
-      def SetRootUrl(url)
-        if(url.instance_of?(String))
-          self.Init(url)
-        else
-          x = url.new().Url
-          self.Init(x)
-        end
-      end
-
-      def NavigateTo(page)
-        if(page.is_a? Class)
-          nav = page.new
-        else
-          nav = page
-        end
-
-        self.browser.get "https://" + nav.Url
-        nav.Init
-        nav
-      end
-
-      def CurrentUrl
-        wait = Selenium::WebDriver::Wait.new(:timeout => 30)
-        url = wait.until { x = self.browser.current_url
-            x unless x == nil
-        }
-
-        url
-      end
-
-      def Reload
-        self.browser.get self.CurrentUrl
-      end
-
-      def ShouldNavigateTo(page)
-        if(page.is_a? Class)
-          nav = page.new
-        else
-          nav = page
-        end
-
-        wait = Selenium::WebDriver::Wait.new(:timeout => 30)
-        found = wait.until {
-          x = self.CurrentUrl.upcase.start_with?("HTTP://" + nav.Url.upcase) || self.CurrentUrl.upcase.start_with?("HTTPS://" + nav.Url.upcase)
-          if(x == false)
-            nav.AlternateUrls.each do |url|
-              x = self.CurrentUrl.upcase.start_with?("HTTP://" + url.upcase) || self.CurrentUrl.upcase.start_with?("HTTPS://" + url.upcase)
-            end
-          end
-          x
-        }
-        temp = Evaluation.new(found, true)
-        return temp, nav
-      end
-
-      def Run(background)
-        scenario = background.new
-        scenario.Run
-      end
-
-      def ShouldShow(page)
-        self.ShouldNavigateTo page
-      end
-
-      def ShouldTransitionTo(url)
-        if(url.instance_of?(String))
-          temp = Evaluation.new(self.CurrentUrl.upcase.start_with?("HTTP://" + url.upcase) || self.CurrentUrl.upcase.start_with?("HTTPS://" + url.upcase), true)
-          @rootUrl = url
-        else
-          x = url.new().Url
-          temp = Evaluation.new(self.CurrentUrl.upcase.start_with?("HTTP://" + x.upcase) || self.CurrentUrl.upcase.start_with?("HTTPS://" + x.upcase), true)
-          @rootUrl = x
-        end
-
-        return temp
-      end
-
-      def FindItem(array)
-        masterWait = Selenium::WebDriver::Wait.new(:timeout => 30)
-
-        element = masterWait.until {
-          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
-
-          end if array.is_a? Array
-
-          x = self.FindElement array.keys.first, array.fetch(array.keys.first) if array.is_a? Hash
-          return x if x != nil
-        }
-        return element if element != nil
-        raise "Could not find control for array: " + array.to_s
-      end
-
-      def FindAllItems(array)
-        masterWait = Selenium::WebDriver::Wait.new(:timeout => 30)
-
-        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
-            x = nil if x.is_a? Array and x.empty?
-            return x if x != nil
-
-          end if array.is_a? Array
-
-          x = self.FindElement array.keys.first, array.fetch(array.keys.first) if array.is_a? Hash
-          return x if x != nil
-        }
-        return element if element != nil
-        raise "Could not find control for array: " + array.to_s
-      end
-
-      def FindElement(discriminator, selector)
-         self.browser.find_element discriminator, selector
-      end
-
-      def FindElements(discriminator, selector)
-        self.browser.find_elements discriminator, selector
-      end
-
-      def ExecuteScript(script)
-        self.browser.execute_script(script)
-      end
-
-      def Create(type)
-        Selenium::WebDriver.for type
-      end
-    end
-  end
-end
-
-
+module Sapphire
+  module WebAbstractions
+    module RubySeleniumWebDriver
+
+      attr_reader :rootUrl
+
+      def Init(url)
+        @rootUrl = url
+      end
+
+      def Close
+        self.browser.close
+      end
+
+      def Switch
+        self.browser.switch_to.window(self.browser.window_handles[0])
+      end
+
+      def Type(keys)
+        self.browser.action.send_keys(keys).perform()
+      end
+
+      def AcceptAlert
+        alert = self.browser.switch_to.alert
+        alert.accept()
+        self.browser.switch_to.window(self.browser.window_handles[0])
+      end
+
+      def SetAlert(text)
+        alert = self.browser.switch_to.alert
+        alert.send_keys(text)
+        alert.accept()
+        self.browser.switch_to.window(self.browser.window_handles[0])
+      end
+
+      def ClosePopup
+        self.browser.switch_to.window(self.browser.window_handles.last)
+        self.browser.close
+        self.browser.switch_to.window(self.browser.window_handles[0])
+      end
+
+      def SwitchToPopup
+        self.browser.switch_to.window(self.browser.window_handles.last)
+      end
+
+      def SwitchToIFrame(frame)
+        self.browser.switch_to.frame(frame)
+      end
+
+      def SetRootUrl(url)
+        if(url.instance_of?(String))
+          self.Init(url)
+        else
+          x = url.new().Url
+          self.Init(x)
+        end
+      end
+
+      def NavigateTo(page)
+        if(page.is_a? Class)
+          nav = page.new
+        else
+          nav = page
+        end
+
+        self.browser.get "https://" + nav.Url
+        nav.Init
+        nav
+      end
+
+      def CurrentUrl
+        wait = Selenium::WebDriver::Wait.new(:timeout => 30)
+        url = wait.until { x = self.browser.current_url
+            x unless x == nil
+        }
+
+        url
+      end
+
+      def Reload
+        self.browser.get self.CurrentUrl
+      end
+
+      def ShouldNavigateTo(page)
+        if(page.is_a? Class)
+          nav = page.new
+        else
+          nav = page
+        end
+
+        wait = Selenium::WebDriver::Wait.new(:timeout => 30)
+        begin
+          found = wait.until {
+            x = self.CurrentUrl.upcase.start_with?("HTTP://" + nav.Url.upcase) || self.CurrentUrl.upcase.start_with?("HTTPS://" + nav.Url.upcase)
+            if(x == false)
+              nav.AlternateUrls.each do |url|
+                if( x == false)
+                  x = self.CurrentUrl.upcase.start_with?("HTTP://" + url.upcase) || self.CurrentUrl.upcase.start_with?("HTTPS://" + url.upcase)
+                end
+              end
+            end
+            x
+          }
+        rescue
+          temp = Evaluation.new(self.CurrentUrl, nav.Url)
+          return temp, nav
+        end
+
+        temp = Evaluation.new(found, true)
+        return temp, nav
+      end
+
+      def Run(background)
+        scenario = background.new
+        scenario.Run
+      end
+
+      def ShouldShow(page)
+        self.ShouldNavigateTo page
+      end
+
+      def ShouldTransitionTo(url)
+        if(url.instance_of?(String))
+          temp = Evaluation.new(self.CurrentUrl.upcase.start_with?("HTTP://" + url.upcase) || self.CurrentUrl.upcase.start_with?("HTTPS://" + url.upcase), true)
+          @rootUrl = url
+        else
+          x = url.new().Url
+          temp = Evaluation.new(self.CurrentUrl.upcase.start_with?("HTTP://" + x.upcase) || self.CurrentUrl.upcase.start_with?("HTTPS://" + x.upcase), true)
+          @rootUrl = x
+        end
+
+        return temp
+      end
+
+      def FindItem(array)
+        masterWait = Selenium::WebDriver::Wait.new(:timeout => 30)
+
+        element = masterWait.until {
+          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
+
+          end if array.is_a? Array
+
+          x = self.FindElement array.keys.first, array.fetch(array.keys.first) if array.is_a? Hash
+          return x if x != nil
+        }
+        return element if element != nil
+        raise "Could not find control for array: " + array.to_s
+      end
+
+      def FindAllItems(array)
+        masterWait = Selenium::WebDriver::Wait.new(:timeout => 30)
+
+        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
+            x = nil if x.is_a? Array and x.empty?
+            return x if x != nil
+
+          end if array.is_a? Array
+
+          x = self.FindElement array.keys.first, array.fetch(array.keys.first) if array.is_a? Hash
+          return x if x != nil
+        }
+        return element if element != nil
+        raise "Could not find control for array: " + array.to_s
+      end
+
+      def FindElement(discriminator, selector)
+         self.browser.find_element discriminator, selector
+      end
+
+      def FindElements(discriminator, selector)
+        self.browser.find_elements discriminator, selector
+      end
+
+      def ExecuteScript(script)
+        self.browser.execute_script(script)
+      end
+
+      def Create(type)
+        Selenium::WebDriver.for type
+      end
+    end
+  end
+end

data/lib/sapphire/Strategies/HashStrategy.rb

@@ -5,14 +5,18 @@ module Sapphire
         def Show(item, modifier)
            ExecuteHashAgainstControl(item, @page) do |control, arg|
               wait = Selenium::WebDriver::Wait.new(:timeout => 30)
-              text = wait.until { x = control
-                val = x.Equals(arg)
-                if (val.left == val.right)
-                  x
-                end
-              }
+              begin
+                evaluation = wait.until { x = control
+                  val = x.Equals(arg)
+                  if (val.left == val.right)
+                    val
+                  end
+                }
+              rescue
+                return Evaluation.new(control.Text, arg)
+              end
 
-              return text.Equals(arg)
+              return evaluation
            end
         end
 

data/lib/sapphire/Testing/Coverage/{Test.rb → Behavior.rb}

@@ -1,11 +1,11 @@
 module Sapphire
   module Testing
     module Coverage
-      def Test(token, hash)
-        $features.last().AddTest(Test.new(token, hash))
+      def Behavior(token, hash)
+        $features.last().AddBehavior(Behavior.new(token, hash))
       end
 
-      class Test
+      class Behavior
 
         attr_reader   :token
         attr_reader   :type

data/lib/sapphire/Testing/Coverage/Feature.rb

@@ -14,15 +14,15 @@ module Sapphire
 
         def initialize(token)
           @token = token
-          @requirements = []
+          @behaviors = []
         end
 
         def AddRequirement(requirement)
           @requirements << requirement
         end
 
-        def AddTest(test)
-          @requirements.last().AddTest test
+        def AddBehavior(behavior)
+          @requirements.last().AddBehavior behavior
         end
 
       end

data/lib/sapphire/Testing/Coverage/Requirement.rb

@@ -10,16 +10,16 @@ module Sapphire
 
         attr_reader :token
         attr_reader :priority
-        attr_reader :tests
+        attr_reader :behaviors
 
         def initialize(hash)
           @token = hash.keys.first
           @priority = hash[hash.keys.first]
-          @tests = []
+          @behaviors = []
         end
 
-        def AddTest(test)
-          @tests << test
+        def AddBehavior(behavior)
+          @behaviors << behavior
         end
 
       end

data/lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.5.9"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-19 00:00:00.000000000Z
+date: 2011-12-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &10066392 !ruby/object:Gem::Requirement
+  requirement: &10000008 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10066392
+  version_requirements: *10000008
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &10066140 !ruby/object:Gem::Requirement
+  requirement: &9999756 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10066140
+  version_requirements: *9999756
 - !ruby/object:Gem::Dependency
   name: Platform
-  requirement: &10065888 !ruby/object:Gem::Requirement
+  requirement: &9999504 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10065888
+  version_requirements: *9999504
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email:
@@ -146,10 +146,10 @@ files:
 - lib/sapphire/TeamCity/TeamCityReporter.rb
 - lib/sapphire/TeamCity.rb
 - lib/sapphire/Testing/ConsoleReporter.rb
+- lib/sapphire/Testing/Coverage/Behavior.rb
 - lib/sapphire/Testing/Coverage/Covers.rb
 - lib/sapphire/Testing/Coverage/Feature.rb
 - lib/sapphire/Testing/Coverage/Requirement.rb
-- lib/sapphire/Testing/Coverage/Test.rb
 - lib/sapphire/Testing/Executable.rb
 - lib/sapphire/Testing/ExpectationException.rb
 - lib/sapphire/Testing/HtmlReporter.rb