Signed-off-by: Marcus Bratton <[email protected]>

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sapphire (0.7.20)
+    sapphire (0.7.21)
       Platform
       colorize
       selenium-webdriver

bin/sapphire

@@ -4,6 +4,7 @@ require 'rubygems'
 require 'sapphire'
 include Sapphire::Sapphire
 
+$console = $stdout
 $reporters = []
 $instances = []
 
@@ -37,9 +38,7 @@ def Process()
     $instances.last.file = @file if $instances.last.is_a? HtmlReporter
   end
 
-  if $instances.empty?
-    $instances << ConsoleReporter.new()
-  end
+  $instances << ConsoleReporter.new()
 
   if Runner.instance.test_plans.count > 0
     Report do |x| x.BeginTesting end
@@ -67,7 +66,7 @@ if @file.nil?
   Process()
 else
   File.open(@file, 'w') do |f|
-    $stdout = f
+    $output = f
     Process()
   end
 end

lib/sapphire/DSL/TestPlans/TestPlan.rb

@@ -47,15 +47,7 @@ def AddHandler(handler)
         end
 
         def execute
-          #Report do |x| x.BeginTesting end
-          #$stdout.puts ""
-          #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
 
         def Report(&block)

lib/sapphire/Testing/ConsoleReporter.rb

@@ -9,7 +9,8 @@ def initialize
         @pending_count = 0
         @broken_count = 0
         @test_count = 0
-        @output = $stdout
+        $console ||= $stdout
+        @output = $console
       end
 
       def ScenarioStart(scenario)

lib/sapphire/Testing/HtmlReporter.rb

@@ -15,7 +15,8 @@ def initialize()
         @pending_count = 0
         @broken_count = 0
         @test_count = 0
-        @output = $stdout
+        $output ||= $stdout
+        @output = $output
         @file = ""
       end
 

lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.7.20"
+  VERSION = "0.7.21"
 end

tests/BasicPage/TestPlans/NestedTestPlans.rb

@@ -1,23 +1,6 @@
 require File.expand_path('../../includes', File.dirname(__FILE__))
 
-require 'rubygems'
-require 'sapphire'
-include Sapphire::Sapphire
 
-def Report(&block)
-  $instances.each do |reporter|
-    block.call reporter
-  end
-end
-
-if $instances.empty?
-  $instances << ConsoleReporter.new()
-end
-
-Report do |x| x.BeginTesting end
 
 load File.expand_path(File.dirname(__FILE__)) + "/Regression.rb"
 load File.expand_path(File.dirname(__FILE__)) + "/Regression.rb"
-
-Report do |x| x.TestingComplete end
-Report do |x| x.OutputResults end