sapphire 0.7.17 → 0.7.18

data/bin/sapphire

@@ -23,7 +23,6 @@ ARGV.each do |arg|
 
   require arg
 
-  Runner.instance.last_scenario.file_name = arg if Runner.instance.last_scenario and Runner.instance.last_scenario.file_name == ""
 end
 
 def Report(&block)
@@ -43,8 +42,16 @@ def Process()
   end
 
   if Runner.instance.test_plans.count > 0
-    Runner.instance.last_test_plan.execute
+    Report do |x| x.BeginTesting end
+
+    Runner.instance.test_plans.each do |t|
+      t.execute
+    end
+
+    Report do |x| x.TestingComplete end
+    Report do |x| x.OutputResults end
   else
+
     Report do |x| x.BeginTesting end
 
     Runner.instance.scenarios.each do |scenario|

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

@@ -10,8 +10,8 @@ module Sapphire
           file = File.expand_path(File.dirname(__FILE__) + item) if !File.exists?(file)
           raise "File Not Found: " + item if !File.exists?(file)
           load file if File.exists?(file)
-          Runner.instance.last_scenario.file_name = item
-          Runner.instance.last_scenario.execute
+          Runner.instance.last_scenario.file_name = item if Runner.instance.last_scenario and Runner.instance.last_scenario.file_name == ""
+          #Runner.instance.last_scenario.execute
         end
       end
     end

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

@@ -23,6 +23,7 @@ module Sapphire
 
           AddHandler :file => FileHandler.new
           AddHandler :path => PathHandler.new
+
         end
 
         def Cover(item)
@@ -46,15 +47,15 @@ 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
+          #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/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.7.17"
+  VERSION = "0.7.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.7.17
+  version: 0.7.18
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &9864360 !ruby/object:Gem::Requirement
+  requirement: &9899472 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9864360
+  version_requirements: *9899472
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &9864108 !ruby/object:Gem::Requirement
+  requirement: &9899220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9864108
+  version_requirements: *9899220
 - !ruby/object:Gem::Dependency
   name: Platform
-  requirement: &9863856 !ruby/object:Gem::Requirement
+  requirement: &9898968 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9863856
+  version_requirements: *9898968
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email: