sapphire 0.7.20 → 0.7.21

data/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

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

@@ -47,15 +47,7 @@ module Sapphire
         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)

data/lib/sapphire/Testing/ConsoleReporter.rb

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

data/lib/sapphire/Testing/HtmlReporter.rb

@@ -15,7 +15,8 @@ module Sapphire
         @pending_count = 0
         @broken_count = 0
         @test_count = 0
-        @output = $stdout
+        $output ||= $stdout
+        @output = $output
         @file = ""
       end
 

data/lib/sapphire/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.7.20
+  version: 0.7.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-23 00:00:00.000000000Z
+date: 2012-03-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &9964308 !ruby/object:Gem::Requirement
+  requirement: &9679440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9964308
+  version_requirements: *9679440
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &9964056 !ruby/object:Gem::Requirement
+  requirement: &9679188 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9964056
+  version_requirements: *9679188
 - !ruby/object:Gem::Dependency
   name: Platform
-  requirement: &9963804 !ruby/object:Gem::Requirement
+  requirement: &9678936 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9963804
+  version_requirements: *9678936
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email: