sapphire 0.7.8 → 0.7.9

data/bin/sapphire

@@ -5,42 +5,68 @@ require 'sapphire'
 include Sapphire::Sapphire
 
 $reporters = []
+$instances = []
 
 ARGV.each do |arg|
+  if arg.start_with? "reporter="
+    item = arg.split "reporter="
+    $reporters << item.last
 
-  #if arg.start_with? "reporter="
-  #  item = arg.split "reporter="
-  #  $reporters << Object.const_get(item.last).new()
-  #  next
-  #end
+    next
+  end
+
+  if arg.start_with? "file="
+    item = arg.split "file="
+    @file = item.last
+    next
+  end
 
   if !arg.end_with? ".rb"
     next
   end
 
   require arg
-  Runner.instance.last_scenario.file_name = arg if Runner.instance.last_scenario and Runner.instance.last_scenario.file_name == ""
-end
 
-if $reporters.empty?
-  $reporters << ConsoleReporter.new()
+  Runner.instance.last_scenario.file_name = arg if Runner.instance.last_scenario and Runner.instance.last_scenario.file_name == ""
 end
 
 def Report(&block)
-  $reporters.each do |reporter|
+  $instances.each do |reporter|
     block.call reporter
   end
 end
 
-if Runner.instance.test_plans.count > 0
-  Runner.instance.last_test_plan.execute
-else
-  Report do |x| x.BeginTesting end
+def Process()
+  $reporters.each do |r|
+    $instances << Object.const_get(r).new()
+    $instances.last.file = @file if $instances.last.is_a? HtmlReporter
+  end
 
-  Runner.instance.scenarios.each do |scenario|
-    scenario.execute
+  if $instances.empty?
+    $instances << ConsoleReporter.new()
   end
 
-  Report do |x| x.TestingComplete end
-  Report do |x| x.OutputResults end
-end
+  if Runner.instance.test_plans.count > 0
+    Runner.instance.last_test_plan.execute
+  else
+    Report do |x| x.BeginTesting end
+
+    Runner.instance.scenarios.each do |scenario|
+      scenario.execute
+    end
+
+    Report do |x| x.TestingComplete end
+    Report do |x| x.OutputResults end
+  end
+end
+
+if @file.nil?
+  Process()
+else
+  File.open(@file, 'w') do |f|
+    $stdout = f
+    Process()
+  end
+end
+
+

data/lib/sapphire/Adapters/Selenium/RubySeleniumWebDriver.rb

@@ -8,6 +8,10 @@ module Sapphire
         @rootUrl = url
       end
 
+      def Screenshot(file_name)
+        self.browser.save_screenshot(file_name)
+      end
+
       def Close
         self.browser.close
       end

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

@@ -5,10 +5,22 @@ module Sapphire
         if(item.is_a? Job)
           job = item
           if(job.Arg)
-            system(job.PsExecPath + " " + job.Server + " " + job.Path + " " + job.Arg.to_s)
+            @command = job.Path + " " + job.Arg.to_s
           else
-            system(job.PsExecPath + " " + job.Server + " " + job.Path)
+            @command = job.Path
           end
+
+          psFile = "C:\\runjob.ps1"
+          psCommand = "& icm " + job.Server + " {" + @command + "}"
+          File.open(psFile, 'w') {|f| f.write(psCommand) }
+          puts ""
+          puts ""
+          puts "executing your job via powershell command: " + psCommand
+          system "powershell -inputformat none " + psFile
+          File.delete(psFile)
+          puts ""
+          puts ""
+
         else
           Runner.instance.last_test_plan.Add(item)
         end

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

@@ -54,7 +54,7 @@ module Sapphire
         end
 
         def Report(&block)
-          $reporters.each do |reporter|
+          $instances.each do |reporter|
             block.call reporter
           end
         end

data/lib/sapphire/Testing/ConsoleReporter.rb

@@ -53,10 +53,10 @@ module Sapphire
           end
           @output.puts ""
           result.stack.each do |line|
-            #if (!line.include? "sapphire")
+            if (!line.include? "sapphire")
               Indent(depth+1)
               @output.puts line
-            #end
+            end
           end
 
         end

data/lib/sapphire/Testing/Executable.rb

@@ -42,7 +42,7 @@ module Sapphire
       end
 
       def Report(&block)
-        $reporters.each do |reporter|
+        $instances.each do |reporter|
           block.call reporter
         end
       end

data/lib/sapphire/Testing/HtmlReporter.rb

@@ -1,7 +1,12 @@
+require 'pathname'
+require 'fileutils'
+
 module Sapphire
   module Testing
     class HtmlReporter < Reporter
 
+      attr_accessor :file
+
       def initialize()
         @failures = []
         @example_group_number = 0
@@ -11,6 +16,7 @@ module Sapphire
         @broken_count = 0
         @test_count = 0
         @output = $stdout
+        @file = ""
       end
 
       def TestStarted(test)
@@ -49,6 +55,14 @@ module Sapphire
           end
         end
 
+        content = []
+        content << "<span>"
+
+        file_name = save_screenshot
+        content << link_for(file_name)
+
+        content << "</span>"
+        @output.puts content
         @output.puts "      </div>"
         @output.puts "    </dd>"
       end
@@ -306,6 +320,37 @@ a {
 }
 EOF
         end
+
+      def save_screenshot
+        if(!$driver)
+          return
+        end
+
+        begin
+          file_name = file_path("image.png")
+          $driver.Screenshot(file_name)
+        rescue => e
+          $stderr.puts "saving of screenshot failed."
+          $stderr.puts e.backtrace
+        end
+        file_name
+      end
+
+      def file_path(file_name)
+        extension = File.extname(file_name)
+        basename = File.basename(file_name, extension)
+        dir = File.dirname(@file)
+        file_path = File.join(dir, "", "#{basename}_#{Time.now.strftime("%H%M%S")}#{extension}")
+        file_path
+      end
+
+      def link_for(file_name)
+        return unless file_name && File.exists?(file_name)
+
+        path = Pathname.new(file_name)
+
+        "<a href='#{File.basename(path)}'>Screenshot</a>&nbsp;"
+      end
     end
   end
 end

data/lib/sapphire/Testing/TestRunnerAdapter.rb

@@ -3,7 +3,7 @@ module Sapphire
     module TestRunnerAdapter
 
       def Report(&block)
-        $reporters.each do |reporter|
+        $instances.each do |reporter|
           block.call reporter
         end
       end

data/lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.7.8"
+  VERSION = "0.7.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-13 00:00:00.000000000Z
+date: 2012-03-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &9870684 !ruby/object:Gem::Requirement
+  requirement: &9714480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9870684
+  version_requirements: *9714480
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &9870432 !ruby/object:Gem::Requirement
+  requirement: &9714228 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9870432
+  version_requirements: *9714228
 - !ruby/object:Gem::Dependency
   name: Platform
-  requirement: &9870180 !ruby/object:Gem::Requirement
+  requirement: &9713976 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9870180
+  version_requirements: *9713976
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email: