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

Gemfile.lock

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

lib/sapphire/DSL/TestPlans/FileHandler.rb

@@ -11,7 +11,7 @@ def Handle(item)
           raise "File Not Found: " + item if !File.exists?(file)
           load file if File.exists?(file)
           Runner.instance.last_scenario.file_name = item if Runner.instance.last_scenario and Runner.instance.last_scenario.file_name == ""
-          #Runner.instance.last_scenario.execute
+          Runner.instance.last_scenario.execute
         end
       end
     end

lib/sapphire/version.rb

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

tests/BasicPage/TestPlans/NestedTestPlans.rb

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