sapphire 0.3.0 → 0.3.1

data/bin/sapphire

@@ -1,12 +1,26 @@
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'sapphire'
-
 include Sapphire::Sapphire
 
+reporter = ConsoleReporter.new()
+
 ARGV.each do |arg|
+  if !arg.end_with? ".rb"
+    next
+  end
   require arg
-  Runner.instance.last_scenario.execute 1
+  Runner.instance.last_scenario.file_name = arg
+end
+
+if Runner.instance.test_plans.count > 0
+  Runner.instance.last_test_plan.execute reporter
+else
+  Runner.instance.scenarios.each do |scenario|
+    scenario.execute reporter
+  end
 end
 
-ConsoleReporter.new().OutputResults
+
+
+reporter.OutputResults

data/lib/sapphire.rb

@@ -1,5 +1,4 @@
 require "rubygems"
-require "rspec"
 require 'yaml'
 require 'selenium-webdriver'
 require 'delegate'

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

@@ -18,7 +18,17 @@ module Sapphire
         end
 
         def Evaluate(evaluation)
-          evaluation.left.should_not == evaluation.right
+          if(evaluation.left == evaluation.right)
+            messages = []
+
+            messages << "expected NOT: (nil)" if evaluation.left == nil
+            messages << "expected NOT: " + evaluation.left.to_s if evaluation.left != nil
+            messages << "got: (nil)" if evaluation.right == nil
+            messages << "got: " + evaluation.right.to_s if evaluation.right != nil
+
+            raise ExpectationException.new(messages)
+          end
+          #evaluation.left.should_not == evaluation.right
         end
 
         def execute

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

@@ -21,7 +21,16 @@ module Sapphire
         end
 
         if(results.is_a? Evaluation)
-          results.left.should == results.right
+          if(results.left != results.right)
+            messages = []
+
+            messages << "expected: (nil)" if results.left == nil
+            messages << "expected: " + results.left.to_s if results.left != nil
+            messages << "got: (nil)" if results.right == nil
+            messages << "got: " + results.right.to_s if results.right != nil
+
+            raise ExpectationException.new(messages)
+          end
           return
         end
 

data/lib/sapphire/DSL/Scenarios/scenario.rb

@@ -10,6 +10,7 @@ module Sapphire
         attr_reader :givens
         attr_reader :backgrounds
         attr_reader :result
+        attr_accessor :file_name
 
         def initialize(text, &block)
           @value = text

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

@@ -2,12 +2,11 @@ module Sapphire
   module DSL
     module TestPlans
       class FileHandler
-        def Handle(item)
+        def Handle(item, reporter)
           x = AppConfig.Current.SpecsPath || ""
           require File.expand_path(x + item, __FILE__)
-          $stdout.puts item + ": "
-          Runner.instance.last_scenario.execute 1
-          $stdout.puts ""
+          Runner.instance.last_scenario.file_name = item
+          Runner.instance.last_scenario.execute reporter
         end
       end
     end

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

@@ -2,13 +2,12 @@ module Sapphire
   module DSL
     module TestPlans
       class PathHandler
-        def Handle(item)
+        def Handle(item, reporter)
           x = AppConfig.Current.SpecsPath || ""
           Dir[x + item + '*.rb'].each  do |file|
             require file
-            $stdout.puts file + ": "
-            Runner.instance.last_scenario.execute 1
-            $stdout.puts ""
+            Runner.instance.last_scenario.file_name = file
+            Runner.instance.last_scenario.execute reporter
           end
         end
       end

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

@@ -3,8 +3,9 @@ module Sapphire
     module TestPlans
 
       def TestPlan(text, &block)
-         Runner.instance.add_test_plan(TestPlan.new(text, &block))
-         Runner.instance.last_test_plan.execute
+        reporter = ConsoleReporter.new()
+        Runner.instance.add_test_plan(TestPlan.new(text, &block))
+        Runner.instance.last_test_plan.execute reporter
       end
 
       class TestPlan
@@ -46,10 +47,10 @@ module Sapphire
           @handlers << handler
         end
 
-        def execute
+        def execute(reporter)
           $stdout.puts ""
           @block.call
-          ConsoleReporter.new().OutputResults
+          reporter.OutputResults
         end
       end
     end

data/lib/sapphire/Strategies/NullModifier.rb

@@ -15,7 +15,18 @@ class NullModifier
 
   def Evaluate(evaluation)
     return @modifier.Evaluate(evaluation) if @modifier != nil
-    evaluation.left.should == evaluation.right if @modifier == nil
+
+    if(evaluation.left != evaluation.right)
+      messages = []
+
+      messages << "expected: (nil)" if evaluation.left == nil
+      messages << "expected: " + evaluation.left.to_s if evaluation.left != nil
+      messages << "got: (nil)" if evaluation.right == nil
+      messages << "got: " + evaluation.right.to_s if evaluation.right != nil
+
+      raise ExpectationException.new(messages)
+    end
+    #evaluation.left.should == evaluation.right if @modifier == nil
   end
 
   def execute

data/lib/sapphire/TeamCity/TeamCityReporter.rb

@@ -0,0 +1,118 @@
+require 'teamcity/utils/logger_util'
+require 'teamcity/rake_exceptions'
+require 'teamcity/rakerunner_consts'
+
+SPEC_FORMATTER_LOG = ::Rake::TeamCity::Utils::RSpecFileLogger.new
+SPEC_FORMATTER_LOG.log_msg("spec formatter.rb loaded.")
+
+require 'teamcity/runner_common'
+require 'teamcity/utils/service_message_factory'
+require 'teamcity/utils/std_capture_helper'
+require 'teamcity/utils/runner_utils'
+require 'teamcity/utils/url_formatter'
+
+module Sapphire
+  module Testing
+    module TeamCity
+      class TeamCityReporter < Reporter
+        include ::Rake::TeamCity::StdCaptureHelper
+        include ::Rake::TeamCity::RunnerUtils
+        include ::Rake::TeamCity::RunnerCommon
+        include ::Rake::TeamCity::Utils::UrlFormatter
+
+        TEAMCITY_FORMATTER_INTERNAL_ERRORS =[]
+        @@reporter_closed = false
+        @@RUNNING_EXAMPLES_STORAGE = {}
+
+        ########## Teamcity #############################
+
+        def log(msg)
+          send_msg(msg)
+
+          # returns:
+          msg
+        end
+
+        def self.closed?()
+          @@reporter_closed
+        end
+
+        def self.close()
+          @@reporter_closed = true
+        end
+
+        ########## Teamcity #############################
+
+        def initialize()
+          # Setups Test runner's MessageFactory
+          set_message_factory(::Rake::TeamCity::MessageFactory)
+
+          # Initializes
+          @groups_stack = []
+
+          @example_count = 100
+          if ::Rake::TeamCity.is_in_idea_mode
+            log(@message_factory.create_tests_count(@example_count))
+          elsif ::Rake::TeamCity.is_in_buildserver_mode
+            log(@message_factory.create_progress_message("Starting.. (#{@example_count} examples)"))
+          end
+
+        end
+
+        def PrintItem(result, depth)
+
+        end
+
+        def ScenarioStart(scenario)
+          @message_factory.create_suite_started(scenario.text, scenario.file_name)
+        end
+
+        def ScenarioComplete(scenario)
+          @message_factory.create_suite_finished(scenario.text)
+        end
+
+        def PrintHeader()
+
+        end
+
+        def PrintFooter()
+
+        end
+
+        def InsertLineBreak()
+
+        end
+
+        def PrePrint
+
+        end
+
+        def PostPrint
+
+        end
+
+        def TestStarted(test)
+          @@RUNNING_EXAMPLES_STORAGE[test.object_id] = test
+        end
+
+        def TestCompleted(test)
+          if test.type == "pending"
+            @message_factory.create_test_output_message(test.text, true, "Pending: Not Yet Implemented")
+            @message_factory.create_test_ignored(test.text, "Pending: Not Yet Implemented")
+            return
+          end
+          if test.type == "pass"
+            @message_factory.create_test_finished(test.text, test.time)
+            return
+          end
+          if test.type == "fail"
+            @message_factory.create_test_output_message(test.text, true, "enter error here")
+            @message_factory.create_test_failed(test.text, test.message, "enter backtrace here")
+          end
+
+          @@RUNNING_EXAMPLES_STORAGE.delete(test.object_id)
+        end
+      end
+    end
+  end
+end

data/lib/sapphire/Testing/ConsoleReporter.rb

@@ -13,8 +13,24 @@ module Sapphire
           $stdout.puts " ## Not Yet Implemented ##"
         else
           $stdout.puts result.text.red
-          Indent(depth+1)
-          $stdout.puts result.message
+          if result.messages.is_a? Array
+            result.messages.each do |message|
+              Indent(depth+1)
+              $stdout.puts message
+            end
+
+          else
+            Indent(depth+1)
+            $stdout.puts result.messages
+          end
+          $stdout.puts ""
+          result.stack.each do |line|
+            if (!line.include? "sapphire")
+              Indent(depth+1)
+              $stdout.puts line
+            end
+          end
+
         end
       end
 
@@ -22,6 +38,14 @@ module Sapphire
         $stdout.puts ""
       end
 
+      def ScenarioStart(scenario)
+        $stdout.puts scenario.file_name + ": "
+      end
+
+      def ScenarioComplete(scenario)
+        $stdout.puts ""
+      end
+
       def PrintFooter()
         $stdout.puts ""
         $stdout.puts "Finished in " + self.time.round(2).to_s + " seconds."
@@ -48,6 +72,17 @@ module Sapphire
       def PostPrint
 
       end
+
+      def TestStarted(test)
+
+      end
+
+      def TestCompleted(test)
+        $stdout.print "*".yellow if test.type == "pending"
+        $stdout.print ".".green if test.type == "pass"
+        $stdout.print "F".red if test.type == "fail"
+      end
+
     end
   end
 end

data/lib/sapphire/Testing/Executable.rb

@@ -1,28 +1,29 @@
 module Sapphire
   module Testing
     module Executable
-      def execute(id)
+      def execute(reporter)
         start = Time.now
+        reporter.TestStarted(self.text)
         begin
           if(self.value.is_a? Pending)
-            self.AddResult(ResultTree.new(self.text, TestResult.new("pending", self, "Pending", "", Time.now - start, id)))
-            $stdout.print "*".yellow
+            result = ResultTree.new(self.text, TestResult.new("pending", self, "Pending", "", Time.now - start))
+            self.AddResult(result)
+            reporter.TestCompleted result
             return
           end
           self.block.call
-          self.AddResult(ResultTree.new(self.text, TestResult.new("pass", self, "Success", "", Time.now - start, id)))
-          $stdout.print ".".green
+          result = ResultTree.new(self.text, TestResult.new("pass", self, "Success", "", Time.now - start))
+          self.AddResult(result)
+          reporter.TestCompleted result
         rescue => msg
-          stack = ""
-          msg.backtrace.each do |line|
-            stack += "\r\n" + line
-          end
-
-          self.AddResult(ResultTree.new(self.text, TestResult.new("fail", self, msg.message, stack, Time.now - start, id)))
-          $stdout.print "F".red
+          stack = msg.backtrace
+          message = msg.messages if (msg.is_a? ExpectationException)
+          message ||= msg.message
+          result = ResultTree.new(self.text, TestResult.new("fail", self, message, stack, Time.now - start))
+          self.AddResult(result)
+          reporter.TestCompleted result
         end
       end
-      @result
     end
   end
 end

data/lib/sapphire/Testing/ExpectationException.rb

@@ -0,0 +1,11 @@
+module Sapphire
+  module Testing
+    class ExpectationException < StandardError
+      attr_reader :messages
+
+      def initialize(messages)
+        @messages = messages
+      end
+    end
+  end
+end

data/lib/sapphire/Testing/HtmlReporter.rb

@@ -2,19 +2,31 @@ module Sapphire
   module Testing
     class HtmlReporter < Reporter
 
+      def ScenarioStart(scenario)
+
+      end
+
+      def ScenarioComplete
+
+      end
+
+      def PrintItem(result, depth)
+
+      end
+
       def PrintHeader()
 
       end
 
-      def Output(result, tabber)
+      def PrintFooter()
 
       end
 
-      def PrePrint
+      def InsertLineBreak()
 
       end
 
-      def PrintResult(entry)
+      def PrePrint
 
       end
 
@@ -22,7 +34,11 @@ module Sapphire
 
       end
 
-      def PrintFooter()
+      def TestStarted(test)
+
+      end
+
+      def TestCompleted(test)
 
       end
 

data/lib/sapphire/Testing/ResultTree.rb

@@ -5,7 +5,7 @@ module Sapphire
       attr_accessor :results
       attr_accessor :type
       attr_accessor :text
-      attr_accessor :message
+      attr_accessor :messages
       attr_accessor :stack
       attr_accessor :time
       attr_accessor :parent
@@ -23,7 +23,7 @@ module Sapphire
           @iconCls = "error" if result.type == "pending"
           @time = result.execution_time
           @expanded = true
-          @message = result.message
+          @messages = result.messages
           @stack = result.stack
         end
         @text = text

data/lib/sapphire/Testing/TestResult.rb

@@ -4,17 +4,15 @@ module Sapphire
 
       attr_reader :execution_time
       attr_reader :message
-      attr_reader :myId
       attr_reader :item
       attr_reader :type
       attr_reader :stack
-      attr_reader :message
+      attr_reader :messages
 
-      def initialize(type, item, message, stack, execution_time, id)
-        @myId = id
+      def initialize(type, item, message, stack, execution_time)
         @item = item
         @execution_time = execution_time
-        @message = message
+        @messages = message
         @stack = stack
         @type = type
       end

data/lib/sapphire/Testing/TestRunnerAdapter.rb

@@ -2,14 +2,15 @@ module Sapphire
   module Testing
     module TestRunnerAdapter
 
-      def execute(id)
+      def execute(reporter)
+        reporter.ScenarioStart self
         @failures = []
         @pendings = []
         @success = []
 
         self.backgrounds.each do |b|
 
-          b.execute id
+          b.execute reporter
 
         end
 
@@ -17,29 +18,29 @@ module Sapphire
 
           g.when.each do |w|
 
-            g.execute id
+            g.execute reporter
 
             g.and.each do |g_a|
 
-              g_a.execute id
+              g_a.execute reporter
 
             end
 
-            w.execute id
+            w.execute reporter
 
             w.and.each do |w_a|
 
-              w_a.execute id
+              w_a.execute reporter
 
             end
 
             w.then.each do |t|
 
-              t.execute id
+              t.execute reporter
 
               t.and.each do |t_a|
 
-                t_a.execute id
+                t_a.execute reporter
 
               end
 
@@ -49,12 +50,14 @@ module Sapphire
 
           if(g.finally)
 
-            g.finally.execute id
+            g.finally.execute reporter
 
           end
 
         end
 
+        reporter.ScenarioComplete self
+
       end
     end
   end

data/lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-22 00:00:00.000000000Z
+date: 2011-09-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &9278508 !ruby/object:Gem::Requirement
+  requirement: &9381432 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9278508
+  version_requirements: *9381432
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &9278172 !ruby/object:Gem::Requirement
+  requirement: &9381132 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9278172
+  version_requirements: *9381132
 - !ruby/object:Gem::Dependency
   name: win32console
-  requirement: &9277848 !ruby/object:Gem::Requirement
+  requirement: &9380832 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9277848
+  version_requirements: *9380832
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email:
@@ -126,14 +126,15 @@ files:
 - lib/sapphire/Strategies/NullModifier.rb
 - lib/sapphire/Strategies/Strategy.rb
 - lib/sapphire/Strategies/SymbolStrategy.rb
+- lib/sapphire/TeamCity/TeamCityReporter.rb
 - lib/sapphire/Testing/ConsoleReporter.rb
 - lib/sapphire/Testing/Executable.rb
+- lib/sapphire/Testing/ExpectationException.rb
 - lib/sapphire/Testing/HtmlReporter.rb
 - lib/sapphire/Testing/RakeTask.rb
 - lib/sapphire/Testing/Reporter.rb
 - lib/sapphire/Testing/ResultList.rb
 - lib/sapphire/Testing/ResultTree.rb
-- lib/sapphire/Testing/RSpecRunner.rb
 - lib/sapphire/Testing/ScenarioResult.rb
 - lib/sapphire/Testing/TestResult.rb
 - lib/sapphire/Testing/TestRunnerAdapter.rb

data/lib/sapphire/Testing/RSpecRunner.rb

@@ -1,87 +0,0 @@
-module Sapphire
-  module Testing
-    module RSpecRunner
-      def execute(id)
-        @block.call
-        s = self
-        x = @givens
-        y = @backgrounds
-        background_pending = false
-
-        y.each do |background|
-          if(background.value.instance_of? Pending)
-            background_pending = true
-          end
-        end
-
-        x.each do |g|
-        describe g.text do
-
-          before :all do
-            y.each do |b|
-              if(!b.value.instance_of? Pending and !s.value.instance_of? Pending)
-                b.block.call()
-              end
-            end
-          end
-
-          before :each do
-            if(!g.value.instance_of? Pending and !s.value.instance_of? Pending and !background_pending)
-              g.block.call()
-              g.and.each do |a|
-                a.block.call()
-              end
-            end
-          end
-
-          g.when.each do |w|
-            describe w.text do
-              before do
-                if(!w.value.instance_of? Pending and !s.value.instance_of? Pending and !background_pending)
-                  w.block.call()
-
-                  if (w.and.count > 0)
-                    w.and.each do |a|
-                      a.block.call()
-                    end
-                  end
-                end
-              end
-
-              if (w.then.count > 0)
-                w.then.each do |t|
-                  if(!t.value.instance_of? Pending and !w.value.instance_of? Pending and !g.value.instance_of? Pending and !s.value.instance_of? Pending and !background_pending)
-                    it t.text do
-                      t.block.call()
-                      t.and.each do |a|
-                        if(!a.value.instance_of? Pending)
-                          a.block.call()
-                        end
-                      end
-                    end
-                  else
-                    pending t.text
-                  end
-                end
-              end
-            end
-          end
-
-          after :all do
-            if(g.finally and !g.finally.value.instance_of? Pending and !s.value.instance_of? Pending and !background_pending)
-              g.finally.block.call()
-
-              g.finally.and.each do |a|
-                a.block.call()
-              end
-            end
-          end
-          end
-        end
-
-        true
-      end
-    end
-  end
-end
-