sapphire 0.6.7 → 0.7.0

data/lib/sapphire.rb

@@ -9,10 +9,10 @@ require 'Forwardable'
 require 'colorize'
 
 require 'sapphire/Adapters'
-require 'sapphire/Strategies'
 require 'sapphire/Testing'
 require 'sapphire/Web'
 require 'sapphire/DSL'
+require 'sapphire/Extensions'
 require 'sapphire/CommandLine'
 require 'sapphire/Configuration'
 require 'sapphire/Data'
@@ -21,12 +21,13 @@ require 'sapphire/TeamCity'
 
 module Sapphire
   module Sapphire
-    include DSL::Strategies
+    include DSL
     include DSL::Scenarios
     include DSL::Browser
     include DSL::Configuration
     include DSL::Data
     include DSL::TestPlans
+    include DSL::Events
     include Configuration::AttrMethods
     include Configuration
     include DataAbstractions

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

@@ -33,6 +33,19 @@ module Sapphire
         self.browser.switch_to.window(self.browser.window_handles[0])
       end
 
+      def FindAlert()
+        begin
+          return self.browser.switch_to.alert
+        rescue
+          return nil
+        end
+      end
+
+      def AlertShown()
+        alert = self.FindAlert()
+        return alert != nil
+      end
+
       def ClosePopup
         self.browser.switch_to.window(self.browser.window_handles.last)
         self.browser.close
@@ -58,14 +71,13 @@ module Sapphire
 
       def NavigateTo(page)
         if(page.is_a? Class)
-          nav = page.new
+          $page = page.new
         else
-          nav = page
+          $page = page
         end
 
-        self.browser.get "https://" + nav.Url
-        nav.Init
-        nav
+        self.browser.get $page.Url
+        $page.Init
       end
 
       def CurrentUrl
@@ -81,33 +93,38 @@ module Sapphire
         self.browser.get self.CurrentUrl
       end
 
-      def ShouldNavigateTo(page)
+      def ShouldNavigateTo(page, comparator)
         if(page.is_a? Class)
-          nav = page.new
+          $page = page.new
         else
-          nav = page
+          $page = page
         end
 
+        $page.Init
+
         wait = Selenium::WebDriver::Wait.new(:timeout => 20)
         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)
+          item = wait.until {
+            x = self.CurrentUrl.upcase.start_with?($page.Url.upcase)
+            y = StartsWithComparison.new(Evaluation.new(self.CurrentUrl.upcase, $page.Url.upcase))
+            if(comparator.Compare(x == false, true))
+              $page.AlternateUrls.each do |url|
+                if(comparator.Compare(x == false, true))
+                  x = self.CurrentUrl.upcase.start_with?(url.upcase)
+                  y = StartsWithComparison.new(Evaluation.new(self.CurrentUrl.upcase, url.upcase))
                 end
               end
             end
-            x
+
+            return y if comparator.Compare(x == true, true)
           }
         rescue
-          temp = Evaluation.new(self.CurrentUrl, nav.Url)
-          return temp, nav
+          temp = StartsWithComparison.new(Evaluation.new(self.CurrentUrl, $page.Url))
+          return temp
         end
 
-        temp = Evaluation.new(found, true)
-        return temp, nav
+        temp = item
+        return temp
       end
 
       def Run(background)
@@ -115,24 +132,20 @@ module Sapphire
         scenario.Run
       end
 
-      def ShouldShow(page)
-        self.ShouldNavigateTo page
-      end
-
-      def ShouldTransitionTo(url)
+      def ShouldTransitionTo(url, comparator)
         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)
+          temp = StartsWithComparison.new(Evaluation.new(self.CurrentUrl.upcase, url.upcase))
           @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)
+          temp = StartsWithComparison.new(Evaluation.new(self.CurrentUrl.upcase, x.upcase))
           @rootUrl = x
         end
 
         return temp
       end
 
-      def FindItem(array)
+      def FindItem(array, comparator = nil)
         masterWait = Selenium::WebDriver::Wait.new(:timeout => 5)
 
         element = masterWait.until {
@@ -150,13 +163,16 @@ module Sapphire
             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
 
           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
         }
         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
       end
 

data/lib/sapphire/Configuration/AppConfig.rb

@@ -11,7 +11,7 @@ module Sapphire
       end
 
       def self.Current
-        @@instance
+        @@instance if $config
       end
 
       def Browser

data/lib/sapphire/DSL.rb

@@ -1,10 +1,15 @@
+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/Extensions/*.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 }

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

@@ -1,32 +1,18 @@
 module Sapphire
   module DSL
     module Browser
-      def ExecuteHashAgainstControl(hash, page, &block)
+      def ExecuteHashAgainstControl(hash, &block)
         hash.keys.each do |key|
-          page.fields.each do |field|
-            field.keys.each do |field_key|
-              if(field_key == key)
-                block.call(field[field_key], hash[key])
-                return
-              end
-            end
-          end
+          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
+        raise "Cannot find control matching " + hash.to_s + " for page " + $page.to_s
       end
 
-      def ExecuteAgainstControl(item, page, &block)
-        page.fields.each do |field|
-          field.keys.each do |field_key|
-            if(field_key == item)
-              block.call(field[field_key], item)
-              return
-            end
-          end
-        end
+      def ExecuteAgainstControl(item, &block)
+        return block.call($page.Get(item), item) if($page.Contains item)
 
-        raise "Cannot find controls matching: " + item + "for page " + @page.to_s
+        raise "Cannot find controls matching: " + item.to_s + "for page " + $page.to_s
       end
     end
   end

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

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

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

@@ -1,8 +1,8 @@
 module Sapphire
   module DSL
     module Browser
-      def By(value, compare1, compare2)
-        return value, compare1, compare2
+      def By(value)
+        value
       end
     end
   end

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

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

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

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

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

@@ -1,10 +1,9 @@
-module Sapphire
-  module DSL
-    module Browser
-      def For(item)
-        {item => GetPageField(item).Text}
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def For(item)
+         {item => GetPageField(item).Text}
+      end
+    end
+  end
+end

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

@@ -4,11 +4,11 @@ module Sapphire
       class Browser
         def Close
           sleep(2)
-          $browser.Close
+          $driver.Close
         end
 
         def Switch
-          $browser.Switch
+          $driver.Switch
         end
       end
     end

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

@@ -1,24 +1,42 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Day(value, compare1, compare2)
-        Day.new(value, compare1, compare2)
-      end
-
-      class Day
-
-        def initialize(value, compare1, compare2)
-          @value = value
-          @compare1 = compare1
-          @compare2 = compare2
-        end
-
-        def Differ()
-          return (@compare1 + @value) == @compare2
-        end
-
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Day(value)
+        day = Day.new(value, $compare1, $compare2)
+        $compare1 = nil
+        $compare2 = nil
+        return day
+      end
+
+      class Day
+
+        def initialize(value, compare1, compare2)
+          @value = value
+          if(compare1.is_a?(String))
+            @compare1 = Date.parse(compare1)
+          else
+            @compare1 = compare1
+          end
+
+          if(compare2.is_a?(String))
+            @compare2 = Date.parse(compare2)
+          else
+            @compare2 = compare2
+          end
+        end
+
+        def Differ(comparator)
+          return Fix(DifferComparison.new(Evaluation.new(@compare1 + @value, @compare2)), comparator)
+        end
+
+        def Fix(evaluation, comparator)
+          comparator = comparator.Create(evaluation)
+
+          comparator
+        end
+
+      end
+    end
+  end
+end
+

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

@@ -3,7 +3,7 @@ module Sapphire
     module Browser
       class Enter
           def Press
-            $browser.Type("\n")
+            $driver.Type("\n")
           end
       end
     end

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

@@ -1,24 +1,42 @@
-module Sapphire
-  module DSL
-    module Browser
-      def Month(value, compare1, compare2)
-        Month.new(value, compare1, compare2)
-      end
-
-      class Month
-
-        def initialize(value, compare1, compare2)
-          @value = value
-          @compare1 = compare1
-          @compare2 = compare2
-        end
-
-        def Differ()
-          return (@compare1 >> @value) == @compare2
-        end
-
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Browser
+      def Month(value)
+        month = Month.new(value, $compare1, $compare2)
+        $compare1 = nil
+        $compare2 = nil
+        return month
+      end
+
+      class Month
+
+        def initialize(value, compare1, compare2)
+          @value = value
+          if(compare1.is_a?(String))
+            @compare1 = Date.parse(compare1)
+          else
+            @compare1 = compare1
+          end
+
+          if(compare2.is_a?(String))
+            @compare2 = Date.parse(compare2)
+          else
+            @compare2 = compare2
+          end
+        end
+
+        def Differ(comparator)
+          return Fix(DifferComparison.new(Evaluation.new(@compare1 >> @value, @compare2)), comparator)
+        end
+
+        def Fix(evaluation, comparator)
+          comparator = comparator.Create(evaluation)
+
+          comparator
+        end
+
+      end
+    end
+  end
+end
+