allure-rspec 0.5.4 → 0.6.1

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    allure-rspec (0.5.3)
-      allure-ruby-adaptor-api (= 0.6.6)
-      rspec (~> 2.14.0)
+    allure-rspec (0.6.1)
+      allure-ruby-adaptor-api (= 0.6.3)
+      rspec (= 3.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    allure-ruby-adaptor-api (0.6.6)
+    allure-ruby-adaptor-api (0.6.3)
       mimemagic
       nokogiri (~> 1.6.0)
       uuid
@@ -16,18 +16,22 @@ GEM
     macaddr (1.7.1)
       systemu (~> 2.6.2)
     mimemagic (0.2.1)
-    mini_portile (0.6.2)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    rake (10.1.0)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
+    mini_portile (0.6.0)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    rake (10.3.2)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.4)
     systemu (2.6.4)
     uuid (2.3.7)
       macaddr (~> 1.0)

data/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', '~> 2.14.0'
-  s.add_dependency 'allure-ruby-adaptor-api', '0.6.6'
+  s.add_dependency 'rspec', '3.0.0'
+  s.add_dependency 'allure-ruby-adaptor-api', '0.6.3'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'

data/lib/allure-rspec.rb

@@ -6,8 +6,6 @@ require 'allure-rspec/dsl'
 require 'allure-rspec/hooks'
 
 module AllureRSpec
-  include AllureRSpec::DSL
-
   module Config
     class << self
       attr_accessor :output_dir
@@ -42,7 +40,7 @@ module AllureRSpec
   class << self
     def configure(&block)
       yield Config
-      AllureRubyAdaptorApi.configure {|c|
+      AllureRubyAdaptorApi.configure { |c|
         c.output_dir = Config.output_dir
       }
     end

data/lib/allure-rspec/adaptor.rb

@@ -3,10 +3,12 @@ module AllureRSpec
     def self.included(base)
       AllureRSpec.context.rspec = base
       base.send :include, AllureRSpec::DSL
-      if RSpec.configuration.formatters.find_all { |f| f.is_a?(AllureRSpec::Formatter) }.empty?
+      if RSpec::Core::Formatters::Loader.formatters.keys.find_all { |f| f == AllureRSpec::Formatter }.empty?
+        RSpec::Core::Formatters.register AllureRSpec::Formatter, *AllureRSpec::Formatter::NOTIFICATIONS
         RSpec.configuration.add_formatter(AllureRSpec::Formatter)
       end
       RSpec::Core::ExampleGroup.send :include, AllureRSpec::Hooks
+      RSpec::Core::Example.send :include, AllureRSpec::DSL::Example
     end
   end
 end

data/lib/allure-rspec/dsl.rb

@@ -2,44 +2,47 @@ require 'digest'
 require 'mimemagic'
 module AllureRSpec
   module DSL
-    def current_step
-      if defined? @@__current_step
-        @@__current_step
-      else
-        nil
+    module Example
+
+      def current_step
+        if defined? @@__current_step
+          @@__current_step
+        else
+          nil
+        end
       end
-    end
 
-    def step(step, &block)
-      suite = self.example.metadata[:example_group][:description_args].first
-      test = self.example.metadata[:description]
-      AllureRubyAdaptorApi::Builder.start_step(suite, test, step)
-      __with_step step, &block
-      AllureRubyAdaptorApi::Builder.stop_step(suite, test, step)
-    end
+      def step(step, &block)
+        suite = metadata[:example_group][:description_args].first.to_s
+        test = metadata[:description].to_s
+        AllureRubyAdaptorApi::Builder.start_step(suite, test, step)
+        __with_step step, &block
+        AllureRubyAdaptorApi::Builder.stop_step(suite, test, step)
+      end
 
-    def attach_file(title, file, opts = {})
-      suite = self.example.metadata[:example_group][:description_args].first
-      test = self.example.metadata[:description]
-      step = current_step
-      AllureRubyAdaptorApi::Builder.add_attachment suite, test, opts.merge(:file => file, :title => title, :step => step)
-    end
+      def attach_file(title, file, opts = {})
+        suite = metadata[:example_group][:description_args].first.to_s
+        test = metadata[:description].to_s
+        step = current_step
+        AllureRubyAdaptorApi::Builder.add_attachment suite, test, opts.merge(:title => title, :file => file, :step => step)
+      end
 
-    private
+      private
 
-    def __mutex
-      @@__mutex ||= Mutex.new
-    end
+      def __mutex
+        @@__mutex ||= Mutex.new
+      end
 
-    def __with_step(step, &block)
-      __mutex.synchronize do
-        begin
-          @@__current_step = step
-          AllureRSpec.context.rspec.send :run_hook, :before, :step, example
-          yield
-        ensure
-          AllureRSpec.context.rspec.send :run_hook, :after, :step, example
-          @@__current_step = nil
+      def __with_step(step, &block)
+        __mutex.synchronize do
+          begin
+            @@__current_step = step
+            AllureRSpec.context.rspec.hooks.send :run, :before, :step, self
+            yield self
+          ensure
+            AllureRSpec.context.rspec.hooks.send :run, :after, :step, self
+            @@__current_step = nil
+          end
         end
       end
     end

data/lib/allure-rspec/formatter.rb

@@ -5,53 +5,52 @@ module AllureRSpec
 
   class Formatter < RSpec::Core::Formatters::BaseFormatter
 
+    NOTIFICATIONS = [:example_group_started, :example_group_finished, :example_started,
+                     :example_failed, :example_passed, :example_pending, :start, :stop]
     ALLOWED_LABELS = [:feature, :story, :severity, :language, :framework]
 
     def example_failed(example)
+      res = example.example.execution_result
       AllureRubyAdaptorApi::Builder.stop_test(
-          example.metadata[:example_group][:description_args].first,
-          example.metadata[:description],
-          example.metadata[:execution_result].merge(
-              :caller => example.metadata[:caller],
-              :exception => example.metadata[:execution_result][:exception]
-          )
+          example.example.example_group.description,
+          example.example.description.to_s,
+          {
+              :exception => res.exception,
+              :status => res.status,
+              :finished_at => res.finished_at,
+              :started_at => res.started_at
+          }
       )
-      super
     end
 
     def example_group_finished(group)
-      AllureRubyAdaptorApi::Builder.stop_suite(group.metadata[:example_group][:description_args].first)
-      super
+      AllureRubyAdaptorApi::Builder.stop_suite(group.group.description.to_s)
     end
 
     def example_group_started(group)
-      AllureRubyAdaptorApi::Builder.start_suite(group.metadata[:example_group][:description_args].first, labels(group))
-      super
+      AllureRubyAdaptorApi::Builder.start_suite(group.group.description.to_s, labels(group))
     end
 
     def example_passed(example)
+      res = example.example.execution_result
       AllureRubyAdaptorApi::Builder.stop_test(
-          example.metadata[:example_group][:description_args].first,
-          example.metadata[:description],
-          example.metadata[:execution_result].merge(:caller => example.metadata[:caller])
+          example.example_group.description,
+          example.description.to_s,
+          {
+              :status => res.status,
+              :finished_at => res.finished_at,
+              :started_at => res.started_at
+          }
       )
-      super
     end
 
     def example_pending(example)
-      AllureRubyAdaptorApi::Builder.stop_test(
-          example.metadata[:example_group][:description_args].first,
-          example.metadata[:description],
-          :status => :pending
-      )
-      super
     end
 
     def example_started(example)
-      suite = example.metadata[:example_group][:description_args].first
-      test = example.metadata[:description]
+      suite = example.example.example_group.description
+      test = example.example.description.to_s
       AllureRubyAdaptorApi::Builder.start_test(suite, test, labels(example))
-      super
     end
 
     def start(example_count)
@@ -61,19 +60,23 @@ module AllureRSpec
         FileUtils.rm_rf(dir)
       end
       FileUtils.mkdir_p(dir)
-      super
     end
 
-    def stop
+    def stop(notify)
       AllureRubyAdaptorApi::Builder.build!
-      super
     end
 
     private
 
+    def metadata(example_or_group)
+      (example_or_group.respond_to? :group) ?
+          example_or_group.group.metadata :
+          example_or_group.example.metadata
+    end
+
     def labels(example_or_group)
       ALLOWED_LABELS.
-          map { |label| [label, example_or_group.metadata[label]] }.
+          map { |label| [label, metadata(example_or_group)[label]] }.
           find_all { |value| !value[1].nil? }.
           inject({}) { |res, value| res.merge(value[0] => value[1]) }
     end

data/lib/allure-rspec/hooks.rb

@@ -7,47 +7,53 @@ module AllureRSpec
 
     module OverrideHooksMethods
       include RSpec::Core::Hooks
-      alias_method :old_extract_scope_from, :extract_scope_from
-      alias_method :old_hooks, :hooks
-      alias_method :old_find_hook, :find_hook
 
-      SCOPES = [:each, :all, :suite, :step]
+      alias_method :old_hooks, :hooks
 
       def hooks
         if @__hooks.nil?
-          @__hooks ||= old_hooks
+          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
       end
+      private
 
-      def before_step_hooks_for(example)
-        HookCollection.new(parent_groups.reverse.map { |a| a.hooks[:before][:step] }.flatten).for(example)
-      end
+      class OverridenHookCollections < RSpec::Core::Hooks::HookCollections
+        private
 
-      def after_step_hooks_for(example)
-        HookCollection.new(parent_groups.map { |a| a.hooks[:after][:step] }.flatten).for(example)
-      end
+        SCOPES = [:each, :all, :suite, :step]
 
-      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)
-          else
-            old_find_hook(hook, scope, example_or_group, initial_procsy)
+        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)
         end
-      end
 
-      def extract_scope_from(args)
-        if SCOPES.include?(args.first)
-          args.shift
-        else
-          old_extract_scope_from(args)
+        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)
         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)
+            else
+              super(hook, scope, example_or_group, initial_procsy)
+          end
+        end
+
+        def known_scope?(scope)
+          SCOPES.include?(scope) || super(scope)
+        end
+
       end
     end
   end

data/lib/allure-rspec/version.rb

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

data/spec/another_spec.rb

@@ -12,12 +12,10 @@ describe "Some another spec", :feature => ["Some Feature"], :severity => :normal
   end
 
   it "10 cannot be greater than 19", :story => ["Some story"]  do
-    10.should > 19
+    expect(10).to be > 19
   end
 
   it "4 must not be equal to 5" do
-    5.should == 4
+    expect(5).to be eql(4)
   end
-
-  it "must be pending"
 end

data/spec/extend_steps_spec.rb

@@ -35,20 +35,19 @@ describe AllureRSpec, :feature => "Basics" do
     puts "after all"
   end
 
-  it "should build", :story => "Main story" do
-    attach_file "test-file1", Tempfile.new("test")
-    step "step1" do
-      attach_file "test-file2", Tempfile.new("test")
+  it "should build", :story => "Main story" do |ex|
+    ex.attach_file "test-file1", Tempfile.new("test")
+    ex.step "step1" do |step|
+      step.attach_file "test-file2", Tempfile.new("test")
     end
 
-    step "step2" do
-      attach_file "logo", File.new("logo.png")
-      5.should be > 1
+    ex.step "step2" do |step|
+      step.attach_file "logo", File.new("logo.png")
+      expect(5).to be > 1
     end
 
-    step "step3" do
-
-      0.should == 1
+    ex.step "step3" do
+      expect(0).to be eql(1)
     end
   end
 end

metadata

@@ -1,69 +1,78 @@
 --- !ruby/object:Gem::Specification
 name: allure-rspec
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.1
+  prerelease: 
 platform: ruby
 authors:
 - Ilya Sadykov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: allure-ruby-adaptor-api
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.6
+        version: 0.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.6
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Adaptor to use Allure framework along with the RSpec 2
@@ -91,26 +100,26 @@ files:
 homepage: http://allure.qatools.ru
 licenses:
 - Apache2
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
-summary: allure-rspec-0.5.4
+specification_version: 3
+summary: allure-rspec-0.6.1
 test_files: []
-has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 5a3d449b806a2d0770c852e75d40f29a44e1786c
-  data.tar.gz: 447f526780571ed70fb9d1a78b59762bd406b933
-SHA512:
-  metadata.gz: 3b9c08a1ce890a68f26b54bc3412e82231672338007425752b895bccdb68fe2958de70c07e0c40532d329d14228a4a35ebace6134413ebc0910d20e21ca02c19
-  data.tar.gz: a6ac9a4afd1b20443c33f625a1b3f4a1e8f9faa789064dce6123c50252c06a52d4addf13e57ba4813485619b6516f4868a0e4a211823b96c18db8869ea126268