sapphire 0.7.12 → 0.7.14

data/lib/sapphire.rb

@@ -26,7 +26,6 @@ module Sapphire
     include DSL::Configuration
     include DSL::Data
     include DSL::TestPlans
-    include DSL::Events
     include Configuration
     include DataAbstractions
     include JobAbstractions
@@ -36,4 +35,6 @@ module Sapphire
     include Testing::TeamCity
     include UI
   end
-end
+end
+
+$driver = Sapphire::WebAbstractions::MetaBrowser.new(nil)

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

@@ -8,38 +8,43 @@ module Sapphire
         @rootUrl = url
       end
 
+      def Browser()
+        raise "Browser is null. Did you forget to start the browser?" if self.browser.nil?
+        self.browser
+      end
+
       def Screenshot(file_name)
-        self.browser.save_screenshot(file_name)
+        self.Browser().save_screenshot(file_name)
       end
 
       def Close
-        self.browser.close
+        self.Browser().close
       end
 
       def Switch
-        self.browser.switch_to.window(self.browser.window_handles[0])
+        self.Browser().switch_to.window(self.Browser().window_handles[0])
       end
 
       def Type(keys)
-        self.browser.action.send_keys(keys).perform()
+        self.Browser().action.send_keys(keys).perform()
       end
 
       def AcceptAlert
-        alert = self.browser.switch_to.alert
+        alert = self.Browser().switch_to.alert
         alert.accept()
-        self.browser.switch_to.window(self.browser.window_handles[0])
+        self.Browser().switch_to.window(self.Browser().window_handles[0])
       end
 
       def SetAlert(text)
-        alert = self.browser.switch_to.alert
+        alert = self.Browser().switch_to.alert
         alert.send_keys(text)
         alert.accept()
-        self.browser.switch_to.window(self.browser.window_handles[0])
+        self.Browser().switch_to.window(self.Browser().window_handles[0])
       end
 
       def FindAlert()
         begin
-          return self.browser.switch_to.alert
+          return self.Browser().switch_to.alert
         rescue
           return nil
         end
@@ -51,17 +56,17 @@ module Sapphire
       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])
+        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)
+        self.Browser().switch_to.window(self.Browser().window_handles.last)
       end
 
       def SwitchToIFrame(frame)
-        self.browser.switch_to.frame(frame)
+        self.Browser().switch_to.frame(frame)
       end
 
       def SetRootUrl(url)
@@ -80,13 +85,13 @@ module Sapphire
           $page = page
         end
 
-        self.browser.get $page.Url
+        self.Browser().get $page.Url
         $page.Init
       end
 
       def CurrentUrl
         wait = Selenium::WebDriver::Wait.new(:timeout => 20)
-        url = wait.until { x = self.browser.current_url
+        url = wait.until { x = self.Browser().current_url
             x unless x == nil
         }
 
@@ -94,7 +99,7 @@ module Sapphire
       end
 
       def Reload
-        self.browser.get self.CurrentUrl
+        self.Browser().get self.CurrentUrl
       end
 
       def GetValue(item, key)
@@ -131,12 +136,12 @@ module Sapphire
         begin
           item = wait.until {
             x = self.CurrentUrl.upcase.start_with?($page.Url.upcase)
-            y = StartsWithComparison.new(Evaluation.new($page.Url.upcase, self.CurrentUrl.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(url.upcase, self.CurrentUrl.upcase))
+                  y = StartsWithComparison.new(Evaluation.new(self.CurrentUrl.upcase, url.upcase))
                 end
               end
             end
@@ -159,11 +164,11 @@ module Sapphire
 
       def ShouldTransitionTo(url, comparator)
         if(url.instance_of?(String))
-          temp = StartsWithComparison.new(Evaluation.new(url.upcase, self.CurrentUrl.upcase))
+          temp = StartsWithComparison.new(Evaluation.new(self.CurrentUrl.upcase, url.upcase))
           @rootUrl = url
         else
           x = url.new().Url
-          temp = StartsWithComparison.new(Evaluation.new(x.upcase, self.CurrentUrl.upcase))
+          temp = StartsWithComparison.new(Evaluation.new(self.CurrentUrl.upcase, x.upcase))
           @rootUrl = x
         end
 
@@ -231,15 +236,15 @@ module Sapphire
       end
 
       def FindElement(discriminator, selector)
-         self.browser.find_element discriminator, selector
+         self.Browser().find_element discriminator, selector
       end
 
       def FindElements(discriminator, selector)
-        self.browser.find_elements discriminator, selector
+        self.Browser().find_elements discriminator, selector
       end
 
       def ExecuteScript(script)
-        self.browser.execute_script(script)
+        self.Browser().execute_script(script)
       end
 
       def Create(type)

data/lib/sapphire/DSL/Evaluations/Evaluation.rb

@@ -32,10 +32,10 @@ module Sapphire
         if(!Compare(@left, @right))
           messages = []
 
-          messages << "expected" + @comparator.Text + ": (nil)" if @left == nil
-          messages << "expected" + @comparator.Text + ": " + @left.to_s if @left != nil
-          messages << "got: (nil)" if @right == nil
-          messages << "got: " + @right.to_s if @right != nil
+          messages << "expected" + @comparator.Text + ": (nil)" if @right == nil
+          messages << "expected" + @comparator.Text + ": " + @right.to_s if @right != nil
+          messages << "got: (nil)" if @left == nil
+          messages << "got: " + @left.to_s if @left != nil
 
           raise ExpectationException.new(messages)
         end

data/lib/sapphire/DSL/TestPlans/TestPlan.rb

@@ -48,7 +48,11 @@ module Sapphire
         def execute
           Report do |x| x.BeginTesting end
           $stdout.puts ""
-          @block.call
+          begin
+            @block.call
+          rescue => e
+            Report do |x| x.TestFailed TestPlanResult.new('fail', self, e.message, e.backtrace, 0) end
+          end
           Report do |x| x.TestingComplete end
           Report do |x| x.OutputResults end
         end

data/lib/sapphire/Testing/ConsoleReporter.rb

@@ -53,7 +53,7 @@ module Sapphire
           end
           @output.puts ""
           result.stack.each do |line|
-            if (!line.include? "sapphire")
+            if (!line.include? "sapphire" and ! line.include? "-e:1")
               Indent(depth+1)
               @output.puts line
             end
@@ -108,6 +108,8 @@ module Sapphire
           @not_passing = @not_passing.merge!({ r.parent.parent => r.parent.parent })
         elsif !result_passes and (r.item.is_a? And and r.parent.item.is_a? Then)
           @not_passing = @not_passing.merge!({ r.parent.parent.parent => r.parent.parent.parent })
+        elsif r.item.is_a? TestPlan
+          @not_passing = @not_passing.merge!({ r => r })
         end
 
       end
@@ -151,6 +153,9 @@ module Sapphire
           self.PrintItem entry.parent, 0
           self.Output entry, 1
           self.InsertLineBreak
+        elsif entry.item.is_a? TestPlan
+          self.PrintItem entry, 0
+          self.InsertLineBreak
         else
           self.PrintResult entry.parent
         end

data/lib/sapphire/Testing/TestPlanResult.rb

@@ -0,0 +1,24 @@
+module Sapphire
+  module Testing
+    class TestPlanResult
+
+      attr_reader :execution_time
+      attr_reader :message
+      attr_reader :item
+      attr_reader :type
+      attr_reader :stack
+      attr_reader :messages
+      attr_reader :text
+
+      def initialize(type, item, message, stack, execution_time)
+        @item = item
+        @text = "Failure running commands in TestPlan: " + item.text
+        @execution_time = execution_time
+        @messages = message
+        @stack = stack
+        @type = type
+      end
+
+    end
+  end
+end

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

@@ -13,9 +13,11 @@ module Sapphire
       def initialize()
         @browser = self.Create :chrome
         super @browser
-        $driver = self
+        $driver = MetaBrowser.new(self)
       end
     end
+
+
   end
 end
 

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

@@ -8,7 +8,7 @@ module Sapphire
       def initialize()
         @browser = self.Create :firefox
         super(@browser)
-        $driver = self
+        $driver = MetaBrowser.new(self)
       end
 
     end

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

@@ -14,7 +14,7 @@ module Sapphire
       def initialize
         @browser = self.Create :ie
         super(@browser)
-        $driver = self
+        $driver = MetaBrowser.new(self)
       end
     end
   end

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

@@ -0,0 +1,22 @@
+module Sapphire
+  module WebAbstractions
+
+    class MetaBrowser
+      include RubySeleniumWebDriver
+
+      attr_reader :driver
+
+      def initialize(driver)
+        @driver = driver
+      end
+
+      def Browser()
+        raise "Browser is null. Did you forget to start the browser?" if self.driver.nil? or self.driver.browser.nil?
+        self.driver.browser
+      end
+
+    end
+  end
+end
+
+

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

@@ -3,7 +3,7 @@ module Sapphire
     class Title < Control
 
       def Text
-        $driver.browser.title
+        $driver.Browser().title
       end
 
     end

data/lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.7.12"
+  VERSION = "0.7.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.7.12
+  version: 0.7.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000Z
+date: 2012-03-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &9923892 !ruby/object:Gem::Requirement
+  requirement: &9813300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9923892
+  version_requirements: *9813300
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &9923640 !ruby/object:Gem::Requirement
+  requirement: &9813048 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9923640
+  version_requirements: *9813048
 - !ruby/object:Gem::Dependency
   name: Platform
-  requirement: &9923388 !ruby/object:Gem::Requirement
+  requirement: &9812796 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9923388
+  version_requirements: *9812796
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email:
@@ -180,6 +180,7 @@ files:
 - lib/sapphire/Testing/ResultList.rb
 - lib/sapphire/Testing/ResultTree.rb
 - lib/sapphire/Testing/ScenarioResult.rb
+- lib/sapphire/Testing/TestPlanResult.rb
 - lib/sapphire/Testing/TestResult.rb
 - lib/sapphire/Testing/TestRunnerAdapter.rb
 - lib/sapphire/Testing.rb
@@ -192,6 +193,7 @@ files:
 - lib/sapphire/WebAbstractions/Browsers/Chrome.rb
 - lib/sapphire/WebAbstractions/Browsers/FireFox.rb
 - lib/sapphire/WebAbstractions/Browsers/InternetExplorer.rb
+- lib/sapphire/WebAbstractions/Browsers/MetaBrowser.rb
 - lib/sapphire/WebAbstractions/Controls/AlertBox.rb
 - lib/sapphire/WebAbstractions/Controls/Base/Control.rb
 - lib/sapphire/WebAbstractions/Controls/Base/Page.rb