report_builder 1.8 → 1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1008b5d94e81a5cb70e14bbc1218a383c6ad9a81
-  data.tar.gz: 68ec449f21c5d25b62df7eac24cfb8251d393435
+SHA256:
+  metadata.gz: 0aa1ff8b4caff189599fe6e76c52a49c43dbdbd47d8e099ab9aa81055d0703cd
+  data.tar.gz: 3e1fbfed2f713b8319b1fa01e3a9ab9d3fabdf80a48e00c64d8fd7c48019c614
 SHA512:
-  metadata.gz: 799fea6775b06e8a39f49fc7c755bb047a1185893c00da2088b0152344d0a9f745b52deeb0b9c22435e89b2aa4592fa85f375b83823cc221afbb189a482c8834
-  data.tar.gz: 8c382e15ee1787476d47834539345366c1e145cdda2889c54fc79cab5519bb015ff067372940f721b79d4dba4308a1f3e910588e3ec8841a18a8e55899fad9e3
+  metadata.gz: 57bff744c235ba470d960f116eb5d28883e224d0d72910012e5264e24ae0c51e68618366255746bc07803aa7d934b55667e4b3df9bc6c1b9a66b523d171c4cef
+  data.tar.gz: b9cf16c68a1fd6e92c97f037f2dd55ccbb321fda0574e5fef651702982939758c786d8f60da6f5d884ed9d682fd17327716eedf10a50d6c5ea13ba266305f3dc

data/CHANGELOG.md

@@ -3,8 +3,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 
-## [Unreleased](https://github.com/rajatthareja/ReportBuilder/compare/v1.8...master)
+## [Unreleased](https://github.com/rajatthareja/ReportBuilder/compare/v1.9...master)
 
+## [1.9](https://github.com/rajatthareja/ReportBuilder/compare/v1.8...v1.9) - 2020-06-06
+### Changed
+- Json 1.8.1 to 2.3.0
+- Include last fail run instead of first
+- [Few other small changes](https://github.com/rajatthareja/ReportBuilder/compare/v1.8...v1.9)
 
 ## [1.8](https://github.com/rajatthareja/ReportBuilder/compare/v1.7...v1.8) - 2018-09-02
 ### Fixed

data/README.md

@@ -175,13 +175,6 @@ Use voice commands for easy navigation and search
 
 We're open to any contribution. It has to be tested properly though.
 
-## Collaborators
-
-* [Rajat Thareja](https://rajatthareja.com)
-* [Justin Commu](https://github.com/tk8817)
-* [Eric Kessler](https://github.com/enkessler)
-* [Jeff Morgan](https://github.com/cheezy)
-
 ## License
 
 Copyright (c) 2017 [MIT LICENSE](LICENSE)

data/bin/report_builder

@@ -37,7 +37,7 @@ opt_parser = OptionParser.new do |opts|
     options[:include_images] = include_images
   end
 
-  opts.on('-vc', '--voice_commands', 'Enable voice commands for easy navigation and search') do |voice_commands|
+  opts.on('--voice_commands', 'Enable voice commands for easy navigation and search') do |voice_commands|
     options[:voice_commands] = voice_commands
   end
 
@@ -50,8 +50,9 @@ opt_parser = OptionParser.new do |opts|
   end
 
   opts.on('-I', '--info a:x,b:y,c:z', Array, 'List of additional info') do |list|
+    options[:additional_info] = { }
     list.each do |i|
-      key, value = i.split(':')
+      key, value = i.split(':', 2)
       options[:additional_info][key] = value
     end
   end

data/lib/report_builder/builder.rb

@@ -39,7 +39,7 @@ module ReportBuilder
       html_report_path = options[:html_report_path] || options[:report_path]
       if options[:report_types].include? 'HTML'
         File.open(html_report_path + '.html', 'w') do |file|
-          file.write get(groups.size > 1 ? 'group_report' : 'report').result(binding).gsub('  ', '').gsub("\n\n", '')
+          file.write get(groups.size > 1 ? 'group_report' : 'report').result(binding)
         end
       end
 
@@ -73,13 +73,17 @@ module ReportBuilder
         input_path.each do |group_name, group_path|
           files = get_files group_path
           puts "Error:: No file(s) found at #{group_path}" if files.empty?
-          groups << {'name' => group_name, 'features' => get_features(files)} rescue next
+          groups << {'name' => group_name, 'features' => get_features(files)}
         end
-        raise 'Error:: Invalid Input File(s). Please provide valid cucumber JSON output file(s)' if groups.empty?
       else
         files = get_files input_path
         raise "Error:: No file(s) found at #{input_path}" if files.empty?
-        groups << {'features' => get_features(files)} # rescue raise('Error:: Invalid Input File(s). Please provide valid cucumber JSON output file(s)')
+        groups << {'features' => get_features(files)}
+      end
+      groups.each do |this_group|
+        this_group['features'].each do |feature|
+          feature['elements'] = feature['elements'].sort_by { |v| v['line']}
+        end
       end
       groups
     end
@@ -116,6 +120,7 @@ module ReportBuilder
           features << JSON.parse(data)
         rescue StandardError
           puts 'Warning:: Invalid Input File ' + file
+          puts 'JSON Error:: ' + $!.to_s
           next
         end
       end.flatten.group_by do |feature|
@@ -190,11 +195,11 @@ module ReportBuilder
           scenario.merge! 'status' => scenario_status(scenario), 'duration' => total_time(scenario['before']) + total_time(scenario['steps']) + total_time(scenario['after'])
         end
         feature['elements'] = feature['elements'].group_by do |scenario|
-          scenario['id'] + scenario['line'].to_s
+          scenario['id'] + ':' + scenario['line'].to_s
         end.values.map do |scenario_group|
           the_scenario = scenario_group.find do |scenario|
             scenario['status'] == 'passed'
-          end || scenario_group.first
+          end || scenario_group.last
           if scenario_group.size > 1
             the_scenario['name'] += " (x#{scenario_group.size})"
           end

data/report_builder.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'report_builder'
-  s.version     = '1.8'
+  s.version     = '1.9'
   s.bindir      = 'bin'
   s.summary     = 'ReportBuilder'
   s.description = 'Ruby gem to merge Cucumber JSON reports and build mobile-friendly HTML Test Report, JSON report and retry file.'
@@ -9,14 +9,14 @@ Gem::Specification.new do |s|
   s.email       = 'rajat.thareja.1990@gmail.com'
   s.homepage    = 'https://reportbuilder.rajatthareja.com'
   s.license     = 'MIT'
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.0.0'
   s.requirements << 'Cucumber >= 2.1.0 test results in JSON format'
 
   s.files       = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(sample/|css/|js/|pkg/|testing/|coverage/|CNAME|.gitignore|appveyor.yml|.travis.yml|_config.yml|Gemfile|Rakefile|rb.ico)}) }
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files  = s.files.grep(%r{^(testing)/})
 
-  s.add_runtime_dependency 'json', '>= 1.8.1'
+  s.add_runtime_dependency 'json', '>= 2.3.0'
 
   s.add_development_dependency 'rake', '< 13.0'
   s.add_development_dependency 'rspec', '< 4.0'

data/template/error.erb

@@ -4,18 +4,18 @@
   </div>
 
   <div class="collapsible-body <%= options[:color] %> lighten-4">
-    <ul class="collection failedScenarioList">
+    <div class="collection failedScenarioList">
       <% features.each_with_index do |feature, f| %>
           <% feature['elements'].each_with_index do |scenario, s| %>
               <% if scenario['error'] %>
                   <% if scenario['error'] == error %>
-                      <li class="collection-item failedScenario <%= options[:color] %> lighten-5 red-text">
-                        <i class="material-icons">highlight_off</i>&nbsp;<a class="modal-trigger red-text" href="#<%= "#{gid}f#{f}s#{s}" %>"><%= scenario['name'] %></a>
-                      </li>
+                      <a class="collection-item failedScenario <%= options[:color] %> lighten-5 red-text modal-trigger waves-effect waves-light" href="#<%= "#{gid}f#{f}s#{s}" %>">
+                        <i class="material-icons">highlight_off</i>&nbsp;<%= scenario['name'] %>
+                      </a>
                   <% end %>
               <% end %>
           <% end %>
       <% end %>
-    </ul>
+    </div>
   </div>
 </li>

data/template/feature.erb

@@ -5,14 +5,12 @@
   </div>
 
   <div class="collapsible-body <%= options[:color] %> lighten-4">
-    <ul class="collection scenarioList">
+    <div class="collection scenarioList <%= options[:color] %>">
       <% feature['elements'].each_with_index do |scenario, s| %>
-          <li class="collection-item scenario <%= scenario['status'] %>">
-            <a class="waves-effect waves-light modal-trigger white-text" href="#<%= "#{fid}s#{s}" %>">
-              <b><%= scenario['keyword'] %></b> <%= scenario['name'] %>&nbsp;(<%= duration(scenario['duration']) %>)
-            </a>
-          </li>
+        <a class="collection-item scenario modal-trigger waves-effect waves-light white-text <%= scenario['status'] %>" href="#<%= "#{fid}s#{s}" %>">
+          <b><%= scenario['keyword'] %></b> <%= scenario['name'] %>&nbsp;(<%= duration(scenario['duration']) %>)
+        </a>
       <% end %>
-    </ul>
+    </div>
   </div>
 </li>

data/template/footer.erb

@@ -7,7 +7,7 @@
   </div>
 </footer>
 
-<script type="text/javascript" src="https://cdn.rawgit.com/rajatthareja/ReportBuilder/v1.8/js/report.builder.min.js"></script>
+<script type="text/javascript" src="https://cdn.rawgit.com/rajatthareja/ReportBuilder/v1.9/js/report.builder.min.js"></script>
 
 <% if options[:voice_commands] %>
 <script src="//cdnjs.cloudflare.com/ajax/libs/annyang/2.6.0/annyang.min.js"></script>

data/template/head.erb

@@ -8,7 +8,7 @@
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
   <link href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css" rel="stylesheet">
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css" media="screen,projection"/>
-  <link href="https://cdn.rawgit.com/rajatthareja/ReportBuilder/v1.8/css/report.builder.min.css" rel="stylesheet">
+  <link href="https://cdn.rawgit.com/rajatthareja/ReportBuilder/v1.9/css/report.builder.min.css" rel="stylesheet">
 
   <% if options[:additional_css] %>
       <% if options[:additional_css] =~ /^http(|s):\/\/.*\.css$/ %>

data/template/summary.erb

@@ -5,6 +5,12 @@
     <th>Scenario</th>
     <th class="hide">Tags</th>
     <th>Status</th>
+
+
+    <% if options[:tag_filter] %>
+        <th class="hide-on-small-only">Filtered Tags</th>
+    <% end %>
+
     <th class="hide-on-small-only">Error</th>
   </tr>
   </thead>

data/template/summary_row.erb

@@ -2,8 +2,8 @@
   <%= feature['name'] %>
 </td>
 
-<td class="hoverable">
-  <a class="modal-trigger white-text" href="#<%= sid %>"><%= scenario['name'] %></a>
+<td class="hoverable modal-trigger white-text" data-target="<%= sid %>">
+  <%= scenario['name'] %>
 </td>
 
 <td class="hide">
@@ -18,6 +18,16 @@
   <%= scenario['status'] %>
 </td>
 
+<% if options[:tag_filter] %>
+    <td class="hide-on-small-only">
+      <% scenario['tags'].each do |tag| %>
+          <% if tag['name'].match(/#{options[:tag_filter]}/) %>
+              <%= tag['name'] %>
+          <% end %>
+      <% end %>
+    </td>
+<% end %>
+
 <td class="hide-on-small-only">
   <% if scenario['error'] %>
       <%= scenario['error'] %>

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: report_builder
 version: !ruby/object:Gem::Version
-  version: '1.8'
+  version: '1.9'
 platform: ruby
 authors:
 - Rajat Thareja
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-02 00:00:00.000000000 Z
+date: 2020-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
 description: Ruby gem to merge Cucumber JSON reports and build mobile-friendly HTML
@@ -98,19 +98,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - Cucumber >= 2.1.0 test results in JSON format
-rubyforge_project: 
-rubygems_version: 2.4.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: ReportBuilder
 test_files: []