sapphire 0.6.2 → 0.6.3

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

@@ -0,0 +1,29 @@
+module Sapphire
+  module DSL
+    module Scenarios
+      def Problematic(text)
+        Problematic.new text
+      end
+
+      class Problematic
+
+        attr_reader :text
+        attr_reader :and
+
+        def initialize(text)
+          @text = text
+          @and = []
+        end
+
+        def add_and(text, &block)
+          self.and << Then.new(text, &block)
+        end
+
+        def to_s
+          self.text
+        end
+
+      end
+    end
+  end
+end

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

@@ -1,34 +1,36 @@
-class Background
-  include Sapphire::Testing::Executable
-
-  attr_reader :value
-  attr_reader :text
-  attr_reader :block
-  attr_reader :parent
-  attr_reader :results
-  attr_reader :and
-
-  def initialize(parent, pre, text, &block)
-    @block = block
-    @value = text
-    @text = pre + text.to_s
-    @parent = parent
-    @results = []
-    @and = []
-  end
-
-  def AddResult(result)
-    result.item = self
-    @results << result
-    self.parent.result.AddChild(result)
-  end
-
-  def add_and(pre, text, &block)
-    if(self.value.is_a? Pending)
-      self.and << And.new(self, Pending.new(pre + text), &block)
-    else
-      self.and << And.new(self, pre + text, &block)
-    end
-  end
-
+class Background
+  include Sapphire::Testing::Executable
+
+  attr_reader :value
+  attr_reader :text
+  attr_reader :block
+  attr_reader :parent
+  attr_reader :results
+  attr_reader :and
+
+  def initialize(parent, pre, text, &block)
+    @block = block
+    @value = text
+    @text = pre + text.to_s
+    @parent = parent
+    @results = []
+    @and = []
+  end
+
+  def AddResult(result)
+    result.item = self
+    @results << result
+    self.parent.result.AddChild(result)
+  end
+
+  def add_and(pre, text, &block)
+    if(self.value.is_a? Pending)
+      self.and << And.new(self, Pending.new(pre + text), &block)
+    elsif(self.value.is_a? Problematic)
+      self.and << And.new(self, Problematic.new(pre + text), &block)
+    else
+      self.and << And.new(self, pre + text, &block)
+    end
+  end
+
 end

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

@@ -1,34 +1,36 @@
-class Finally
-  include Sapphire::Testing::Executable
-
-  attr_reader :value
-  attr_reader :block
-  attr_reader :text
-  attr_reader :and
-  attr_reader :parent
-  attr_reader :results
-
-  def initialize(parent, text, &block)
-    @value = text
-    @text = text.to_s
-    @block = block
-    @and = []
-    @parent = parent
-    @results = []
-  end
-
-  def add_and(pre, text, &block)
-    if(self.value.is_a? Pending)
-      self.and << And.new(self, Pending.new(pre + text), &block)
-    else
-      self.and << And.new(self, pre + text, &block)
-    end
-  end
-
-  def AddResult(result)
-    result.item = self
-    @results << result
-    self.parent.AddResult(result)
-  end
-
+class Finally
+  include Sapphire::Testing::Executable
+
+  attr_reader :value
+  attr_reader :block
+  attr_reader :text
+  attr_reader :and
+  attr_reader :parent
+  attr_reader :results
+
+  def initialize(parent, text, &block)
+    @value = text
+    @text = text.to_s
+    @block = block
+    @and = []
+    @parent = parent
+    @results = []
+  end
+
+  def add_and(pre, text, &block)
+    if(self.value.is_a? Pending)
+      self.and << And.new(self, Pending.new(pre + text), &block)
+    elsif(self.value.is_a? Problematic)
+      self.and << And.new(self, Problematic.new(pre + text), &block)
+    else
+      self.and << And.new(self, pre + text, &block)
+    end
+  end
+
+  def AddResult(result)
+    result.item = self
+    @results << result
+    self.parent.AddResult(result)
+  end
+
 end

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

@@ -1,58 +1,64 @@
-class Given
-  include Sapphire::Testing::Executable
-
-  attr_reader :value
-  attr_reader :text
-  attr_reader :block
-  attr_reader :finally
-  attr_reader :when
-  attr_reader :and
-  attr_reader :parent
-  attr_reader :results
-
-  def initialize(parent, pre, text, &block)
-    @value = text
-    @text = pre + text.to_s
-    @block = block
-    @when = []
-    @and = []
-    @parent = parent
-    @results = []
-  end
-
-  def add_when(pre, text, &block)
-    if(self.value.is_a? Pending)
-      @when << When.new(self, pre, Pending.new(text), &block)
-    else
-      x = When.new(self, pre, text, &block)
-      @when << x
-    end
-  end
-
-  def last_when()
-    @when.last
-  end
-
-  def add_finally(finally)
-    if(self.value.is_a? Pending)
-      @finally = Finally.new(self, Pending.new(finally.text), &block)
-    else
-      @finally = finally
-    end
-  end
-
-  def add_and(pre, text, &block)
-    if(self.value.is_a? Pending)
-      self.and << And.new(self, Pending.new(pre + text), &block)
-    else
-      self.and << And.new(self, pre + text, &block)
-    end
-  end
-
-  def AddResult(result)
-    result.item = self
-    @results << result
-    self.parent.result.AddChild(result)
-  end
-
+class Given
+  include Sapphire::Testing::Executable
+
+  attr_reader :value
+  attr_reader :text
+  attr_reader :block
+  attr_reader :finally
+  attr_reader :when
+  attr_reader :and
+  attr_reader :parent
+  attr_reader :results
+
+  def initialize(parent, pre, text, &block)
+    @value = text
+    @text = pre + text.to_s
+    @block = block
+    @when = []
+    @and = []
+    @parent = parent
+    @results = []
+  end
+
+  def add_when(pre, text, &block)
+    if(self.value.is_a? Pending)
+      @when << When.new(self, pre, Pending.new(text), &block)
+    elsif(self.value.is_a? Problematic)
+      @when << When.new(self, pre, Problematic.new(text), &block)
+    else
+      x = When.new(self, pre, text, &block)
+      @when << x
+    end
+  end
+
+  def last_when()
+    @when.last
+  end
+
+  def add_finally(finally)
+    if(self.value.is_a? Pending)
+      @finally = Finally.new(self, Pending.new(finally.text), &block)
+    elsif(self.value.is_a? Problematic)
+      @finally = Finally.new(self, Problematic.new(finally.text), &block)
+    else
+      @finally = finally
+    end
+  end
+
+  def add_and(pre, text, &block)
+    if(self.value.is_a? Pending)
+      self.and << And.new(self, Pending.new(pre + text), &block)
+    elsif(self.value.is_a? Problematic)
+      self.and << And.new(self, Problematic.new(pre + text), &block)
+    else
+      self.and << And.new(self, pre + text, &block)
+    end
+  end
+
+  def AddResult(result)
+    result.item = self
+    @results << result
+    self.parent.result.AddChild(result)
+  end
+
 end

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

@@ -1,53 +1,57 @@
-module Sapphire
-  module DSL
-    module Scenarios
-      class Scenario
-        include Sapphire::Testing::TestRunnerAdapter
-
-        attr_reader :block
-        attr_reader :value
-        attr_reader :text
-        attr_reader :givens
-        attr_reader :backgrounds
-        attr_reader :result
-        attr_accessor :file_name
-
-        def initialize(text, &block)
-          @value = text
-          @text = text.to_s
-          @block = block
-          @givens = []
-          @backgrounds = []
-          @result = Testing::ScenarioResult.new(text)
-          @file_name = ""
-        end
-
-        def add_given(given)
-          if(self.value.is_a? Pending)
-            @givens << Given.new(self, "", Pending.new(given.text), &block)
-          else
-            @givens << given
-          end
-        end
-
-        def last_given
-          @givens.last
-        end
-
-        def add_background(background)
-          if(self.value.is_a? Pending)
-            @backgrounds << Background.new(self, "", Pending.new(background.text), &block)
-          else
-            @backgrounds << background
-          end
-        end
-
-        def last_background
-          @backgrounds.last
-        end
-
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Scenarios
+      class Scenario
+        include Sapphire::Testing::TestRunnerAdapter
+
+        attr_reader :block
+        attr_reader :value
+        attr_reader :text
+        attr_reader :givens
+        attr_reader :backgrounds
+        attr_reader :result
+        attr_accessor :file_name
+
+        def initialize(text, &block)
+          @value = text
+          @text = text.to_s
+          @block = block
+          @givens = []
+          @backgrounds = []
+          @result = Testing::ScenarioResult.new(text)
+          @file_name = ""
+        end
+
+        def add_given(given)
+          if(self.value.is_a? Pending)
+            @givens << Given.new(self, "", Pending.new(given.text), &block)
+          elsif(self.value.is_a? Problematic)
+            @givens << Given.new(self, "", Problematic.new(given.text), &block)
+          else
+            @givens << given
+          end
+        end
+
+        def last_given
+          @givens.last
+        end
+
+        def add_background(background)
+          if(self.value.is_a? Pending)
+            @backgrounds << Background.new(self, "", Pending.new(background.text), &block)
+          elsif(self.value.is_a? Problematic)
+            @backgrounds << Background.new(self, "", Problematic.new(background.text), &block)
+          else
+            @backgrounds << background
+          end
+        end
+
+        def last_background
+          @backgrounds.last
+        end
+
+      end
+    end
+  end
+end
+

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

@@ -1,35 +1,37 @@
-class Then
-  include Sapphire::Testing::Executable
-
-  attr_reader :value
-  attr_accessor :text
-  attr_reader :block
-  attr_reader :and
-  attr_reader :parent
-  attr_reader :results
-
-  def initialize(parent, pre, text, &block)
-    @block = block
-    @value = text
-    @text = pre + text.to_s
-    @and = []
-    @parent = parent
-    @results = []
-  end
-
-  def add_and(pre, text, &block)
-    if(!self.value.instance_of? Pending)
-      x = And.new(self, text, &block)
-      self.and << x
-    else
-      self.and << And.new(self, Pending.new(pre + text), &block)
-    end
-  end
-
-  def AddResult(result)
-    result.item = self
-    @results << result
-    self.parent.results.last.AddChild(result)
-  end
-
+class Then
+  include Sapphire::Testing::Executable
+
+  attr_reader :value
+  attr_accessor :text
+  attr_reader :block
+  attr_reader :and
+  attr_reader :parent
+  attr_reader :results
+
+  def initialize(parent, pre, text, &block)
+    @block = block
+    @value = text
+    @text = pre + text.to_s
+    @and = []
+    @parent = parent
+    @results = []
+  end
+
+  def add_and(pre, text, &block)
+    if(self.value.instance_of? Pending)
+      self.and << And.new(self, Pending.new(pre + text), &block)
+    elsif(self.value.instance_of? Problematic)
+      self.and << And.new(self, Problematic.new(pre + text), &block)
+    else
+      x = And.new(self, text, &block)
+      self.and << x
+    end
+  end
+
+  def AddResult(result)
+    result.item = self
+    @results << result
+    self.parent.results.last.AddChild(result)
+  end
+
 end

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

@@ -1,48 +1,52 @@
-class When
-  include Sapphire::Testing::Executable
-
-  attr_reader :value
-  attr_accessor :text
-  attr_reader :block
-  attr_reader :then
-  attr_reader :and
-  attr_reader :parent
-  attr_reader :results
-
-  def initialize(parent, pre, text, &block)
-    @block = block
-    @value = text
-    @text = pre + text.to_s
-    @then = []
-    @and = []
-    @parent = parent
-    @results = []
-  end
-
-  def add_then(pre, text, &block)
-    if(self.value.is_a? Pending)
-      @then << Then.new(self, pre, Pending.new(text), &block)
-    else
-      @then << Then.new(self, pre, text, &block)
-    end
-  end
-
-  def add_and(pre, text, &block)
-    if(self.value.is_a? Pending)
-      self.and << And.new(self, Pending.new(pre + text), &block)
-    else
-      self.and << And.new(self, pre + text, &block)
-    end
-  end
-
-  def last_then
-    @then.last
-  end
-
-  def AddResult(result)
-    result.item = self
-    @results << result
-    self.parent.results.last.AddChild(result)
-  end
-
+class When
+  include Sapphire::Testing::Executable
+
+  attr_reader :value
+  attr_accessor :text
+  attr_reader :block
+  attr_reader :then
+  attr_reader :and
+  attr_reader :parent
+  attr_reader :results
+
+  def initialize(parent, pre, text, &block)
+    @block = block
+    @value = text
+    @text = pre + text.to_s
+    @then = []
+    @and = []
+    @parent = parent
+    @results = []
+  end
+
+  def add_then(pre, text, &block)
+    if(self.value.is_a? Pending)
+      @then << Then.new(self, pre, Pending.new(text), &block)
+    elsif(self.value.is_a? Problematic)
+      @then << Then.new(self, pre, Problematic.new(text), &block)
+    else
+      @then << Then.new(self, pre, text, &block)
+    end
+  end
+
+  def add_and(pre, text, &block)
+    if(self.value.is_a? Pending)
+      self.and << And.new(self, Pending.new(pre + text), &block)
+    elsif(self.value.is_a? Problematic)
+      self.and << And.new(self, Problematic.new(pre + text), &block)
+    else
+      self.and << And.new(self, pre + text, &block)
+    end
+  end
+
+  def last_then
+    @then.last
+  end
+
+  def AddResult(result)
+    result.item = self
+    @results << result
+    self.parent.results.last.AddChild(result)
+  end
+
 end

data/lib/sapphire/TeamCity/TeamCityReporter.rb

@@ -150,6 +150,11 @@ module Sapphire
           log(@message_factory.create_suite_finished("Finally")) if test.item.is_a? Finally
         end
 
+        def TestProblematic(test)
+          log(@message_factory.create_test_ignored(test.text, "Problematic"))
+          log(@message_factory.create_suite_finished("Finally")) if test.item.is_a? Finally
+        end
+
         def TestingComplete()
 
         end

data/lib/sapphire/Testing/ConsoleReporter.rb

@@ -7,6 +7,7 @@ module Sapphire
         @passing_count = 0
         @failing_count = 0
         @pending_count = 0
+        @problematic_count = 0
         @test_count = 0
         @output = $stdout
       end
@@ -34,6 +35,10 @@ module Sapphire
           @output.puts result.text.colorize :yellow
           Indent(depth+1)
           @output.puts " ## Not Yet Implemented ##"
+        elsif result.type == 'problematic'
+          @output.puts result.text.colorize :orange
+          Indent(depth+1)
+          @output.puts " ## Problematic ##"
         else
           @output.puts result.text.colorize :red
           if result.messages.is_a? Array
@@ -82,6 +87,12 @@ module Sapphire
         @output.print "*".colorize :yellow
       end
 
+      def TestProblematic(test)
+        @problematic_count = @problematic_count + 1
+        Add test
+        @output.print "P".colorize :orange
+      end
+
       def Add(r)
         result_passes = r.type == "pass"
 
@@ -112,6 +123,7 @@ module Sapphire
         @output.puts "Passing: " + @passing_count.to_s.colorize(:green)
         @output.puts "Failing: " + @failing_count.to_s.colorize(:red)
         @output.puts "Pending: " + @pending_count.to_s.colorize(:yellow)
+        @output.puts "Problematic: " + @problematic_count.to_s.colorize(:orange)
       end
 
       def Output(result, depth)

data/lib/sapphire/Testing/Executable.rb

@@ -1,36 +1,42 @@
-module Sapphire
-  module Testing
-    module Executable
-      def execute()
-        start = Time.now
-        Report do |x| x.TestStarted(self) end
-        begin
-          if(self.value.is_a? Pending)
-            result = ResultTree.new(self.text, TestResult.new("pending", self, "Pending", "", Time.now - start))
-            self.AddResult(result)
-            Report do |x| x.TestPending(result) end
-            return
-          end
-          self.block.call
-          result = ResultTree.new(self.text, TestResult.new("pass", self, "Success", "", Time.now - start))
-          self.AddResult(result)
-          Report do |x| x.TestPassed(result) end
-        rescue => msg
-          stack = msg.backtrace
-          message = msg.messages if (msg.is_a? ExpectationException)
-          message ||= msg.message
-          result = ResultTree.new(self.text, TestResult.new("fail", self, message, stack, Time.now - start))
-          self.AddResult(result)
-          Report do |x| x.TestFailed(result) end
-        end
-      end
-
-      def Report(&block)
-        $reporters.each do |reporter|
-          block.call reporter
-        end
-      end
-    end
-  end
-end
-
+module Sapphire
+  module Testing
+    module Executable
+      def execute()
+        start = Time.now
+        Report do |x| x.TestStarted(self) end
+        begin
+          if(self.value.is_a? Pending)
+            result = ResultTree.new(self.text, TestResult.new("pending", self, "Pending", "", Time.now - start))
+            self.AddResult(result)
+            Report do |x| x.TestPending(result) end
+            return
+          end
+          if(self.value.is_a? Problematic)
+            result = ResultTree.new(self.text, TestResult.new("problematic", self, "Problematic", "", Time.now - start))
+            self.AddResult(result)
+            Report do |x| x.TestProblematic(result) end
+            return
+          end
+          self.block.call
+          result = ResultTree.new(self.text, TestResult.new("pass", self, "Success", "", Time.now - start))
+          self.AddResult(result)
+          Report do |x| x.TestPassed(result) end
+        rescue => msg
+          stack = msg.backtrace
+          message = msg.messages if (msg.is_a? ExpectationException)
+          message ||= msg.message
+          result = ResultTree.new(self.text, TestResult.new("fail", self, message, stack, Time.now - start))
+          self.AddResult(result)
+          Report do |x| x.TestFailed(result) end
+        end
+      end
+
+      def Report(&block)
+        $reporters.each do |reporter|
+          block.call reporter
+        end
+      end
+    end
+  end
+end
+

data/lib/sapphire/Testing/HtmlReporter.rb

@@ -8,6 +8,7 @@ module Sapphire
         @passing_count = 0
         @failing_count = 0
         @pending_count = 0
+        @problematic_count = 0
         @test_count = 0
         @output = $stdout
       end
@@ -58,11 +59,18 @@ module Sapphire
         @output.puts "    <dd class=\"spec not_implemented\"><span class=\"not_implemented_spec_name\">#{test.text} (PENDING: ### Not Yet Implemented ###)</span></dd>"
       end
 
+      def TestProblematic(test)
+        @output.puts "    <script type=\"text/javascript\">makeOrange('rspec-header');</script>" unless @header_red
+        @output.puts "    <script type=\"text/javascript\">makeOrange('example_group_#{@example_group_number}');</script>" unless @example_group_red
+        @output.puts "    <dd class=\"spec not_implemented\"><span class=\"not_implemented_spec_name\">#{test.text} (PROBLEMATIC: ### Problematic ###)</span></dd>"
+      end
+
       def TestingComplete
         @end = Time.now
 
         totals = "#{@test_count} example#{'s' unless @test_count == 1}, #{@failure_count} failure#{'s' unless @failure_count == 1}"
         totals << ", #{@pending_count} pending" if @pending_count > 0
+        totals << ", #{@problematic_count} problematic" if @problematic_count > 0
 
         @output.puts "<script type=\"text/javascript\">document.getElementById('duration').innerHTML = \"Finished in <strong>#{(@end - @start).round(2).to_s} seconds</strong>\";</script>"
         @output.puts "<script type=\"text/javascript\">document.getElementById('totals').innerHTML = \"#{totals}\";</script>"

data/lib/sapphire/Testing/Reporter.rb

@@ -6,6 +6,7 @@ module Sapphire
       attr_reader :passing_count
       attr_reader :failing_count
       attr_reader :pending_count
+      attr_reader :problematic_count
       attr_reader :time
 
     end

data/lib/sapphire/Testing/ResultTree.rb

@@ -1,44 +1,45 @@
-module Sapphire
-  module Testing
-    class ResultTree
-
-      attr_accessor :results
-      attr_accessor :type
-      attr_accessor :text
-      attr_accessor :messages
-      attr_accessor :stack
-      attr_accessor :time
-      attr_accessor :parent
-      attr_accessor :item
-
-      def initialize(text, result)
-
-        @type = 'pass'
-        @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"
-          @time = result.execution_time
-          @expanded = true
-          @messages = result.messages
-          @stack = result.stack
-        end
-        @text = text
-        @results = []
-        @leaf = true
-
-      end
-
-      def AddChild(node)
-        node.parent = self
-        @results << node
-        @leaf = false
-      end
-
-    end
-  end
-end
-
+module Sapphire
+  module Testing
+    class ResultTree
+
+      attr_accessor :results
+      attr_accessor :type
+      attr_accessor :text
+      attr_accessor :messages
+      attr_accessor :stack
+      attr_accessor :time
+      attr_accessor :parent
+      attr_accessor :item
+
+      def initialize(text, result)
+
+        @type = 'pass'
+        @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"
+          @iconCls = "error" if result.type == "problematic"
+          @time = result.execution_time
+          @expanded = true
+          @messages = result.messages
+          @stack = result.stack
+        end
+        @text = text
+        @results = []
+        @leaf = true
+
+      end
+
+      def AddChild(node)
+        node.parent = self
+        @results << node
+        @leaf = false
+      end
+
+    end
+  end
+end
+

data/lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-04 00:00:00.000000000Z
+date: 2012-01-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &10054932 !ruby/object:Gem::Requirement
+  requirement: &9944292 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10054932
+  version_requirements: *9944292
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &10054680 !ruby/object:Gem::Requirement
+  requirement: &9944040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10054680
+  version_requirements: *9944040
 - !ruby/object:Gem::Dependency
   name: Platform
-  requirement: &10054428 !ruby/object:Gem::Requirement
+  requirement: &9943788 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10054428
+  version_requirements: *9943788
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email:
@@ -124,6 +124,7 @@ files:
 - lib/sapphire/DSL/Scenarios/given.rb
 - lib/sapphire/DSL/Scenarios/Is.rb
 - lib/sapphire/DSL/Scenarios/Pending.rb
+- lib/sapphire/DSL/Scenarios/Problematic.rb
 - lib/sapphire/DSL/Scenarios/runner.rb
 - lib/sapphire/DSL/Scenarios/scenario.rb
 - lib/sapphire/DSL/Scenarios/then.rb