sapphire 0.7.0 → 0.7.2

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

@@ -15,8 +15,8 @@ module Sapphire
           @and = []
         end
 
-        def add_and(text, &block)
-          self.and << Then.new(text, &block)
+        def add_and( text, &block)
+          self.and << And.new(self, text, &block)
         end
 
         def to_s

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

@@ -22,7 +22,7 @@ class Given
 
   def add_when(pre, text, &block)
     if(self.value.is_a? Pending)
-      @when << When.new(self, pre, Pending.new(text), &block)
+      @when << When.new(self, pre, Pending.new(text.to_s), &block)
     elsif(self.value.is_a? Problematic)
       @when << When.new(self, pre, Problematic.new(text), &block)
     else
@@ -36,22 +36,16 @@ class Given
   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
+    @finally = finally
   end
 
   def add_and(pre, text, &block)
-    if(self.value.is_a? Pending)
-      self.and << And.new(self, Pending.new(pre + text), &block)
+    if(self.value.is_a? Pending or text.is_a? Pending)
+      self.and << And.new(self, Pending.new(pre + text.to_s), &block)
     elsif(self.value.is_a? Problematic)
-      self.and << And.new(self, Problematic.new(pre + text), &block)
+      self.and << And.new(self, Problematic.new(pre + text.to_s), &block)
     else
-      self.and << And.new(self, pre + text, &block)
+      self.and << And.new(self, pre + text.to_s, &block)
     end
   end
 

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

@@ -18,12 +18,12 @@ class Then
   end
 
   def add_and(pre, text, &block)
-    if(self.value.instance_of? Pending)
-      self.and << And.new(self, Pending.new(text), &block)
+    if(self.value.instance_of? Pending or text.is_a? Pending)
+      self.and << And.new(self, Pending.new(pre + text.to_s), &block)
     elsif(self.value.instance_of? Problematic)
       self.and << And.new(self, Problematic.new(pre + text), &block)
     else
-      x = And.new(self, text, &block)
+      x = And.new(self, pre + text.to_s, &block)
       self.and << x
     end
   end

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

@@ -20,8 +20,8 @@ class When
   end
 
   def add_then(pre, text, &block)
-    if(self.value.is_a? Pending)
-      @then << Then.new(self, pre, Pending.new(text), &block)
+    if(self.value.is_a? Pending or text.is_a? Pending)
+      @then << Then.new(self, pre, Pending.new(text.to_s), &block)
     elsif(self.value.is_a? Problematic)
       @then << Then.new(self, pre, Problematic.new(text), &block)
     else
@@ -30,12 +30,12 @@ class When
   end
 
   def add_and(pre, text, &block)
-    if(self.value.is_a? Pending)
-      self.and << And.new(self, Pending.new(text), &block)
+    if(self.value.is_a? Pending or text.is_a? Pending)
+      self.and << And.new(self, Pending.new(pre + text.to_s), &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)
+      self.and << And.new(self, pre + text.to_s, &block)
     end
   end
 

data/lib/sapphire/Testing/ConsoleReporter.rb

@@ -30,17 +30,17 @@ module Sapphire
         Indent(depth)
 
         if result.type == 'pass'
-          @output.puts result.text.colorize :green
+          @output.puts result.text
         elsif result.type == 'pending'
-          @output.puts result.text.colorize :yellow
+          @output.puts result.text
           Indent(depth+1)
           @output.puts " ## Not Yet Implemented ##"
         elsif result.type == 'problematic'
-          @output.puts result.text.colorize :orange
+          @output.puts result.text
           Indent(depth+1)
           @output.puts " ## Problematic ##"
         else
-          @output.puts result.text.colorize :red
+          @output.puts result.text
           if result.messages.is_a? Array
             result.messages.each do |message|
               Indent(depth+1)
@@ -72,41 +72,43 @@ module Sapphire
 
       def TestPassed(test)
         @passing_count = @passing_count + 1
-        @output.print ".".colorize :green
+        @output.print "."
       end
 
       def TestFailed(test)
         @failing_count = @failing_count + 1
         Add test
-        @output.print "F".colorize :red
+        @output.print "F"
       end
 
       def TestPending(test)
         @pending_count = @pending_count + 1
         Add test
-        @output.print "*".colorize :yellow
+        @output.print "*"
       end
 
       def TestProblematic(test)
         @problematic_count = @problematic_count + 1
         Add test
         #look of disapproval
-        @output.print "\u0CA0_\u0CA0".colorize :orange
+        @output.print "\u0CA0_\u0CA0"
       end
 
       def Add(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)
-          @not_passing = @not_passing.merge({ r => r })
-        elsif !result_passes and (r.item.is_a? And or r.item.parent.is_a? Given)
-          @not_passing = @not_passing.merge({ r.parent => r.parent })
+        if !result_passes and (r.item.is_a? Given or r.item.is_a? Background)
+          @not_passing = @not_passing.merge!({ r => r })
+        elsif !result_passes and (r.item.is_a? When)
+          @not_passing = @not_passing.merge!({ r.parent => r.parent })
+        elsif !result_passes and (r.item.is_a? And and r.item.parent.is_a? Given)
+          @not_passing = @not_passing.merge!({ r.parent => r.parent })
         elsif !result_passes and (r.item.is_a? And and r.parent.item.is_a? When)
-          @not_passing = @not_passing.merge({ r.parent => r.parent })
+          @not_passing = @not_passing.merge!({ r.parent.parent => r.parent.parent })
         elsif !result_passes and (r.item.is_a? Then)
-          @not_passing = @not_passing.merge({ r.parent => r.parent })
+          @not_passing = @not_passing.merge!({ r.parent.parent => r.parent.parent })
         elsif !result_passes and (r.item.is_a? And and r.parent.item.is_a? Then)
-          @not_passing = @not_passing.merge({ r.parent.parent => r.parent.parent })
+          @not_passing = @not_passing.merge!({ r.parent.parent.parent => r.parent.parent.parent })
         end
 
       end
@@ -114,6 +116,7 @@ module Sapphire
       def OutputResults()
         @output.puts ""
 
+
         @not_passing.keys.each do |key|
           self.PrintResult @not_passing[key]
         end
@@ -121,10 +124,10 @@ module Sapphire
         @output.puts ""
         @output.puts "Finished in " + (@end - @start).round().to_s + " seconds."
         @output.puts "Test Count: " + @test_count.to_s
-        @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)
+        @output.puts "Passing: " + @passing_count.to_s
+        @output.puts "Failing: " + @failing_count.to_s
+        @output.puts "Pending: " + @pending_count.to_s
+        @output.puts "Problematic: " + @problematic_count.to_s
       end
 
       def Output(result, depth)

data/lib/sapphire/Testing/Executable.rb

@@ -1,6 +1,16 @@
 module Sapphire
   module Testing
     module Executable
+
+      def pend()
+        start = Time.now
+        Report do |x| x.TestStarted(self) end
+
+        result = ResultTree.new(self.text, TestResult.new("pending", self, "Pending", "", Time.now - start))
+        self.AddResult(result)
+        Report do |x| x.TestPending(result) end
+      end
+
       def execute()
         start = Time.now
         Report do |x| x.TestStarted(self) end

data/lib/sapphire/Testing/ResultTree.rb

@@ -18,10 +18,6 @@ module Sapphire
 
         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

data/lib/sapphire/Testing/TestRunnerAdapter.rb

@@ -9,46 +9,56 @@ module Sapphire
       end
 
       def execute()
-        Report do |x| x.ScenarioStart(self) end
+        Report do |reporter| reporter.ScenarioStart(self) end
 
-        self.backgrounds.each do |b|
+        self.backgrounds.each do |background|
 
-          b.execute
+          background.execute
 
-          b.and.each do |g_a|
+          background.and.each do |background_and|
 
-            g_a.execute
+            background_and.execute
 
           end
 
         end
 
-        self.givens.each do |g|
-          g.when.each do |w|
+        self.givens.each do |given|
+          given.when.each do |when_|
 
-            g.execute
+            if when_.value.is_a? Pending
+              given.pend()
 
-            g.and.each do |g_a|
+              given.and.each do |given_and|
 
-              g_a.execute
+                given_and.pend()
 
+              end
+            else
+              given.execute()
+
+              given.and.each do |given_and|
+
+                given_and.execute()
+
+              end
             end
 
-            w.execute
+            when_.execute
 
-            w.and.each do |w_a|
+            when_.and.each do |when_and|
 
-              w_a.execute
+              when_and.execute
 
             end
 
-            w.then.each do |t|
+            when_.then.each do |then_|
 
-              t.execute
+              then_.execute
 
-              t.and.each do |t_a|
+              then_.and.each do |then_and|
 
-                t_a.execute
+                then_and.execute
 
               end
 
@@ -56,15 +66,15 @@ module Sapphire
 
           end
 
-          if(g.finally)
+          if(given.finally)
 
-            g.finally.execute
+            given.finally.execute
 
           end
 
         end
 
-        Report do |x| x.ScenarioComplete(self) end
+        Report do |reporter| reporter.ScenarioComplete(self) end
 
       end
     end

data/lib/sapphire/WebAbstractions/Controls/List.rb

@@ -40,7 +40,7 @@ module Sapphire
         x = self.FindAll
         x.each do |item|
           if item.text.include? value
-            return Evaluation.new(item.text, value)
+            return ContainsComparison.new(Evaluation.new(value, item.text))
           end
         end
 

data/lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.7.0"
+  VERSION = "0.7.2"
 end

data/lib/sapphire.rb

@@ -6,7 +6,6 @@ require 'yaml'
 require 'selenium-webdriver'
 require 'delegate'
 require 'Forwardable'
-require 'colorize'
 
 require 'sapphire/Adapters'
 require 'sapphire/Testing'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-25 00:00:00.000000000Z
+date: 2012-02-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &9901632 !ruby/object:Gem::Requirement
+  requirement: &9963168 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9901632
+  version_requirements: *9963168
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &9901380 !ruby/object:Gem::Requirement
+  requirement: &9962916 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9901380
+  version_requirements: *9962916
 - !ruby/object:Gem::Dependency
   name: Platform
-  requirement: &9901128 !ruby/object:Gem::Requirement
+  requirement: &9962664 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9901128
+  version_requirements: *9962664
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email:
@@ -163,8 +163,6 @@ files:
 - lib/sapphire/Extensions/Symbol.rb
 - lib/sapphire/Extensions.rb
 - lib/sapphire/JobAbstractions/Job.rb
-- lib/sapphire/Sessions/Parameter.rb
-- lib/sapphire/Sessions/Storage.rb
 - lib/sapphire/TeamCity/TeamCityReporter.rb
 - lib/sapphire/TeamCity.rb
 - lib/sapphire/Testing/ConsoleReporter.rb

data/lib/sapphire/Sessions/Parameter.rb

@@ -1,36 +0,0 @@
-module Sapphire
-  module Sessions
-
-    def Parameter(item)
-      Parameters.instance.Add(item) if item.is_a? Hash
-      return Parameters.instance.Get(item) if item.is_a? Symbol
-    end
-
-    class Parameters
-      def self.create
-        @@instance ||= Parameters.new
-      end
-
-      def self.instance
-        @@instance ||= self.create
-      end
-
-      def initialize()
-        $parameters ||= {}
-      end
-
-      def Add(item)
-        $parameters.merge! item
-      end
-
-      def Contains(item)
-        $parameters.has_key? item
-      end
-
-      def Get(item)
-        $parameters[item]
-      end
-    end
-
-  end
-end

data/lib/sapphire/Sessions/Storage.rb

@@ -1,17 +0,0 @@
-module Sapphire
-  module Sessions
-    class Storage
-      def self.create
-        @@instance ||= Storage.new
-      end
-
-      def self.instance
-        @@instance ||= self.create
-      end
-
-      def initialize()
-        $storage ||= {}
-      end
-    end
-  end
-end