allure-cucumber 2.13.8.4 → 2.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d05d04e828c1e3c796f0a8ee9d26350b4a816e3b920308bbb1643ee0b9a05834
-  data.tar.gz: 7314606464d41168642ca404a8d4cdf5c58404a07e575d4903733939c4a2cee3
+  metadata.gz: 98ad3f0d2bdf151309fc8ce66bffc89a1fdcc38159bcde6e55c764591a631bcc
+  data.tar.gz: 36084b12d289dd34d839ccf987116630575663e6d599e6e9e132c399f129a845
 SHA512:
-  metadata.gz: 58d9b0318a5eda29c5a1ea4761d11058017003028ca3cf3cdf9af33976debc86e9fd84bb50745df8f9ad817e982c1b1920dc6dcf9e5624e7068932c43f840bf2
-  data.tar.gz: 65c5e41e6dbc07c955431ae37387f97ca22d7f5d8d22d54b1b805298847e64330c8bc36c6ef2e7d378110cff3a5d5c9db0f97ba4232f4b3d5ebee103d246ff18
+  metadata.gz: 6113e15c4e3a1a3d1f21c8c40777fbd7e52cf5382dc02a2c91f8b4f38c12b4f3fb97d122b657d03a57f78208083c9bddf6224c992710763f736fbe343c27b9dc
+  data.tar.gz: bca4e3569efb395e4c9e1e893cd4300155cd06e2c2a35e92ef8b2735d69a6beb665daa9a4f668cc9cf0d7645c1c734e5b0ad76cf9ced22a114ad5840f3f4e403

data/README.md

@@ -43,9 +43,12 @@ Common allure configuration is set via `AllureCucumber.configure` method. To cha
 require "allure-cucumber"
 
 AllureCucumber.configure do |config|
-  config.results_directory = "/whatever/you/like"
+  config.results_directory = "report/allure-results"
   config.clean_results_directory = true
   config.logging_level = Logger::INFO
+  config.logger = Logger.new($stdout, Logger::DEBUG)
+  config.environment = "staging"
+
   # these are used for creating links to bugs or test cases where {} is replaced with keys of relevant items
   config.link_tms_pattern = "http://www.jira.com/browse/{}"
   config.link_issue_pattern = "http://www.jira.com/browse/{}"

data/lib/allure-cucumber.rb

@@ -9,13 +9,13 @@ require_rel "allure_cucumber"
 module AllureCucumber
   class << self
     # Get allure cucumber configuration
-    # @return [Allure::CucumberConfig]
+    # @return [AllureCucumber::CucumberConfig]
     def configuration
       CucumberConfig.instance
     end
 
     # Set allure configuration
-    # @yieldparam [Allure::CucumberConfig]
+    # @yieldparam [AllureCucumber::CucumberConfig]
     # @yieldreturn [void]
     # @return [void]
     def configure

data/lib/allure_cucumber/config.rb

@@ -1,11 +1,25 @@
 # frozen_string_literal: true
 
 require "singleton"
-require "forwardable"
 
 module AllureCucumber
-  # Allure cucumber configuration
-  class CucumberConfig < Allure::Config
+  # Allure Cucumber configuration class
+  #
+  # @!attribute results_directory
+  #   @return [String]
+  # @!attribute clean_results_directory
+  #   @return [Boolean]
+  # @!attribute link_issue_pattern
+  #   @return [String]
+  # @!attribute link_tms_pattern
+  #   @return [String]
+  # @!attribute logging_level
+  #   @return [Integer]
+  # @!attribute [r] logger
+  #   @return [Logger]
+  # @!attribute environment
+  #   @return [String]
+  class CucumberConfig
     include Singleton
     extend Forwardable
 
@@ -31,14 +45,21 @@ module AllureCucumber
                    :link_tms_pattern=,
                    :logging_level,
                    :logging_level=,
+                   :logger,
+                   :logger=,
                    :results_directory,
-                   :results_directory=
+                   :results_directory=,
+                   :environment,
+                   :environment=
 
-    attr_writer :tms_prefix, :issue_prefix, :severity_prefix
+    attr_writer :tms_prefix,
+                :issue_prefix,
+                :severity_prefix,
+                :epic_prefix,
+                :feature_prefix,
+                :story_prefix
 
     def initialize
-      super()
-
       @allure_config = Allure.configuration
     end
 

data/lib/allure_cucumber/formatter.rb

@@ -19,14 +19,15 @@ module AllureCucumber
 
     # @param [Cucumber::Configuration] config
     def initialize(config)
-      Allure.configure do |allure_config|
-        allure_config.results_directory = config.out_stream if config.out_stream.is_a?(String)
+      allure_config = AllureCucumber.configuration
+      allure_config.results_directory = config.out_stream if config.out_stream.is_a?(String)
 
-        names = allure_config.test_names
-        config.name_regexps.push(*names.map { |name| /#{name}/ }) if names
-      end
+      Allure.lifecycle = @lifecycle = Allure::AllureLifecycle.new(allure_config)
+
+      @cucumber_model ||= AllureCucumberModel.new(config, allure_config)
 
-      @cucumber_model = AllureCucumberModel.new(config)
+      names = Allure::TestPlan.test_names
+      config.name_regexps.push(*names.map { |name| /#{name}/ }) if names
 
       config.on_event(:test_run_started) { |event| on_test_run_started(event) }
       config.on_event(:test_case_started) { |event| on_test_case_started(event) }
@@ -88,13 +89,7 @@ module AllureCucumber
 
     private
 
-    attr_accessor :cucumber_model
-
-    # Get thread specific lifecycle
-    # @return [Allure::AllureLifecycle]
-    def lifecycle
-      Allure.lifecycle
-    end
+    attr_reader :lifecycle, :cucumber_model
 
     # Is hook fixture like Before, After or Step as AfterStep
     # @param [String] text

data/lib/allure_cucumber/models/cucumber_model.rb

@@ -8,8 +8,9 @@ module AllureCucumber
   # Support class for transforming cucumber test entities in to allure model entities
   class AllureCucumberModel
     # @param [Cucumber::Configuration] config
-    def initialize(config)
+    def initialize(config, allure_config)
       @ast_lookup = Cucumber::Formatter::AstLookup.new(config)
+      @config = allure_config
     end
 
     # Convert to allure test result
@@ -17,7 +18,7 @@ module AllureCucumber
     # @return [Allure::TestResult]
     def test_result(test_case)
       scenario = Scenario.new(test_case, ast_lookup)
-      parser = MetadataParser.new(scenario)
+      parser = MetadataParser.new(scenario, config)
 
       Allure::TestResult.new(
         name: scenario.name,
@@ -28,7 +29,8 @@ module AllureCucumber
         labels: parser.labels,
         links: parser.links,
         parameters: parser.parameters,
-        status_details: parser.status_details
+        status_details: parser.status_details,
+        environment: config.environment
       )
     end
 
@@ -65,7 +67,7 @@ module AllureCucumber
 
     private
 
-    attr_reader :ast_lookup, :lifecycle
+    attr_reader :ast_lookup, :config
 
     # @param [Step] step
     # @return [Array<Allure::Attachment>]

data/lib/allure_cucumber/models/metadata_parser.rb

@@ -3,8 +3,13 @@
 module AllureCucumber
   # Cucumber tag parser helper methods
   class MetadataParser
-    def initialize(scenario)
+    # Metadata parser instance
+    #
+    # @param [AllureCucumber::Scenario] scenario
+    # @param [AllureCucumber::CucumberConfig] config
+    def initialize(scenario, config)
       @scenario = scenario
+      @config = config
     end
 
     # @return [Array<Allure::Label>]
@@ -17,7 +22,7 @@ module AllureCucumber
         severity,
         *behavior_labels,
         *tag_labels
-      ]
+      ].select(&:value)
     end
 
     # @return [Array<Allure::Label>]
@@ -57,7 +62,7 @@ module AllureCucumber
     def behavior_labels
       epic = tag_value(:epic) || scenario.feature_folder
       feature = tag_value(:feature) || scenario.feature_name
-      story = tag_value(:story) || scenario.name
+      story = tag_value(:story)
 
       [
         Allure::ResultUtils.epic_label(epic),
@@ -68,8 +73,7 @@ module AllureCucumber
 
     private
 
-    # @return [AllureCucumber::Scenario]
-    attr_reader :scenario
+    attr_reader :scenario, :config
 
     # Get scenario tags
     #
@@ -80,14 +84,14 @@ module AllureCucumber
 
     # @return [Array<Allure::Link>]
     def tms_links
-      return [] unless AllureCucumber.configuration.link_tms_pattern
+      return [] unless config.link_tms_pattern
 
       matching_links(:tms)
     end
 
     # @return [Array<Allure::Link>]
     def issue_links
-      return [] unless AllureCucumber.configuration.link_issue_pattern
+      return [] unless config.link_issue_pattern
 
       matching_links(:issue)
     end
@@ -96,20 +100,24 @@ module AllureCucumber
     # @return [Array<Allure::Link>]
     def matching_links(type)
       pattern = reserved_patterns[type]
+      link_pattern = config.public_send("link_#{type}_pattern")
+
       tags
         .select { |tag| tag.match?(pattern) }
-        .map { |tag| tag.match(pattern) { |match| Allure::ResultUtils.public_send("#{type}_link", match[type]) } }
+        .map do |tag|
+          tag.match(pattern) { |match| Allure::ResultUtils.public_send("#{type}_link", match[type], link_pattern) }
+        end
     end
 
     # @return [Hash<Symbol, Regexp>]
     def reserved_patterns
       @reserved_patterns ||= {
-        tms: /@#{AllureCucumber.configuration.tms_prefix}(?<tms>\S+)/,
-        issue: /@#{AllureCucumber.configuration.issue_prefix}(?<issue>\S+)/,
-        severity: /@#{AllureCucumber.configuration.severity_prefix}(?<severity>\S+)/,
-        epic: /@#{AllureCucumber.configuration.epic_prefix}(?<epic>\S+)/,
-        feature: /@#{AllureCucumber.configuration.feature_prefix}(?<feature>\S+)/,
-        story: /@#{AllureCucumber.configuration.story_prefix}(?<story>\S+)/,
+        tms: /@#{config.tms_prefix}(?<tms>\S+)/,
+        issue: /@#{config.issue_prefix}(?<issue>\S+)/,
+        severity: /@#{config.severity_prefix}(?<severity>\S+)/,
+        epic: /@#{config.epic_prefix}(?<epic>\S+)/,
+        feature: /@#{config.feature_prefix}(?<feature>\S+)/,
+        story: /@#{config.story_prefix}(?<story>\S+)/,
         flaky: /@flaky/,
         muted: /@muted/,
         known: /@known/

data/lib/allure_cucumber/models/scenario.rb

@@ -34,9 +34,7 @@ module AllureCucumber
     # Scenario description or it's location
     # @return [String]
     def description
-      @description ||= begin
-        scenario.description.empty? ? "Location - #{test_case.location}" : scenario.description.strip
-      end
+      @description ||= scenario.description.empty? ? "Location - #{test_case.location}" : scenario.description.strip
     end
 
     # Scenario outline row parameters
@@ -86,7 +84,9 @@ module AllureCucumber
     # @return [String]
     def example_row
       @example_row ||= begin
-        "Examples (##{scenario_source.examples.table_body.index { |row| row.id == scenario_source.row.id } + 1})"
+        scneario_examples = scenario_source.examples.table_body.index { |row| row.id == scenario_source.row.id } + 1
+
+        "Examples (##{scneario_examples})"
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: allure-cucumber
 version: !ruby/object:Gem::Version
-  version: 2.13.8.4
+  version: 2.14.1
 platform: ruby
 authors:
 - Andrejs Cunskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-27 00:00:00.000000000 Z
+date: 2021-06-10 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.8.4
+        version: 2.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.8.4
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -33,7 +33,7 @@ dependencies:
         version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 description: Cucumber adaptor to generate rich allure test reports
 email: andrejs.cunskis@gmail.com
 executables: []
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Allure cucumber ruby adaptor