teamcity_formatter 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6bdd2ee8cc84d330e2b27bba38179598a764965
-  data.tar.gz: fc2da8f296b354e4d4be2036cb63808ca796514f
+  metadata.gz: b1e00edb6a138b70ca7bc206f8c6d1ad15661bda
+  data.tar.gz: 412bc7a87bdc89b82d7f4a485d0e7f253401a16e
 SHA512:
-  metadata.gz: b2a1e15dd7c4a1ff3bdf15245ec15f62a76bd53727ffe3516ad6617b2e3527bec4c4fbd49e2e0329b19e2804d24df4171bfa8fcedec668d3f65e8db797f5d1fb
-  data.tar.gz: 2d74eff353b22ec7801467d63ee2160921531052baf9ddeee4a172175039bfb9affebd68bf7657c8f971cbf5144c6f3fca2b7810e99c43c13fa7898ea3af99c5
+  metadata.gz: 216e531e2e73a4fa757a23e1e06b2f0733fed19265e26ebc342a1808e5cc604daa5d7dde38fdafddcdddd85abf5ce38a66d2e2583e24cff9e0fbe880c6effe6d
+  data.tar.gz: afb159525bd623b3219994a58c87fa07326eea2d08545740a42b63ed862432a3e847d6bc2dd94b8c50c50e8d5dd5bdb417e089a263367a508be55d8b877092fd

data/lib/team_city_formatter/formatter.rb

@@ -76,7 +76,11 @@ module TeamCityFormatter
           example = @scenario_outline.examples.find { |example| example.column_values == cuke_table_row.cells }
           test_name = scenario_outline_test_name(@scenario_outline.name, example.column_values)
           if exception
-            @logger.test_failed(test_name, exception)
+            if exception.is_a? ::Cucumber::Pending
+              @logger.test_ignored(test_name, 'Pending test')
+            else
+              @logger.test_failed(test_name, exception)
+            end
           end
           @logger.test_finished(test_name)
 
@@ -117,7 +121,11 @@ module TeamCityFormatter
     def after_scenario(cuke_scenario)
       test_name = @scenario.name
       if @exception
-        @logger.test_failed_with_exception(test_name, @exception)
+        if @exception.is_a? ::Cucumber::Pending
+          @logger.test_ignored(test_name, 'Pending test')
+        else
+          @logger.test_failed_with_exception(test_name, @exception)
+        end
       end
       # a background step previously failed and was reported the first time the failure happened
       if (cuke_scenario.status == :skipped) && (@exception == nil)
@@ -131,7 +139,7 @@ module TeamCityFormatter
     end
 
     def scenario_outline_test_name(scenario_outline_name, example_column_values)
-      "#{scenario_outline_name} - | #{example_column_values.join(' | ')} |"
+      "#{scenario_outline_name} | #{example_column_values.join(' | ')} |"
     end
   end
 end

data/lib/team_city_formatter/logger.rb

@@ -5,15 +5,15 @@ module TeamCityFormatter
     end
 
     def test_suite_started(test_suite_name)
-      render_output("##teamcity[testSuiteStarted name='#{teamcity_escape(test_suite_name)}' timestamp='#{timestamp}']")
+      render_output("##teamcity[testSuiteStarted flowId='#{flow_id}' name='#{teamcity_escape(test_suite_name)}' timestamp='#{timestamp}']")
     end
 
     def test_suite_finished(test_suite_name)
-      render_output("##teamcity[testSuiteFinished name='#{teamcity_escape(test_suite_name)}' timestamp='#{timestamp}']")
+      render_output("##teamcity[testSuiteFinished flowId='#{flow_id}' name='#{teamcity_escape(test_suite_name)}' timestamp='#{timestamp}']")
     end
 
     def test_started(test_name)
-      render_output("##teamcity[testStarted name='#{teamcity_escape(test_name)}' timestamp='#{timestamp}' captureStandardOutput='true']")
+      render_output("##teamcity[testStarted flowId='#{flow_id}' name='#{teamcity_escape(test_name)}' captureStandardOutput='true' timestamp='#{timestamp}']")
     end
 
     def test_failed_with_exception(test_name, exception)
@@ -22,11 +22,15 @@ module TeamCityFormatter
     end
 
     def test_failed(test_name, details)
-      render_output("##teamcity[testFailed name='#{teamcity_escape(test_name)}' timestamp='#{timestamp}' details='#{teamcity_escape(details)}']")
+      render_output("##teamcity[testFailed flowId='#{flow_id}' name='#{teamcity_escape(test_name)}' message='#{teamcity_escape(details)}' timestamp='#{timestamp}']")
+    end
+
+    def test_ignored(test_name, details)
+      render_output("##teamcity[testIgnored flowId='#{flow_id}' name='#{teamcity_escape(test_name)}' message='#{teamcity_escape(details)}' timestamp='#{timestamp}']")
     end
 
     def test_finished(test_name)
-      render_output("##teamcity[testFinished name='#{teamcity_escape(test_name)}' timestamp='#{timestamp}']")
+      render_output("##teamcity[testFinished flowId='#{flow_id}' name='#{teamcity_escape(test_name)}' timestamp='#{timestamp}']")
     end
 
     private
@@ -38,11 +42,13 @@ module TeamCityFormatter
 
     def teamcity_escape(s)
       s.to_s.strip
-        .gsub('|', '||')
-        .gsub("'", "|'")
-        .gsub(']', '|]')
-        .gsub("\r", '|r')
-        .gsub("\n", '|n')
+          .gsub(':', ' -')
+          .gsub('|', '||')
+          .gsub("'", "|'")
+          .gsub(']', '|]')
+          .gsub('[', '|[')
+          .gsub("\r", '|r')
+          .gsub("\n", '|n')
     end
 
     def timestamp_short
@@ -59,5 +65,9 @@ module TeamCityFormatter
       lines = ["#{exception.message} (#{exception.class})"] + exception.backtrace
       lines.join("\n")
     end
+
+    def flow_id
+      Process.pid
+    end
   end
 end

data/readme.md

@@ -39,12 +39,30 @@ Sceanrio Outline Example | Test
 
 Test failures include the stack trace of the exception which triggered the failure.
 
+## Features
+
+### Support [parallel_cucumber](https://rubygems.org/gems/parallel_cucumber)
+
+The formatter now includes a `flowId` attribute in output messages. `flowId` is the test runner process id.
+
+### Pending Scenarios and Scenario Examples
+
+Pending scenarios and scenario examples are logged as ignored tests.
+
 ## Acknowledgements
 
 This gem drew some code from [`cucumber_teamcity`](https://github.com/ankurcha/cucumber_teamcity/). The `cucumber_teamcity` formatter is not compatible with Cucumber 2.
 
 Also, though we did not use code from their project, JetBrains makes available some TeamCity-related code [here](https://github.com/JetBrains/intellij-plugins/tree/master/ruby-testing/src/rb/testing/patch/bdd/teamcity), which may be of interest to others researching TeamCity Cucumber formatters.
 
+Thank you to contributors:
+
+Contributor                                     | Contribution
+---                                             | ---
+[PositiveAlex](https://github.com/PositiveAlex) | Allow cucumber to use the formatter directly from the command line
+[aklossrbh](https://github.com/aklossrbh)       | Support [parallel_cucumber](https://rubygems.org/gems/parallel_cucumber)
+[gricsi](https://github.com/gricsi)             | Log pending scenarios and scenario examples as ignored tests
+
 ## License
 
 Apache License, Version 2.0

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: teamcity_formatter
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Kevin Rood
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-01 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.0'
   name: cucumber
@@ -21,7 +21,7 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.0'
 description: Render cucumber test output in a format consumable by TeamCity
@@ -46,17 +46,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: TeamCity cucumber output formatter