sapphire 0.5.8 → 0.5.9

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

@@ -141,7 +141,7 @@ module Sapphire
 
           end if array.is_a? Array
 
-          x = self.FindElement array.keys.first, array.fetch(hash.keys.first) if array.is_a? Hash
+          x = self.FindElement array.keys.first, array.fetch(array.keys.first) if array.is_a? Hash
           return x if x != nil
         }
         return element if element != nil
@@ -158,18 +158,19 @@ module Sapphire
             if item.is_a? Hash
                 begin
                   x = self.FindElements item.keys.first, item.fetch(item.keys.first)
+                  x = nil if x.is_a? Array and x.empty?
                 rescue
                   #do nothing, let it keep looping
                 end
             end
 
             x = self.FindElements item[0], item[1] if item.is_a? Array
-
+            x = nil if x.is_a? Array and x.empty?
             return x if x != nil
 
           end if array.is_a? Array
 
-          x = self.FindElement array.keys.first, array.fetch(hash.keys.first) if array.is_a? Hash
+          x = self.FindElement array.keys.first, array.fetch(array.keys.first) if array.is_a? Hash
           return x if x != nil
         }
         return element if element != nil

data/lib/sapphire/Testing/Coverage/Covers.rb

@@ -1,7 +1,20 @@
 module Sapphire
   module Testing
     module Coverage
-      def Covers(token)
+      def Covers(hash)
+        token = hash.keys.first
+        target = hash[hash.keys.first]
+
+        if(token == :feature)
+          $current_feature = target
+        elsif(token == :requirement)
+          $current_rule = target
+        elsif(token == :test)
+          feature = $features.select { |f| f.token == $current_feature }[0]
+          requirement = feature.requirements.select { |r| r.token == $current_rule }[0]
+          test = requirement.tests.select { |t| t.token == target }[0]
+          test.is_covered = true
+        end
 
       end
     end

data/lib/sapphire/Testing/Coverage/Feature.rb

@@ -9,24 +9,23 @@ module Sapphire
 
       class Feature
 
-        attr_reader :business_rules
+        attr_reader :requirements
         attr_reader :token
 
         def initialize(token)
           @token = token
-          @business_rules = []
+          @requirements = []
         end
 
-        def AddRule(business_rule)
-          @business_rules << business_rule
+        def AddRequirement(requirement)
+          @requirements << requirement
         end
 
         def AddTest(test)
-          @business_rules.last().AddTest test
+          @requirements.last().AddTest test
         end
 
       end
-
     end
   end
 end

data/lib/sapphire/Testing/Coverage/{BusinessRule.rb → Requirement.rb}

@@ -1,21 +1,21 @@
 module Sapphire
   module Testing
     module Coverage
-      def BusinessRule(hash, &block)
-        $features.last.AddRule(BusinessRule.new(hash, block))
+      def Requirement(hash, &block)
+        $features.last.AddRequirement(Requirement.new(hash))
+        block.call
       end
 
-      class BusinessRule
+      class Requirement
 
         attr_reader :token
         attr_reader :priority
         attr_reader :tests
 
-        def initialize(hash, block)
+        def initialize(hash)
           @token = hash.keys.first
           @priority = hash[hash.keys.first]
           @tests = []
-          block.call
         end
 
         def AddTest(test)

data/lib/sapphire/Testing/Coverage/Test.rb

@@ -7,8 +7,10 @@ module Sapphire
 
       class Test
 
-        attr_reader :token
-        attr_reader :type
+        attr_reader   :token
+        attr_reader   :type
+        attr_accessor :is_covered
+        attr_accessor :covered_by
 
         def initialize(token, hash)
           @token = token

data/lib/sapphire/version.rb

@@ -1,3 +1,3 @@
 module Sapphire
-  VERSION = "0.5.8"
+  VERSION = "0.5.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sapphire
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-18 00:00:00.000000000Z
+date: 2011-11-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &10100448 !ruby/object:Gem::Requirement
+  requirement: &10066392 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10100448
+  version_requirements: *10066392
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &10100196 !ruby/object:Gem::Requirement
+  requirement: &10066140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10100196
+  version_requirements: *10066140
 - !ruby/object:Gem::Dependency
   name: Platform
-  requirement: &10099944 !ruby/object:Gem::Requirement
+  requirement: &10065888 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10099944
+  version_requirements: *10065888
 description: An automated web acceptance test framework for non-technical resources
   using selenium-wedriver.
 email:
@@ -146,9 +146,9 @@ files:
 - lib/sapphire/TeamCity/TeamCityReporter.rb
 - lib/sapphire/TeamCity.rb
 - lib/sapphire/Testing/ConsoleReporter.rb
-- lib/sapphire/Testing/Coverage/BusinessRule.rb
 - lib/sapphire/Testing/Coverage/Covers.rb
 - lib/sapphire/Testing/Coverage/Feature.rb
+- lib/sapphire/Testing/Coverage/Requirement.rb
 - lib/sapphire/Testing/Coverage/Test.rb
 - lib/sapphire/Testing/Executable.rb
 - lib/sapphire/Testing/ExpectationException.rb