sapphire 0.2.2 → 0.3.0

data/bin/sapphire

@@ -0,0 +1,12 @@
+$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+
+require 'sapphire'
+
+include Sapphire::Sapphire
+
+ARGV.each do |arg|
+  require arg
+  Runner.instance.last_scenario.execute 1
+end
+
+ConsoleReporter.new().OutputResults

data/lib/sapphire.rb

@@ -1,4 +1,3 @@
-require "test/unit"
 require "rubygems"
 require "rspec"
 require 'yaml'
@@ -6,14 +5,18 @@ require 'selenium-webdriver'
 require 'delegate'
 require 'Forwardable'
 require 'win32ole'
+require 'win32console'
 require 'json'
+require 'colorize'
 
 require File.expand_path(File.dirname(__FILE__) +'/sapphire/Strategies/Strategy.rb', __FILE__)
+require File.expand_path(File.dirname(__FILE__) +'/sapphire/Testing/Reporter.rb', __FILE__)
 Dir[File.dirname(__FILE__) + '/sapphire/Testing/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/sapphire/Configuration/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/sapphire/WebAbstractions/Controls/Base/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/sapphire/WebAbstractions/Controls/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/sapphire/DataAbstractions/*.rb'].each {|file| require file }
+Dir[File.dirname(__FILE__) + '/sapphire/JobAbstractions/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/sapphire/Strategies/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/sapphire/DSL/Browser/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/sapphire/DSL/Configuration/*.rb'].each {|file| require file }
@@ -32,6 +35,7 @@ module Sapphire
     include Configuration::AttrMethods
     include Configuration
     include DataAbstractions
+    include JobAbstractions
     include WebAbstractions
     include Testing
   end

data/lib/sapphire/DSL/Browser/Accept.rb

@@ -0,0 +1,10 @@
+module Sapphire
+  module DSL
+    module Browser
+      def Accept(browser)
+        x = browser.new
+        x.Accept
+      end
+    end
+  end
+end

data/lib/sapphire/DSL/Browser/AlertBox.rb

@@ -0,0 +1,20 @@
+module Sapphire
+  module DSL
+    module Browser
+      class AlertBox
+        def Accept
+          alert = $browser.switch_to.alert
+          alert.accept()
+          $browser.switch_to.window($browser.window_handles[0])
+        end
+
+        def Set(text)
+          alert = $browser.switch_to.alert
+          alert.send_keys(text)
+          alert.accept()
+          $browser.switch_to.window($browser.window_handles[0])
+        end
+      end
+    end
+  end
+end

data/lib/sapphire/DSL/Browser/Set.rb

@@ -2,8 +2,14 @@ module Sapphire
   module DSL
     module Browser
       def Set(hash)
-        ExecuteHashAgainstControl(hash, @page) do |control, arg|
-          control.Set arg
+        if(hash.keys.first == AlertBox)
+          text = hash[item.keys.first]
+          klass = hash.keys.first.new
+          klass.Set text
+        else
+          ExecuteHashAgainstControl(hash, @page) do |control, arg|
+            control.Set arg
+          end
         end
       end
     end

data/lib/sapphire/DSL/Scenarios/and.rb

@@ -18,6 +18,7 @@ class And
   end
 
   def AddResult(result)
+    result.item = self
     @results << result
     self.parent.results.last.AddChild(result)
   end

data/lib/sapphire/DSL/Scenarios/background.rb

@@ -16,6 +16,7 @@ class Background
   end
 
   def AddResult(result)
+    result.item = self
     @results << result
     self.parent.result.AddChild(result)
   end

data/lib/sapphire/DSL/Scenarios/dsl.rb

@@ -50,8 +50,8 @@ module Sapphire
 
       def Scenario(text, &block)
         Runner.instance.add_scenario(Scenario.new(text, &block))
-        #Runner.instance.last_scenario.block.call
-        Runner.instance.last_scenario.execute 1
+        Runner.instance.last_scenario.block.call
+        #Runner.instance.last_scenario.execute 1
       end
     end
   end

data/lib/sapphire/DSL/Scenarios/finally.rb

@@ -26,7 +26,9 @@ class Finally
   end
 
   def AddResult(result)
+    result.item = self
     @results << result
+    self.parent.AddResult(result)
   end
 
 end

data/lib/sapphire/DSL/Scenarios/given.rb

@@ -45,11 +45,12 @@ class Given
     if(self.value.is_a? Pending)
       self.and << And.new(self, Pending.new(pre + text), &block)
     else
-      self.and << And.new(self, text, &block)
+      self.and << And.new(self, pre + text, &block)
     end
   end
 
   def AddResult(result)
+    result.item = self
     @results << result
     self.parent.result.AddChild(result)
   end

data/lib/sapphire/DSL/Scenarios/scenario.rb

@@ -2,7 +2,7 @@ module Sapphire
   module DSL
     module Scenarios
       class Scenario
-        include Sapphire::Testing::RSpecRunner
+        include Sapphire::Testing::TestRunnerAdapter
 
         attr_reader :block
         attr_reader :value

data/lib/sapphire/DSL/Scenarios/then.rb

@@ -27,6 +27,7 @@ class Then
   end
 
   def AddResult(result)
+    result.item = self
     @results << result
     self.parent.results.last.AddChild(result)
   end

data/lib/sapphire/DSL/Scenarios/when.rb

@@ -40,6 +40,7 @@ class When
   end
 
   def AddResult(result)
+    result.item = self
     @results << result
     self.parent.results.last.AddChild(result)
   end

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

@@ -5,6 +5,9 @@ module Sapphire
         def Handle(item)
           x = AppConfig.Current.SpecsPath || ""
           require File.expand_path(x + item, __FILE__)
+          $stdout.puts item + ": "
+          Runner.instance.last_scenario.execute 1
+          $stdout.puts ""
         end
       end
     end

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

@@ -4,7 +4,12 @@ module Sapphire
       class PathHandler
         def Handle(item)
           x = AppConfig.Current.SpecsPath || ""
-          Dir[x + item + '*.rb'].each  do |file| require file end
+          Dir[x + item + '*.rb'].each  do |file|
+            require file
+            $stdout.puts file + ": "
+            Runner.instance.last_scenario.execute 1
+            $stdout.puts ""
+          end
         end
       end
     end

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

@@ -2,7 +2,14 @@ module Sapphire
   module DSL
     module TestPlans
       def Run(item)
-        Runner.instance.last_test_plan.Add(item)
+        if(item.is_a? Class)
+          if(item.new.is_a? Job)
+            job = item.new
+            system(job.PsExecPath + " " + job.Server + " -u " + job.User + " -p " + job.Password + " " + job.Path)
+          end
+        else
+          Runner.instance.last_test_plan.Add(item)
+        end
       end
     end
   end

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

@@ -47,7 +47,9 @@ module Sapphire
         end
 
         def execute
+          $stdout.puts ""
           @block.call
+          ConsoleReporter.new().OutputResults
         end
       end
     end

data/lib/sapphire/JobAbstractions/Job.rb

@@ -0,0 +1,28 @@
+module Sapphire
+  module JobAbstractions
+    class Job
+
+      def Server
+        return ""
+      end
+
+      def User
+        return ""
+      end
+
+      def Password
+        return ""
+      end
+
+      def Path
+        return ""
+      end
+
+      def PsExecPath
+        return ""
+      end
+
+    end
+  end
+end
+

data/lib/sapphire/Strategies/HashStrategy.rb

@@ -22,7 +22,6 @@ module Sapphire
              return control.Equals(arg)
            end
         end
-
       end
     end
   end

data/lib/sapphire/Testing/ConsoleReporter.rb

@@ -0,0 +1,53 @@
+module Sapphire
+  module Testing
+    class ConsoleReporter < Reporter
+
+      def PrintItem(result, depth)
+        Indent(depth)
+
+        if result.type == 'pass'
+          $stdout.puts result.text.green
+        elsif result.type == 'pending'
+          $stdout.puts result.text.yellow
+          Indent(depth+1)
+          $stdout.puts " ## Not Yet Implemented ##"
+        else
+          $stdout.puts result.text.red
+          Indent(depth+1)
+          $stdout.puts result.message
+        end
+      end
+
+      def PrintHeader()
+        $stdout.puts ""
+      end
+
+      def PrintFooter()
+        $stdout.puts ""
+        $stdout.puts "Finished in " + self.time.round(2).to_s + " seconds."
+        $stdout.puts "Test Count: " + self.test_count.to_s
+        $stdout.puts "Passing: " + self.passing_count.to_s.green
+        $stdout.puts "Failing: " + self.failing_count.to_s.red
+        $stdout.puts "Pending: " + self.pending_count.to_s.yellow
+      end
+
+      def Indent(depth)
+        (1..depth).each do
+          $stdout.print "\t"
+        end
+      end
+
+      def InsertLineBreak()
+        $stdout.puts ""
+      end
+
+      def PrePrint
+
+      end
+
+      def PostPrint
+
+      end
+    end
+  end
+end

data/lib/sapphire/Testing/Executable.rb

@@ -5,22 +5,21 @@ module Sapphire
         start = Time.now
         begin
           if(self.value.is_a? Pending)
-            self.AddResult(ResultTree.new(self.text, TestResult.new("pending", self.text, "Pending", "", Time.now - start, id)))
-            puts "(pending) " + self.text + " (" + (Time.now - start).to_s + "s)"
+            self.AddResult(ResultTree.new(self.text, TestResult.new("pending", self, "Pending", "", Time.now - start, id)))
+            $stdout.print "*".yellow
             return
           end
           self.block.call
-          self.AddResult(ResultTree.new(self.text, TestResult.new("pass", self.text, "Success", "", Time.now - start, id)))
-          puts "(pass) " + self.text + " (" + (Time.now - start).to_s + "s)"
+          self.AddResult(ResultTree.new(self.text, TestResult.new("pass", self, "Success", "", Time.now - start, id)))
+          $stdout.print ".".green
         rescue => msg
-
           stack = ""
           msg.backtrace.each do |line|
             stack += "\r\n" + line
           end
 
-          self.AddResult(ResultTree.new(self.text, TestResult.new("fail", self.text, msg.message, stack, Time.now - start, id)))
-          puts "(fail) " + self.text + ": " + msg.message + " (" + (Time.now - start).to_s + "s)"
+          self.AddResult(ResultTree.new(self.text, TestResult.new("fail", self, msg.message, stack, Time.now - start, id)))
+          $stdout.print "F".red
         end
       end
       @result

data/lib/sapphire/Testing/HtmlReporter.rb

@@ -0,0 +1,31 @@
+module Sapphire
+  module Testing
+    class HtmlReporter < Reporter
+
+      def PrintHeader()
+
+      end
+
+      def Output(result, tabber)
+
+      end
+
+      def PrePrint
+
+      end
+
+      def PrintResult(entry)
+
+      end
+
+      def PostPrint
+
+      end
+
+      def PrintFooter()
+
+      end
+
+    end
+  end
+end

data/lib/sapphire/Testing/RSpecRunner.rb

@@ -78,6 +78,8 @@ module Sapphire
           end
           end
         end
+
+        true
       end
     end
   end

data/lib/sapphire/Testing/Reporter.rb

@@ -0,0 +1,140 @@
+module Sapphire
+  module Testing
+    class Reporter
+
+      attr_reader :test_count
+      attr_reader :passing_count
+      attr_reader :failing_count
+      attr_reader :pending_count
+      attr_reader :time
+
+      def OutputResults()
+
+        self.GatherResults
+
+        not_passing = self.GetNotPassing
+
+        self.PrintHeader
+
+        not_passing.keys.each do |key|
+          self.PrePrint
+          self.PrintResult not_passing[key]
+          self.PostPrint
+        end
+
+        self.PrintFooter
+
+      end
+
+      def Output(result, depth)
+
+        self.PrintItem(result, depth)
+
+        result.results.each do |sub_result|
+          self.Output(sub_result, depth+1)
+        end
+      end
+
+      def PrintResult(entry)
+        if entry.item.is_a? Given or entry.item.is_a? Background
+          self.InsertLineBreak
+          self.Output entry, 0
+          self.InsertLineBreak
+        elsif entry.item.is_a? When
+          self.PrintItem entry.parent, 0
+          self.Output entry, 1
+          self.InsertLineBreak
+        else
+          self.PrintResult entry.parent
+        end
+      end
+
+      def GatherResults()
+        @test_count = 0
+        @passing_count = 0
+        @failing_count = 0
+        @pending_count = 0
+        @time = 0
+
+        Runner.instance.scenarios.each do |scenario|
+          item = scenario.result
+          @time += item.time
+          item.results.each do |result|
+            output = self.Count result
+            @test_count += output[:tests]
+            @passing_count += output[:passing]
+            @failing_count += output[:failing]
+            @pending_count += output[:pending]
+            @time += result.time
+          end
+        end
+      end
+
+      def Count(result)
+        test_count = 1
+        passing_count = 0
+        failing_count = 0
+        pending_count = 0
+
+        if result.type == 'pass'
+          passing_count += 1
+        elsif result.type == 'pending'
+          pending_count += 1
+        else
+          failing_count += 1
+        end
+
+        result.results.each do |sub_result|
+          output = self.Count(sub_result)
+
+          test_count += output[:tests]
+          passing_count += output[:passing]
+          failing_count += output[:failing]
+          pending_count += output[:pending]
+        end
+
+        { :tests => test_count, :passing => passing_count, :failing => failing_count, :pending => pending_count }
+      end
+
+      def GetNotPassing
+
+        results = {}
+
+        Runner.instance.scenarios.each do |scenario|
+          results = results.merge(self.RecurseResult(scenario.result))
+        end
+
+        results
+      end
+
+      def RecurseResult(result)
+        results = {}
+
+        result.results.each do |r|
+          result_passes = r.type == "pass"
+          if !result_passes and (r.item.is_a? Given or r.item.is_a? When or r.item.is_a? Background)
+            results = results.merge({ r => r })
+            next
+          elsif !result_passes and (r.item.is_a? And or r.item.parent.is_a? Given)
+            results = results.merge({ r.parent => r.parent })
+            next
+          elsif !result_passes and (r.item.is_a? And and r.parent.item.is_a? When)
+            results = results.merge({ r.parent => r.parent })
+            next
+          elsif !result_passes and (r.item.is_a? Then)
+            results = results.merge({ r.parent => r.parent })
+            next
+          elsif !result_passes and (r.item.is_a? And and r.parent.item.is_a? Then)
+            results = results.merge({ r.parent.parent => r.parent.parent })
+            next
+          else
+            results = results.merge(self.RecurseResult(r))
+          end
+        end
+
+        results
+      end
+
+    end
+  end
+end

data/lib/sapphire/Testing/ResultTree.rb

@@ -4,18 +4,24 @@ module Sapphire
 
       attr_accessor :results
       attr_accessor :type
+      attr_accessor :text
+      attr_accessor :message
+      attr_accessor :stack
+      attr_accessor :time
+      attr_accessor :parent
+      attr_accessor :item
 
       def initialize(text, result)
 
         @type = 'pass'
-        @execution_time = 0
+        @time = 0
 
         if(result != nil)
           self.type = result.type
           @iconCls = "accept" if result.type == "pass"
           @iconCls = "delete" if result.type == "fail"
           @iconCls = "error" if result.type == "pending"
-          @execution_time = result.execution_time
+          @time = result.execution_time
           @expanded = true
           @message = result.message
           @stack = result.stack
@@ -27,6 +33,7 @@ module Sapphire
       end
 
       def AddChild(node)
+        node.parent = self
         @results << node
         @leaf = false
       end

data/lib/sapphire/Testing/ScenarioResult.rb

@@ -5,6 +5,8 @@ module Sapphire
       attr_reader :results
       attr_accessor :myId
       attr_reader :type
+      attr_reader :time
+      attr_reader :parent
 
       def initialize(text)
         @text = text
@@ -12,10 +14,13 @@ module Sapphire
         @leaf = true
         @myId = -1
         @type = 'pass'
+        @time = 0
       end
 
       def AddChild(result)
+        result.parent = self
         @results << result
+        @time += result.time
       end
 
       def set_id(id)

data/lib/sapphire/Testing/TestResult.rb

@@ -5,14 +5,14 @@ module Sapphire
       attr_reader :execution_time
       attr_reader :message
       attr_reader :myId
-      attr_reader :text
+      attr_reader :item
       attr_reader :type
       attr_reader :stack
       attr_reader :message
 
-      def initialize(type, text, message, stack, execution_time, id)
+      def initialize(type, item, message, stack, execution_time, id)
         @myId = id
-        @text = text
+        @item = item
         @execution_time = execution_time
         @message = message
         @stack = stack

data/lib/sapphire/Testing/TestRunnerAdapter.rb

@@ -3,6 +3,9 @@ module Sapphire
     module TestRunnerAdapter
 
       def execute(id)
+        @failures = []
+        @pendings = []
+        @success = []
 
         self.backgrounds.each do |b|
 
@@ -53,7 +56,6 @@ module Sapphire
         end
 
       end
-
     end
   end
 end

data/lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-01 00:00:00.000000000Z
+date: 2011-09-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: albacore
-  requirement: &9316620 !ruby/object:Gem::Requirement
+  name: selenium-webdriver
+  requirement: &9278508 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9316620
+  version_requirements: *9278508
 - !ruby/object:Gem::Dependency
-  name: selenium-webdriver
-  requirement: &9316344 !ruby/object:Gem::Requirement
+  name: colorize
+  requirement: &9278172 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9316344
+  version_requirements: *9278172
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &9316080 !ruby/object:Gem::Requirement
+  name: win32console
+  requirement: &9277848 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,12 +43,13 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9316080
+  version_requirements: *9277848
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email:
 - marcus.bratton@gmail.com
-executables: []
+executables:
+- sapphire
 extensions: []
 extra_rdoc_files: []
 files:
@@ -58,6 +59,8 @@ files:
 - lib/sapphire/DataAbstractions/Database.rb
 - lib/sapphire/DataAbstractions/NonQuery.rb
 - lib/sapphire/DataAbstractions/Query.rb
+- lib/sapphire/DSL/Browser/Accept.rb
+- lib/sapphire/DSL/Browser/AlertBox.rb
 - lib/sapphire/DSL/Browser/Browser.rb
 - lib/sapphire/DSL/Browser/Check.rb
 - lib/sapphire/DSL/Browser/Clear.rb
@@ -115,6 +118,7 @@ files:
 - lib/sapphire/DSL/TestPlans/PathHandler.rb
 - lib/sapphire/DSL/TestPlans/Run.rb
 - lib/sapphire/DSL/TestPlans/TestPlan.rb
+- lib/sapphire/JobAbstractions/Job.rb
 - lib/sapphire/Strategies/ClassStrategy.rb
 - lib/sapphire/Strategies/DefaultStrategy.rb
 - lib/sapphire/Strategies/Evaluation.rb
@@ -122,8 +126,11 @@ files:
 - lib/sapphire/Strategies/NullModifier.rb
 - lib/sapphire/Strategies/Strategy.rb
 - lib/sapphire/Strategies/SymbolStrategy.rb
+- lib/sapphire/Testing/ConsoleReporter.rb
 - lib/sapphire/Testing/Executable.rb
+- lib/sapphire/Testing/HtmlReporter.rb
 - lib/sapphire/Testing/RakeTask.rb
+- lib/sapphire/Testing/Reporter.rb
 - lib/sapphire/Testing/ResultList.rb
 - lib/sapphire/Testing/ResultTree.rb
 - lib/sapphire/Testing/RSpecRunner.rb
@@ -148,6 +155,7 @@ files:
 - lib/sapphire/WebAbstractions/Controls/TextBox.rb
 - lib/sapphire/WebAbstractions/Controls/Title.rb
 - lib/sapphire.rb
+- bin/sapphire
 homepage: http://github.com/MarcusTheBold/Sapphire/
 licenses: []
 post_install_message: