sapphire 0.4.0 → 0.4.1

data/bin/sapphire

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

data/lib/sapphire.rb

@@ -11,7 +11,7 @@ require 'colorize'
 require File.expand_path(File.dirname(__FILE__) +'/sapphire/Strategies/Strategy.rb', __FILE__)
 require File.expand_path(File.dirname(__FILE__) +'/sapphire/Testing/Reporter.rb', __FILE__)
 Dir[File.dirname(__FILE__) + '/sapphire/Testing/*.rb'].each {|file| require file }
-Dir[File.dirname(__FILE__) + '/sapphire/TeamCity/*.rb'].each {|file| require file }
+#Dir[File.dirname(__FILE__) + '/sapphire/TeamCity/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/sapphire/Configuration/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/sapphire/WebAbstractions/Controls/Base/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/sapphire/WebAbstractions/Controls/*.rb'].each {|file| require file }
@@ -39,7 +39,7 @@ module Sapphire
     include JobAbstractions
     include WebAbstractions
     include Testing
-    include Testing::TeamCity
+    #include Testing::TeamCity
     include UI
   end
 end

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

@@ -3,7 +3,7 @@ module Sapphire
     module TestPlans
 
       def TestPlan(text, &block)
-        reporter = TeamCityReporter.new()
+        reporter = ConsoleReporter.new()
         Runner.instance.add_test_plan(TestPlan.new(text, reporter, &block))
       end
 
@@ -51,6 +51,7 @@ module Sapphire
           @reporter.BeginTesting
           $stdout.puts ""
           @block.call
+          @reporter.TestingComplete
           @reporter.OutputResults
         end
       end

data/lib/sapphire/TeamCity/TeamCityReporter.rb

@@ -154,6 +154,10 @@ module Sapphire
         def BeginTesting
           log(@message_factory.create_test_reported_attached)
         end
+
+        def OutputResults()
+
+        end
       end
     end
   end

data/lib/sapphire/Testing/ConsoleReporter.rb

@@ -2,6 +2,28 @@ module Sapphire
   module Testing
     class ConsoleReporter < Reporter
 
+      def initialize
+        @not_passing = {}
+        @passing_count = 0
+        @failing_count = 0
+        @pending_count = 0
+        @test_count = 0
+      end
+
+      def ScenarioStart(scenario)
+        $stdout.puts scenario.file_name + ": "
+      end
+
+      def ScenarioComplete(scenario)
+        $stdout.puts ""
+      end
+
+      def Indent(depth)
+        (1..depth).each do
+          $stdout.print "\t"
+        end
+      end
+
       def PrintItem(result, depth)
         Indent(depth)
 
@@ -34,57 +56,96 @@ module Sapphire
         end
       end
 
-      def PrintHeader()
+      def InsertLineBreak()
         $stdout.puts ""
       end
 
-      def ScenarioStart(scenario)
-        $stdout.puts scenario.file_name + ": "
+      def TestStarted(test)
+        @test_count = @test_count + 1
       end
 
-      def ScenarioComplete(scenario)
-        $stdout.puts ""
+      def TestPassed(test)
+        @passing_count = @passing_count + 1
+        $stdout.print ".".green
       end
 
-      def PrintFooter()
-        $stdout.puts ""
-        $stdout.puts "Finished in " + self.time.round(2).to_s + " seconds."
-        $stdout.puts "Test Count: " + self.test_count.to_s
-        $stdout.puts "Passing: " + self.passing_count.to_s.green
-        $stdout.puts "Failing: " + self.failing_count.to_s.red
-        $stdout.puts "Pending: " + self.pending_count.to_s.yellow
+      def TestFailed(test)
+        @failing_count = @failing_count + 1
+        Add test
+        $stdout.print "F".red
       end
 
-      def Indent(depth)
-        (1..depth).each do
-          $stdout.print "\t"
+      def TestPending(test)
+        @pending_count = @pending_count + 1
+        Add test
+        $stdout.print "*".yellow
+      end
+
+      def Add(r)
+        result_passes = r.type == "pass"
+
+        if !result_passes and (r.item.is_a? Given or r.item.is_a? When or r.item.is_a? Background)
+          @not_passing = @not_passing.merge({ r => r })
+        elsif !result_passes and (r.item.is_a? And or r.item.parent.is_a? Given)
+          @not_passing = @not_passing.merge({ r.parent => r.parent })
+        elsif !result_passes and (r.item.is_a? And and r.parent.item.is_a? When)
+          @not_passing = @not_passing.merge({ r.parent => r.parent })
+        elsif !result_passes and (r.item.is_a? Then)
+          @not_passing = @not_passing.merge({ r.parent => r.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 => r.parent.parent })
         end
+
       end
 
-      def InsertLineBreak()
+      def OutputResults()
         $stdout.puts ""
-      end
 
-      def PrePrint
+        @not_passing.keys.each do |key|
+          self.PrintResult @not_passing[key]
+        end
 
+        $stdout.puts ""
+        $stdout.puts "Finished in " + (@end - @start).round(2).to_s + " seconds."
+        $stdout.puts "Test Count: " + @test_count.to_s
+        $stdout.puts "Passing: " + @passing_count.to_s.green
+        $stdout.puts "Failing: " + @failing_count.to_s.red
+        $stdout.puts "Pending: " + @pending_count.to_s.yellow
       end
 
-      def PostPrint
-
-      end
+      def Output(result, depth)
 
-      def TestStarted(test)
+        self.PrintItem(result, depth)
 
+        result.results.each do |sub_result|
+          self.Output(sub_result, depth+1)
+        end
       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"
+      def PrintResult(entry)
+        if entry.item.is_a? Background
+          self.InsertLineBreak
+          self.Output entry, 0
+          self.InsertLineBreak
+        elsif entry.item.is_a? Given
+          self.InsertLineBreak
+          self.Output entry, 1
+          self.InsertLineBreak
+        elsif entry.item.is_a? When
+          self.PrintItem entry.parent, 0
+          self.Output entry, 1
+          self.InsertLineBreak
+        else
+          self.PrintResult entry.parent
+        end
       end
 
       def BeginTesting
+        @start = DateTime.now
+      end
 
+      def TestingComplete
+        @end = DateTime.now
       end
 
     end

data/lib/sapphire/Testing/Executable.rb

@@ -8,20 +8,20 @@ module Sapphire
           if(self.value.is_a? Pending)
             result = ResultTree.new(self.text, TestResult.new("pending", self, "Pending", "", Time.now - start))
             self.AddResult(result)
-            reporter.TestCompleted result
+            reporter.TestPending result
             return
           end
           self.block.call
           result = ResultTree.new(self.text, TestResult.new("pass", self, "Success", "", Time.now - start))
           self.AddResult(result)
-          reporter.TestCompleted result
+          reporter.TestPassed result
         rescue => msg
           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
+          reporter.TestFailed result
         end
       end
     end

data/lib/sapphire/Testing/HtmlReporter.rb

@@ -2,49 +2,301 @@ module Sapphire
   module Testing
     class HtmlReporter < Reporter
 
-      def ScenarioStart(scenario)
-
+      def initialize()
+        @failures = []
+        @example_group_number = 0
+        @passing_count = 0
+        @failing_count = 0
+        @pending_count = 0
+        @test_count = 0
       end
 
-      def ScenarioComplete
+      def TestStarted(test)
 
       end
 
-      def PrintItem(result, depth)
-
+      def TestPassed(test)
+        @passing_count = @passing_count + 1
+        $stdout.puts "    <dd class=\"spec passed\"><span class=\"passed_spec_name\">#{test.text}</span></dd>"
       end
 
-      def PrintHeader()
+      def TestFailed(test)
 
-      end
+        failure_style = 'failed'
+        $stdout.puts "    <script type=\"text/javascript\">makeRed('rspec-header');</script>" unless @header_red
+        @header_red = true
+        $stdout.puts "    <script type=\"text/javascript\">makeRed('example_group_#{@example_group_number}');</script>" unless @example_group_red
+        @example_group_red = true
+        $stdout.puts "    <dd class=\"spec #{failure_style}\">"
+        $stdout.puts "      <span class=\"failed_spec_name\">#{test.text}</span>"
+        $stdout.puts "      <div class=\"failure\" id=\"failure_#{@test_count}\">"
 
-      def PrintFooter()
+        if test.messages.is_a? Array
+          message_block = ""
+          test.messages.each do |message|
+            message_block += message + "<br>"
+          end
+          $stdout.puts "        <div class=\"message\"><pre>#{message_block}</pre></div>"
+        else
+          $stdout.puts "        <div class=\"message\"><pre>#{test.messages}</pre></div>"
+        end
 
-      end
+        test.stack.each do |line|
+          if (!line.include? "sapphire")
+            $stdout.puts "        <div class=\"backtrace\"><pre>#{line}</pre></div>"
+          end
+        end
 
-      def InsertLineBreak()
+        $stdout.puts "      </div>"
+        $stdout.puts "    </dd>"
+      end
 
+      def TestPending(test)
+        $stdout.puts "    <script type=\"text/javascript\">makeYellow('rspec-header');</script>" unless @header_red
+        $stdout.puts "    <script type=\"text/javascript\">makeYellow('example_group_#{@example_group_number}');</script>" unless @example_group_red
+        $stdout.puts "    <dd class=\"spec not_implemented\"><span class=\"not_implemented_spec_name\">#{test.text} (PENDING: ### Not Yet Implemented ###)</span></dd>"
       end
 
-      def PrePrint
+      def TestingComplete
+        @end = Time.now
+
+        totals = "#{@test_count} example#{'s' unless @test_count == 1}, #{@failure_count} failure#{'s' unless @failure_count == 1}"
+        totals << ", #{@pending_count} pending" if @pending_count > 0
 
+        $stdout.puts "<script type=\"text/javascript\">document.getElementById('duration').innerHTML = \"Finished in <strong>#{(@end - @start).round(2).to_s} seconds</strong>\";</script>"
+        $stdout.puts "<script type=\"text/javascript\">document.getElementById('totals').innerHTML = \"#{totals}\";</script>"
+        $stdout.puts "</div>"
+        $stdout.puts "</div>"
+        $stdout.puts "</body>"
+        $stdout.puts "</html>"
       end
 
-      def PostPrint
+      def BeginTesting
+        @start = Time.now
+        $stdout.puts html_header
+        $stdout.puts report_header
+      end
 
+      def ScenarioStart(scenario)
+        @example_group_red = false
+        @example_group_number += 1
+        unless @example_group_number == 1
+          $stdout.puts "  </dl>"
+          $stdout.puts "</div>"
+        end
+        $stdout.puts "<div class=\"example_group\">"
+        $stdout.puts "  <dl>"
+        $stdout.puts "  <dt id=\"example_group_#{@example_group_number}\">#{scenario.text}</dt>"
       end
 
-      def TestStarted(test)
+      def OutputResults()
 
       end
 
-      def TestCompleted(test)
+      def ScenarioComplete(scenario)
 
       end
 
-      def BeginTesting
+      def html_header
+          <<-EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>RSpec results</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Expires" content="-1" />
+  <meta http-equiv="Pragma" content="no-cache" />
+  <style type="text/css">
+  body {
+    margin: 0;
+    padding: 0;
+    background: #fff;
+    font-size: 80%;
+  }
+  </style>
+  <script type="text/javascript">
+    // <![CDATA[
+#{global_scripts}
+    // ]]>
+  </script>
+  <style type="text/css">
+#{global_styles}
+  </style>
+</head>
+<body>
+EOF
+        end
 
-      end
+        def report_header
+          <<-EOF
+<div class="rspec-report">
+
+<div id="rspec-header">
+  <div id="label">
+    <h1>RSpec Code Examples</h1>
+  </div>
+
+  <div id="summary">
+    <p id="totals">&nbsp;</p>
+    <p id="duration">&nbsp;</p>
+  </div>
+</div>
+
+<div class="results">
+EOF
+        end
+
+        def global_scripts
+          <<-EOF
+function moveProgressBar(percentDone) {
+  document.getElementById("rspec-header").style.width = percentDone +"%";
+}
+function makeRed(element_id) {
+  document.getElementById(element_id).style.background = '#C40D0D';
+  document.getElementById(element_id).style.color = '#FFFFFF';
+}
+
+function makeYellow(element_id) {
+  if (element_id == "rspec-header" && document.getElementById(element_id).style.background != '#C40D0D')
+  {
+    document.getElementById(element_id).style.background = '#FAF834';
+    document.getElementById(element_id).style.color = '#000000';
+  }
+  else
+  {
+    document.getElementById(element_id).style.background = '#FAF834';
+    document.getElementById(element_id).style.color = '#000000';
+  }
+}
+EOF
+        end
+
+        def global_styles
+          <<-EOF
+#rspec-header {
+  background: #65C400; color: #fff; height: 4em;
+}
+
+.rspec-report h1 {
+  margin: 0px 10px 0px 10px;
+  padding: 10px;
+  font-family: "Lucida Grande", Helvetica, sans-serif;
+  font-size: 1.8em;
+  position: absolute;
+}
+
+#summary {
+  margin: 0; padding: 5px 10px;
+  font-family: "Lucida Grande", Helvetica, sans-serif;
+  text-align: right;
+  top: 0px;
+  right: 0px;
+  float:right;
+}
+
+#summary p {
+  margin: 0 0 0 2px;
+}
+
+#summary #totals {
+  font-size: 1.2em;
+}
+
+.example_group {
+  margin: 0 10px 5px;
+  background: #fff;
+}
+
+dl {
+  margin: 0; padding: 0 0 5px;
+  font: normal 11px "Lucida Grande", Helvetica, sans-serif;
+}
+
+dt {
+  padding: 3px;
+  background: #65C400;
+  color: #fff;
+  font-weight: bold;
+}
+
+dd {
+  margin: 5px 0 5px 5px;
+  padding: 3px 3px 3px 18px;
+}
+
+dd.spec.passed {
+  border-left: 5px solid #65C400;
+  border-bottom: 1px solid #65C400;
+  background: #DBFFB4; color: #3D7700;
+}
+
+dd.spec.failed {
+  border-left: 5px solid #C20000;
+  border-bottom: 1px solid #C20000;
+  color: #C20000; background: #FFFBD3;
+}
+
+dd.spec.not_implemented {
+  border-left: 5px solid #FAF834;
+  border-bottom: 1px solid #FAF834;
+  background: #FCFB98; color: #131313;
+}
+
+dd.spec.pending_fixed {
+  border-left: 5px solid #0000C2;
+  border-bottom: 1px solid #0000C2;
+  color: #0000C2; background: #D3FBFF;
+}
+
+.backtrace {
+  color: #000;
+  font-size: 12px;
+}
+
+a {
+  color: #BE5C00;
+}
+
+/* Ruby code, style similar to vibrant ink */
+.ruby {
+  font-size: 12px;
+  font-family: monospace;
+  color: white;
+  background-color: black;
+  padding: 0.1em 0 0.2em 0;
+}
+
+.ruby .keyword { color: #FF6600; }
+.ruby .constant { color: #339999; }
+.ruby .attribute { color: white; }
+.ruby .global { color: white; }
+.ruby .module { color: white; }
+.ruby .class { color: white; }
+.ruby .string { color: #66FF00; }
+.ruby .ident { color: white; }
+.ruby .method { color: #FFCC00; }
+.ruby .number { color: white; }
+.ruby .char { color: white; }
+.ruby .comment { color: #9933CC; }
+.ruby .symbol { color: white; }
+.ruby .regex { color: #44B4CC; }
+.ruby .punct { color: white; }
+.ruby .escape { color: white; }
+.ruby .interp { color: white; }
+.ruby .expr { color: white; }
+
+.ruby .offending { background-color: gray; }
+.ruby .linenum {
+  width: 75px;
+  padding: 0.1em 1em 0.2em 0;
+  color: #000000;
+  background-color: #FFFBD3;
+}
+EOF
+        end
     end
   end
 end

data/lib/sapphire/Testing/Reporter.rb

@@ -8,133 +8,6 @@ module Sapphire
       attr_reader :pending_count
       attr_reader :time
 
-      def OutputResults()
-
-        self.GatherResults
-
-        not_passing = self.GetNotPassing
-
-        self.PrintHeader
-
-        not_passing.keys.each do |key|
-          self.PrePrint
-          self.PrintResult not_passing[key]
-          self.PostPrint
-        end
-
-        self.PrintFooter
-
-      end
-
-      def Output(result, depth)
-
-        self.PrintItem(result, depth)
-
-        result.results.each do |sub_result|
-          self.Output(sub_result, depth+1)
-        end
-      end
-
-      def PrintResult(entry)
-        if entry.item.is_a? Given or entry.item.is_a? Background
-          self.InsertLineBreak
-          self.Output entry, 0
-          self.InsertLineBreak
-        elsif entry.item.is_a? When
-          self.PrintItem entry.parent, 0
-          self.Output entry, 1
-          self.InsertLineBreak
-        else
-          self.PrintResult entry.parent
-        end
-      end
-
-      def GatherResults()
-        @test_count = 0
-        @passing_count = 0
-        @failing_count = 0
-        @pending_count = 0
-        @time = 0
-
-        Runner.instance.scenarios.each do |scenario|
-          item = scenario.result
-          @time += item.time
-          item.results.each do |result|
-            output = self.Count result
-            @test_count += output[:tests]
-            @passing_count += output[:passing]
-            @failing_count += output[:failing]
-            @pending_count += output[:pending]
-            @time += result.time
-          end
-        end
-      end
-
-      def Count(result)
-        test_count = 1
-        passing_count = 0
-        failing_count = 0
-        pending_count = 0
-
-        if result.type == 'pass'
-          passing_count += 1
-        elsif result.type == 'pending'
-          pending_count += 1
-        else
-          failing_count += 1
-        end
-
-        result.results.each do |sub_result|
-          output = self.Count(sub_result)
-
-          test_count += output[:tests]
-          passing_count += output[:passing]
-          failing_count += output[:failing]
-          pending_count += output[:pending]
-        end
-
-        { :tests => test_count, :passing => passing_count, :failing => failing_count, :pending => pending_count }
-      end
-
-      def GetNotPassing
-
-        results = {}
-
-        Runner.instance.scenarios.each do |scenario|
-          results = results.merge(self.RecurseResult(scenario.result))
-        end
-
-        results
-      end
-
-      def RecurseResult(result)
-        results = {}
-
-        result.results.each do |r|
-          result_passes = r.type == "pass"
-          if !result_passes and (r.item.is_a? Given or r.item.is_a? When or r.item.is_a? Background)
-            results = results.merge({ r => r })
-            next
-          elsif !result_passes and (r.item.is_a? And or r.item.parent.is_a? Given)
-            results = results.merge({ r.parent => r.parent })
-            next
-          elsif !result_passes and (r.item.is_a? And and r.parent.item.is_a? When)
-            results = results.merge({ r.parent => r.parent })
-            next
-          elsif !result_passes and (r.item.is_a? Then)
-            results = results.merge({ r.parent => r.parent })
-            next
-          elsif !result_passes and (r.item.is_a? And and r.parent.item.is_a? Then)
-            results = results.merge({ r.parent.parent => r.parent.parent })
-            next
-          else
-            results = results.merge(self.RecurseResult(r))
-          end
-        end
-
-        results
-      end
-
     end
   end
 end

data/lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-30 00:00:00.000000000Z
+date: 2011-10-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &9888888 !ruby/object:Gem::Requirement
+  requirement: &9401868 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9888888
+  version_requirements: *9401868
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &9888636 !ruby/object:Gem::Requirement
+  requirement: &9401592 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9888636
+  version_requirements: *9401592
 - !ruby/object:Gem::Dependency
   name: win32console
-  requirement: &9888384 !ruby/object:Gem::Requirement
+  requirement: &9401244 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9888384
+  version_requirements: *9401244
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email: