rspec_junit_formatter_bitbucket 0.2.0.pre.183 → 0.2.0.pre.184

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b32f751c5d566b1ba7d753793467d9f973afd22f9dc33867640010b547bcdbb
-  data.tar.gz: f888a34263fd84f891cbea4cf0d9be6273a0cb593c818c0b4b20c65a3196102f
+  metadata.gz: 732405ac58b598dd568c29384523d436c64234955b87d0aa98e5ae040bd50718
+  data.tar.gz: 04e5ccd1ebe946bc862b8e003a72d50f7f1fe3805c290534bdd25ae6cbae20cd
 SHA512:
-  metadata.gz: 9910fa487fda1bf91af4fe73c6ff06040afdcd493a7770bfd28896bba856c11730af9b81eeab773fc5eca523b83681732458e351a378db372db398cf599f7e1f
-  data.tar.gz: 77dcfb2d7127394b74e445d6a74a438d8d440d99235db5206fb2043c46f8fdae9debfb44a020db5acf249ec0b1af9e697c023e494ba7b6ec50e17be06a3a2921
+  metadata.gz: d3dd286fae44f56c7d91d29791bfe9b6e6dd7ab49a19cc64a7028147e6801034867157616c504d9c30be3fb782e6d3632419d4bb8b5fafc3ea80d28ff279a568
+  data.tar.gz: 19d24e27b4c825ca0106b101b972738f2cfff6d368c872986b8f632101922405fced8f0b599668c0becc121b6d5407926ae9726d65f980324d8d9673926c75c4

data/lib/rspec_junit_formatter_bitbucket/format.rb

@@ -7,7 +7,6 @@ module RspecJunitFormatterBitbucket
   module Format
     # Inversion of character range from https://www.w3.org/TR/xml/#charsets
     ILLEGAL_REGEXP = Regexp.new(
-=begin
       '\[\^' \
       '\u{9}' \
       '\u{a}' \
@@ -16,20 +15,10 @@ module RspecJunitFormatterBitbucket
       '\u{e000}-\u{fffd}' \
       '\u{10000}-\u{10ffff}' \
       '\]'
-=end
-    "[^" <<
-    "\u{9}" << # => \t
-    "\u{a}" << # => \n
-    "\u{d}" << # => \r
-    "\u{20}-\u{d7ff}" <<
-    "\u{e000}-\u{fffd}" <<
-    "\u{10000}-\u{10ffff}" <<
-    "]"
     )
 
     # Replace illegals with a Ruby-like escape
     ILLEGAL_REPLACEMENT = Hash.new do |_, c|
-=begin
       x = c.ord
       if x <= 0xff
         '\\x%02X'.freeze % x
@@ -38,36 +27,18 @@ module RspecJunitFormatterBitbucket
       else
         '\\u{%<X>}'.freeze % x
       end.freeze
-=end
-      x = c.ord
-      if x <= 0xff
-        "\\x%02X".freeze % x
-      elsif x <= 0xffff
-        "\\u%04X".freeze % x
-      else
-        "\\u{%X}".freeze % x
-      end.freeze
     end.update(
-=begin
       "\0".freeze => '\\0'.freeze,
       "\a".freeze => '\\a'.freeze,
       "\b".freeze => '\\b'.freeze,
       "\f".freeze => '\\f'.freeze,
       "\v".freeze => '\\v'.freeze,
       "\e".freeze => '\\e'.freeze
-=end
-      "\0".freeze => "\\0".freeze,
-      "\a".freeze => "\\a".freeze,
-      "\b".freeze => "\\b".freeze,
-      "\f".freeze => "\\f".freeze,
-      "\v".freeze => "\\v".freeze,
-      "\e".freeze => "\\e".freeze,
     ).freeze
 
     # Discouraged characters from https://www.w3.org/TR/xml/#charsets
     # Plus special characters with well-known entity replacements
     DISCOURAGED_REGEXP = Regexp.new(
-=begin
       '[' \
       '\u{22}' \
       '\u{26}' \
@@ -94,59 +65,24 @@ module RspecJunitFormatterBitbucket
       '\u{ffffe}-\u{fffff}' \
       '\u{10fffe}-\u{10ffff}' \
       ']'
-=end
-    "[" <<
-    "\u{22}" << # => "
-    "\u{26}" << # => &
-    "\u{27}" << # => '
-    "\u{3c}" << # => <
-    "\u{3e}" << # => >
-    "\u{7f}-\u{84}" <<
-    "\u{86}-\u{9f}" <<
-    "\u{fdd0}-\u{fdef}" <<
-    "\u{1fffe}-\u{1ffff}" <<
-    "\u{2fffe}-\u{2ffff}" <<
-    "\u{3fffe}-\u{3ffff}" <<
-    "\u{4fffe}-\u{4ffff}" <<
-    "\u{5fffe}-\u{5ffff}" <<
-    "\u{6fffe}-\u{6ffff}" <<
-    "\u{7fffe}-\u{7ffff}" <<
-    "\u{8fffe}-\u{8ffff}" <<
-    "\u{9fffe}-\u{9ffff}" <<
-    "\u{afffe}-\u{affff}" <<
-    "\u{bfffe}-\u{bffff}" <<
-    "\u{cfffe}-\u{cffff}" <<
-    "\u{dfffe}-\u{dffff}" <<
-    "\u{efffe}-\u{effff}" <<
-    "\u{ffffe}-\u{fffff}" <<
-    "\u{10fffe}-\u{10ffff}" <<
-    "]"
     )
 
     # Translate well-known entities, or use generic unicode hex entity
     DISCOURAGED_REPLACEMENTS = Hash.new do |_, c|
       "&#x#{c.ord.to_s(16)};".freeze
-      # "&#x#{c.ord.to_s(16)};".freeze
     end.update(
-=begin
       '"'.freeze => '&quot;'.freeze,
       '&'.freeze => '&amp;'.freeze,
       "'".freeze => '&apos;'.freeze,
       '<'.freeze => '&lt;'.freeze,
       '>'.freeze => '&gt;'.freeze
-=end
-      ?".freeze => "&quot;".freeze,
-      ?&.freeze => "&amp;".freeze,
-      ?'.freeze => "&apos;".freeze,
-      ?<.freeze => "&lt;".freeze,
-      ?>.freeze => "&gt;".freeze,
     ).freeze
 
     def self.escape(text)
       text.to_s
           .encode(Encoding::UTF_8)
-          # .gsub(ILLEGAL_REGEXP, ILLEGAL_REPLACEMENT)
-          # .gsub(DISCOURAGED_REGEXP, DISCOURAGED_REPLACEMENTS)
+          .gsub(ILLEGAL_REGEXP, ILLEGAL_REPLACEMENT)
+          .gsub(DISCOURAGED_REGEXP, DISCOURAGED_REPLACEMENTS)
     end
 
     # rubocop:disable Metrics/LineLength

data/lib/rspec_junit_formatter_bitbucket/xml.rb

@@ -11,12 +11,12 @@ module RspecJunitFormatterBitbucket
     end
 
     def dump
-      @output << %(<test-suite #{rm_char_nw_line(testsuite_attr)}>\n)
+      @output << %(<testsuite #{rm_char_nw_line(testsuite_attr)}>\n)
       @output << %(<properties>\n)
       @output << %(<property #{rm_char_nw_line(property_attr)}/>\n)
       @output << %(</properties>\n)
       dump_examples
-      @output << %(</test-suite>\n)
+      @output << %(</testsuite>\n)
     end
 
     private
@@ -73,10 +73,10 @@ module RspecJunitFormatterBitbucket
     end
 
     def dump_example(example)
-      @output << %(<test-case #{rm_char_nw_line(testcase_attr(example))}>)
+      @output << %(<testcase #{rm_char_nw_line(testcase_attr(example))}>)
       yield if block_given?
       dump_output(example)
-      @output << %(</test-case>\n)
+      @output << %(</testcase>\n)
     end
 
     def testcase_attr(example)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec_junit_formatter_bitbucket
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre.183
+  version: 0.2.0.pre.184
 platform: ruby
 authors:
 - VAILLANT Jeremy