allure-rspec 2.13.3 → 2.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d0dae51e4db6c27206a0030078093da323272cfe37474a258f9202628bc23dd
-  data.tar.gz: e007ebdab6c1657dfa63bf2c6c47d6bad790f01f245df579dd41d2e3453b1e22
+  metadata.gz: afcc5a2dfc396dc25bdf88815e525a64150e6929b6888b7d416ecbcb458abf8e
+  data.tar.gz: 4566d418f42a82c7cbdb03f08f9812afc468ff2cf9866dafeb42e37e8e0031a3
 SHA512:
-  metadata.gz: 45c5a098080a3eb4110bf997dd7f927a38447460fd0882b3e4e2e91f7ddaf76337b93af85ec1ac980c88c4730e2cb299f0428c1cc3dd41559491ab3e0e0b2d33
-  data.tar.gz: fbd4ed49c73f18ec326f3775d44b58bfc5ce177b747d01872b9f126f7e211aaec7f2bf81046d85a60e27df25f85b00be30e146c6c25d0e48e75bddf079f7af30
+  metadata.gz: 21da1ae0df8fc7c5b1baa1c7fa561366f24cb77f0de0a79fe31389ce79d263b9de6ba23ec864fe66f6f32383a0d5080890794085d2f3c95632be37fce615b8ee
+  data.tar.gz: c46c715f9a11543e910cea93a8bc087aa02daab854ca8baa2e8d993496ce5bed06690957e43cb5e9c50a317b6db0dacd6f453c69d9ff17d6aa0ba756df11e654

data/lib/allure_rspec/formatter.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "ruby2_keywords"
 require "rspec/core"
 require "rspec/core/formatters/base_formatter"
 
@@ -20,7 +21,7 @@ module AllureRspec
 
     RSpec::Core::Example.class_eval do
       Allure.singleton_methods.each do |method|
-        define_method(method) { |*args, &block| Allure.__send__(method, *args, &block) }
+        ruby2_keywords define_method(method) { |*args, &block| Allure.__send__(method, *args, &block) }
       end
     end
 

data/lib/allure_rspec/rspec_model.rb

@@ -48,6 +48,21 @@ module AllureRspec
 
     private
 
+    # @param [RSpec::Core::Example] example
+    # @return [Array<Allure::Label>]
+    def links(example)
+      tms_links(example.metadata) + issue_links(example.metadata)
+    end
+
+    # Get allure status from result
+    # @param [RSpec::Core::Example::ExecutionResult] result
+    # @return [Symbol]
+    def status(result)
+      return Allure::ResultUtils.status(result.exception) if result.status == :failed
+
+      ALLURE_STATUS[result.status]
+    end
+
     # @param [RSpec::Core::Example] example
     # @return [Array<Allure::Label>]
     def labels(example)
@@ -58,8 +73,8 @@ module AllureRspec
         labels << Allure::ResultUtils.story_label(example.description)
         labels << Allure::ResultUtils.test_class_label(File.basename(example.file_path, ".rb"))
         labels << severity(example.metadata)
-        labels.push(*suite_labels(example.example_group))
         labels.push(*tag_labels(example.metadata))
+        labels.push(*suite_labels(example.example_group))
       end
     end
 
@@ -67,28 +82,30 @@ module AllureRspec
     # @param [RSpec::Core::ExampleGroup] example_group
     # @return [Array<Allure::Label>]
     def suite_labels(example_group)
-      example_group.parent_groups.map(&:description).yield_self do |parents|
-        [].tap do |labels|
-          labels << Allure::ResultUtils.suite_label((parents.length == 1) ? parents.last : parents[-2])
-          labels << Allure::ResultUtils.parent_suite_label(parents.last) if parents.length > 1
-          labels << Allure::ResultUtils.sub_suite_label(parents[0..-3].join(" > ")) if parents.length > 2
-        end
+      [].tap do |labels|
+        parents = example_group.parent_groups.map(&:description)
+        labels << Allure::ResultUtils.suite_label(suite(parents))
+        labels << Allure::ResultUtils.parent_suite_label(parent_suite(parents))
+        labels << Allure::ResultUtils.sub_suite_label(sub_suites(parents))
       end
     end
 
-    # @param [RSpec::Core::Example] example
-    # @return [Array<Allure::Label>]
-    def links(example)
-      tms_links(example.metadata) + issue_links(example.metadata)
+    # @param [Array<String>] parents
+    # @return [String]
+    def suite(parents)
+      parents.length == 1 ? parents.last : parents[-2]
     end
 
-    # Get allure status from result
-    # @param [RSpec::Core::Example::ExecutionResult] result
-    # @return [Symbol]
-    def status(result)
-      return Allure::ResultUtils.status(result.exception) if result.status == :failed
+    # @param [Array<String>] parents
+    # @return [String]
+    def parent_suite(parents)
+      parents.length > 1 ? parents.last : nil
+    end
 
-      ALLURE_STATUS[result.status]
+    # @param [Array<String>] parents
+    # @return [String]
+    def sub_suites(parents)
+      parents.length > 2 ? parents[0..-3].join(" > ") : nil
     end
 
     # Strip relative ./ form path

data/lib/allure_rspec/tag_parser.rb

@@ -7,27 +7,23 @@ module AllureRspec
     # @param [Hash] metadata
     # @return [Array<Allure::Label>]
     def tag_labels(metadata)
-      return [] unless Allure::Config.link_tms_pattern && metadata.keys.any? { |k| allure?(k) }
+      return [] unless metadata.keys.any? { |k| allure?(k) }
 
-      metadata.select { |k, _v| allure?(k) }.values.map { |v| Allure::ResultUtils.tag_label(v) }
+      metadata.select { |k| allure?(k) }.values.map { |v| Allure::ResultUtils.tag_label(v) }
     end
 
     # Get tms links
     # @param [Hash] metadata
     # @return [Array<Allure::Link>]
     def tms_links(metadata)
-      return [] unless Allure::Config.link_tms_pattern && metadata.keys.any? { |k| tms?(k) }
-
-      metadata.select { |k, _v| tms?(k) }.values.map { |v| Allure::ResultUtils.tms_link(v) }
+      matching_links(metadata, :tms)
     end
 
     # Get issue links
     # @param [Hash] metadata
     # @return [Array<Allure::Link>]
     def issue_links(metadata)
-      return [] unless Allure::Config.link_issue_pattern && metadata.keys.any? { |k| issue?(k) }
-
-      metadata.select { |k, _v| issue?(k) }.values.map { |v| Allure::ResultUtils.issue_link(v) }
+      matching_links(metadata, :issue)
     end
 
     # Get severity
@@ -50,6 +46,19 @@ module AllureRspec
 
     private
 
+    # @param [Hash] metadata
+    # @param [Symbol] type
+    # @return [Array<Allure::Link>]
+    def matching_links(metadata, type)
+      unless Allure::Config.public_send("link_#{type}_pattern") && metadata.keys.any? { |k| __send__("#{type}?", k) }
+        return []
+      end
+
+      metadata
+        .select { |k| __send__("#{type}?", k) }.values
+        .map { |v| Allure::ResultUtils.public_send("#{type}_link", v) }
+    end
+
     # Does key match custom allure label
     # @param [Symbol] key
     # @return [boolean]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: allure-rspec
 version: !ruby/object:Gem::Version
-  version: 2.13.3
+  version: 2.13.4
 platform: ruby
 authors:
 - Andrejs Cunskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: allure-ruby-commons
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.3
+        version: 2.13.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.3
+        version: 2.13.4
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.8'
+- !ruby/object:Gem::Dependency
+  name: ruby2_keywords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 description: Cucumber adaptor to generate rich allure test reports
 email: andrejs.cunskis@gmail.com
 executables: []
@@ -73,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Allure rspec ruby adaptor