Merge branch 'bug-35'

Conflicts:
	Gemfile.lock
	allure-rspec.gemspec
	lib/allure-rspec/version.rb

Author: smecsia

Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    allure-rspec (0.6.8)
-      allure-ruby-adaptor-api (= 0.6.5)
-      rspec (~> 3.0)
+    allure-rspec (0.6.9)
+      allure-ruby-adaptor-api (= 0.6.6)
+      rspec (~> 3.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    allure-ruby-adaptor-api (0.6.5)
+    allure-ruby-adaptor-api (0.6.6)
       mimemagic
       nokogiri (~> 1.6.0)
       uuid
@@ -17,21 +17,22 @@ GEM
       systemu (~> 2.6.2)
     mimemagic (0.2.1)
     mini_portile (0.6.2)
-    nokogiri (1.6.5)
+    nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    rake (10.3.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    rake (10.4.2)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.1)
     systemu (2.6.4)
     uuid (2.3.7)
       macaddr (~> 1.0)

allure-rspec.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'rspec', '~> 3.0'
-  s.add_dependency 'allure-ruby-adaptor-api', '0.6.5'
+  s.add_dependency 'rspec', '~> 3.2'
+  s.add_dependency 'allure-ruby-adaptor-api', '0.6.6'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'

lib/allure-rspec/formatter.rb

@@ -72,16 +72,44 @@ def stop_test(example, opts = {})
     end
 
     def metadata(example_or_group)
-      (example_or_group.respond_to? :group) ?
+      group?(example_or_group) ?
           example_or_group.group.metadata :
           example_or_group.example.metadata
     end
 
+    def group?(example_or_group)
+      (example_or_group.respond_to? :group)
+    end
+
     def labels(example_or_group)
-      ALLOWED_LABELS.
-          map { |label| [label, metadata(example_or_group)[label]] }.
+      labels = ALLOWED_LABELS.map { |label| [label, metadata(example_or_group)[label]] }.
           find_all { |value| !value[1].nil? }.
           inject({}) { |res, value| res.merge(value[0] => value[1]) }
+      detect_feature_story(labels, example_or_group)
+      labels
+    end
+
+    def method_or_key(metadata, key)
+      metadata.respond_to?(key) ? metadata.send(key) : metadata[key]
+    end
+
+    def detect_feature_story(labels, example_or_group)
+      metadata = metadata(example_or_group)
+      is_group = group?(example_or_group)
+      parent = (method_or_key(metadata, :parent_example_group))
+      if labels[:feature] === true
+        description = (!is_group && parent) ? method_or_key(parent, :description) : method_or_key(metadata, :description)
+        labels[:feature] = description
+        if labels[:story] === true
+          if parent
+            grandparent = parent && method_or_key(parent, :parent_example_group)
+            labels[:feature] = (!is_group && grandparent) ? method_or_key(grandparent, :description) :
+                method_or_key(parent, :description)
+          end
+          labels[:story] = description
+        end
+      end
+      labels
     end
 
   end

lib/allure-rspec/hooks.rb

@@ -11,46 +11,68 @@ module OverrideHooksMethods
       alias_method :old_hooks, :hooks
 
       def hooks
-        if @__hooks.nil?
-          old = old_hooks
-          @__hooks ||= OverridenHookCollections.new(old.instance_variable_get(:@owner), old.instance_variable_get(:@data))
-          [:before, :after].each { |scope|
-            @__hooks[scope][:step] = HookCollection.new
-          }
-        end
-        @__hooks
+        @__hooks ||= OverridenHookCollections.new(self, RSpec::Core::FilterableItemRepository::UpdateOptimized)
       end
 
       private
 
       class OverridenHookCollections < RSpec::Core::Hooks::HookCollections
-        private
+        def initialize(*args)
+          super
+          @before_step_hooks = nil
+          @after_step_hooks = nil
+        end
 
-        SCOPES = [:example, :context, :suite, :step]
 
-        def before_step_hooks_for(example)
-          RSpec::Core::Hooks::HookCollection.new(RSpec::Core::FlatMap.flat_map(@owner.parent_groups.reverse) do |a|
-            a.hooks[:before][:step]
-          end).for(example)
+        def run(position, scope, example_or_group)
+          if scope == :step
+            run_owned_hooks_for(position, scope, example_or_group)
+          else
+            super
+          end
         end
 
-        def after_step_hooks_for(example)
-          RSpec::Core::Hooks::HookCollection.new(RSpec::Core::FlatMap.flat_map(@owner.parent_groups) do |a|
-            a.hooks[:after][:step]
-          end).for(example)
+        protected
+
+        # TODO: This code is highly related to the RSpec internals.
+        # It should be supported with every new RSpec version
+        def matching_hooks_for(position, scope, example_or_group)
+          if scope == :step
+            repo = hooks_for(position, scope) || example_or_group.example_group.hooks.hooks_for(position, scope)
+            metadata = case example_or_group
+                         when RSpec::Core::ExampleGroup then
+                           example_or_group.class.metadata
+                         else
+                           example_or_group.metadata
+                       end
+            repo.nil? ? EMPTY_HOOK_ARRAY : repo.items_for(metadata)
+          else
+            super
+          end
         end
 
-        def find_hook(hook, scope, example_or_group, initial_procsy)
-          case [hook, scope]
-            when [:before, :step]
-              before_step_hooks_for(example_or_group)
-            when [:after, :step]
-              after_step_hooks_for(example_or_group)
+        def hooks_for(position, scope)
+          if scope == :step
+            position == :before ? @before_step_hooks : @after_step_hooks
+          else
+            super
+          end
+        end
+
+        def ensure_hooks_initialized_for(position, scope)
+          if scope == :step
+            if position == :before
+              @before_step_hooks ||= @filterable_item_repo_class.new(:all?)
             else
-              super(hook, scope, example_or_group, initial_procsy)
+              @after_step_hooks ||= @filterable_item_repo_class.new(:all?)
+            end
+          else
+            super
           end
         end
 
+        SCOPES = [:example, :context, :step]
+
         def known_scope?(scope)
           SCOPES.include?(scope) || super(scope)
         end

lib/allure-rspec/version.rb

@@ -1,5 +1,5 @@
 module AllureRSpec # :nodoc:
   module Version # :nodoc:
-    STRING = '0.6.8'
+    STRING = '0.6.9'
   end
 end

spec/nometavalue_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+require 'tempfile'
+
+describe "Some feature", :feature do
+  describe "Some story", :story do
+    it "20 should be greater than 19", :story do
+      expect(20).to be > 19
+    end
+  end
+
+end

spec/shared_example_spec.rb

@@ -6,20 +6,20 @@
 
   context "initialized with 3 items" do
     it "says it has three items" do
-      collection.size.should eq(3)
+      expect(collection.size).to be 3
     end
   end
 
   describe "#include?" do
     context "with an an item that is in the collection" do
       it "returns true" do
-        collection.include?(7).should be_true
+        expect(collection.include?(7)).to be true
       end
     end
 
     context "with an an item that is not in the collection" do
       it "returns false" do
-        collection.include?(9).should be_false
+        expect(collection.include?(9)).to be false
       end
     end
   end