turnip_formatter 0.2.3 → 0.2.4

data/lib/turnip_formatter/printer/tab_feature_statistics.rb

@@ -16,31 +16,30 @@ module TurnipFormatter
             feature_analysis(name, feature_scenarios)
           end
 
-          render_template(:tab_feature_statistics, {analysis_results: results })
+          render_template(:tab_feature_statistics, { analysis_results: results })
         end
 
         private
 
         def feature_analysis(name, scenarios)
           status_group = scenarios.group_by { |s| s.status }
+          status_group.default = []
 
           info = OpenStruct.new(
             name: name,
-            scenarios: scenarios.count,
-            passed: status_count(status_group["passed"]),
-            failed: status_count(status_group["failed"]),
-            pending: status_count(status_group["pending"]),
+            scenario_count: scenarios.size,
+            passed_count: status_group["passed"].size,
+            failed_count: status_group["failed"].size,
+            pending_count: status_group["pending"].size,
             status: 'failed'
           )
 
-          info.status = (info.pending.zero? ? 'passed' : 'pending') if info.failed.zero?
+          if info.failed_count.zero?
+            info.status = info.pending_count.zero? ? 'passed' : 'pending'
+          end
 
           info
         end
-
-        def status_count(scenarios)
-          scenarios.nil? ? 0 : scenarios.count
-        end
       end
     end
   end

data/lib/turnip_formatter/printer/tab_speed_statistics.rb

@@ -11,7 +11,7 @@ module TurnipFormatter
 
         def print_out(passed_scenarios)
           results = speed_analysis(passed_scenarios)
-          render_template(:tab_speed_statistics, {analysis_results: results })
+          render_template(:tab_speed_statistics, { analysis_results: results })
         end
 
         private

data/lib/turnip_formatter/printer/tab_tag_statistics.rb

@@ -23,17 +23,21 @@ module TurnipFormatter
 
         def tag_analysis(name, scenarios)
           status_group = scenarios.group_by { |s| s[:scenario].status }
+          status_group.default = []
 
           info = OpenStruct.new(
             name: name,
-            scenarios: scenarios.count,
-            passed: status_count(status_group["passed"]),
-            failed: status_count(status_group["failed"]),
-            pending: status_count(status_group["pending"]),
+            scenario_count: scenarios.size,
+            passed_count: status_group["passed"].size,
+            failed_count: status_group["failed"].size,
+            pending_count: status_group["pending"].size,
             status: 'failed'
           )
 
-          info.status = (info.pending.zero? ? 'passed' : 'pending') if info.failed.zero?
+          if info.failed_count.zero?
+            info.status = info.pending_count.zero? ? 'passed' : 'pending'
+          end
+
           info
         end
 
@@ -62,10 +66,6 @@ module TurnipFormatter
             end
           end.flatten.group_by { |s| s[:name] }.sort
         end
-
-        def status_count(scenarios)
-          scenarios.nil? ? 0 : scenarios.count
-        end
       end
     end
   end

data/lib/turnip_formatter/template/tab_feature_statistics.erb

@@ -13,10 +13,10 @@
     <% analysis_results.each do |info| %>
       <tr>
         <td><%= info.name %></td>
-        <td><%= info.scenarios %></td>
-        <td><%= info.passed %></td>
-        <td><%= info.failed %></td>
-        <td><%= info.pending %></td>
+        <td><%= info.scenario_count %></td>
+        <td><%= info.passed_count %></td>
+        <td><%= info.failed_count %></td>
+        <td><%= info.pending_count %></td>
         <td class="<%= info.status %>"><%= info.status %></td>
       </tr>
     <% end %>

data/lib/turnip_formatter/template/tab_tag_statistics.erb

@@ -13,10 +13,10 @@
     <% analysis_results.each do |info| %>
       <tr>
         <td><%= info.name %></td>
-        <td><%= info.scenarios %></td>
-        <td><%= info.passed %></td>
-        <td><%= info.failed %></td>
-        <td><%= info.pending %></td>
+        <td><%= info.scenario_count %></td>
+        <td><%= info.passed_count %></td>
+        <td><%= info.failed_count %></td>
+        <td><%= info.pending_count %></td>
         <td class="<%= info.status %>"><%= info.status %></td>
       </tr>
     <% end %>

data/lib/turnip_formatter/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
 module TurnipFormatter
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/spec_helper.rb

@@ -5,8 +5,10 @@ SimpleCov.formatter = Coveralls::SimpleCov::Formatter
 SimpleCov.start do
   add_filter 'spec/'
   add_filter 'vendor/'
+  add_filter 'lib/turnip_formatter/ext'
 end
 
+require 'rspec-html-matchers'
 require 'turnip_formatter'
 Dir.glob(File.dirname(__FILE__) + "/support/**/*.rb") { |f| require(f) }
 

data/spec/turnip_formatter/printer/scenario_spec.rb

@@ -14,8 +14,11 @@ module TurnipFormatter::Printer
       describe '.print_out' do
         subject { Scenario.print_out(scenario) }
 
-        it { should include "<a href=\"##{scenario.id}\">" } # scenario.id
-        it { should include 'Scenario: Scenario' } # h(scenario.name)
+        it { should have_tag 'a', with: { href: '#' + scenario.id } }
+        it { should have_tag 'span.scenario_name', text: /Scenario: Scenario/ }
+        it { should have_tag 'span.feature_name' }
+        it { should have_tag 'ul.tags' }
+        it { should have_tag 'ul.steps' }
       end
     end
 

data/spec/turnip_formatter/printer/step_extra_args_spec.rb

@@ -15,9 +15,18 @@ module TurnipFormatter::Printer
 
         subject { StepExtraArgs.print_out([string]) }
 
-        it { should match %r{<td>State</td>[[:space:]]+<td>Money</td>} }
-        it { should match %r{<td>&lt;Tokushima&gt;</td>[[:space:]]+<td>555</td>} }
-        it { should match %r{<td>&lt;Okinawa&gt;</td>[[:space:]]+<td>368</td>} }
+        it {
+          subject.should have_tag 'table.step_outline' do
+            with_tag 'tr:nth-child(1) td:nth-child(1)', text: 'State'
+            with_tag 'tr:nth-child(1) td:nth-child(2)', text: 'Money'
+
+            with_tag 'tr:nth-child(2) td:nth-child(1)', text: '<Tokushima>'
+            with_tag 'tr:nth-child(2) td:nth-child(2)', text: '555'
+
+            with_tag 'tr:nth-child(3) td:nth-child(1)', text: '<Okinawa>'
+            with_tag 'tr:nth-child(3) td:nth-child(2)', text: '368'
+          end
+        }
       end
     end
 
@@ -25,7 +34,7 @@ module TurnipFormatter::Printer
       describe '.print_out' do
         let(:string) { 'a<a>a' }
         subject { StepExtraArgs.print_out([string]) }
-        it { should include '<pre class="multiline">a&lt;a&gt;a</pre>' }
+        it { should have_tag 'pre.multiline', text: 'a<a>a' }
       end
     end
   end

data/spec/turnip_formatter/printer/step_spec.rb

@@ -28,7 +28,7 @@ module TurnipFormatter::Printer
             exception_style.should_receive(:build).with('c').and_return('exception')
           end
 
-          it { should include "<div class=\"args\">extra_args\nsource\nexception</div>" }
+          it { should have_tag 'div.args', text: "extra_args\nsource\nexception" }
         end
       end
 
@@ -37,7 +37,7 @@ module TurnipFormatter::Printer
           let(:custom_template_1) do
             Module.new do
               def self.build(value)
-                "<html>#{value}</html>"
+                "<em>#{value}</em>"
               end
             end
           end
@@ -60,7 +60,10 @@ module TurnipFormatter::Printer
           end
 
           it 'should call corresponding method in step' do
-            should include "<div class=\"args\"><html>aiueo</html>\n<strong>12345</strong></div>"
+            subject.should have_tag 'div.args' do
+              with_tag 'em', text: 'aiueo'
+              with_tag 'strong', text: '12345'
+            end
           end
         end
       end
@@ -78,7 +81,7 @@ module TurnipFormatter::Printer
           exception_style.should_not_receive(:build)
         end
 
-        it { should include '<div class="args"></div>' }
+        it { should have_tag 'div.args', text: '' }
       end
     end
   end

data/spec/turnip_formatter/printer/tab_feature_statistics_spec.rb

@@ -28,9 +28,9 @@ module TurnipFormatter::Printer
         it 'should get passed feature information' do
           info = statistics.send(:feature_analysis, 'Hoge', scenarios)
           expect(info.name).to eq 'Hoge'
-          expect(info.passed).to eq 2
-          expect(info.failed).to be_zero
-          expect(info.pending).to be_zero
+          expect(info.passed_count).to eq 2
+          expect(info.failed_count).to be_zero
+          expect(info.pending_count).to be_zero
           expect(info.status).to eq 'passed'
         end
       end
@@ -50,9 +50,9 @@ module TurnipFormatter::Printer
         it 'should get failed feature information' do
           info = statistics.send(:feature_analysis, 'Fuga', scenarios)
           expect(info.name).to eq 'Fuga'
-          expect(info.passed).to eq 1
-          expect(info.failed).to eq 2
-          expect(info.pending).to be_zero
+          expect(info.passed_count).to eq 1
+          expect(info.failed_count).to eq 2
+          expect(info.pending_count).to be_zero
           expect(info.status).to eq 'failed'
         end
       end
@@ -72,9 +72,9 @@ module TurnipFormatter::Printer
         it 'should get pending feature information' do
           info = statistics.send(:feature_analysis, 'Hago', scenarios)
           expect(info.name).to eq 'Hago'
-          expect(info.passed).to eq 1
-          expect(info.failed).to be_zero
-          expect(info.pending).to eq 1
+          expect(info.passed_count).to eq 1
+          expect(info.failed_count).to be_zero
+          expect(info.pending_count).to eq 1
           expect(info.status).to eq 'pending'
         end
       end

data/spec/turnip_formatter/printer/tab_speed_statistics_spec.rb

@@ -20,20 +20,12 @@ module TurnipFormatter::Printer
       it 'should get string as HTML table' do
         html = statistics.print_out(passed_scenarios)
 
-        passed_scenarios.each do |scenario|
-          tag_scenario_name = "<a href=\"\##{scenario.id}\">#{scenario.name}</a>"
-          tag_run_time = "<span>#{scenario.run_time}</span>"
-          tag_feature_name = "<span>#{scenario.feature_name}</span>"
-
-          expect_match = [
-            '<tr>',
-            "<td>#{tag_feature_name}</td>",
-            "<td>#{tag_scenario_name}</td>",
-            "<td>#{tag_run_time} sec</td>",
-            '</tr>'
-          ].join('[[:space:]]+')
-
-          expect(html).to match %r(#{expect_match})
+        passed_scenarios.sort { |a,b| a.run_time <=> b.run_time }.each.with_index(1) do |scenario, index|
+          html.should have_tag "tbody tr:nth-child(#{index})" do
+            with_tag 'td:nth-child(1) span', text: scenario.feature_name
+            with_tag "td:nth-child(2) a[href='\##{scenario.id}']", text: scenario.name
+            with_tag 'td:nth-child(3) span', text: scenario.run_time
+          end
         end
       end
     end

data/spec/turnip_formatter/printer/tab_tag_statistics_spec.rb

@@ -63,27 +63,39 @@ module TurnipFormatter::Printer
       it 'should get count of each status' do
         # @bar
         group = groups[0]
-        res = statistics.send(:tag_analysis, group[0], group[1])
-        expect([res.passed, res.failed, res.pending]).to eq [0, 1, 1]
-        expect(res.status).to eq 'failed'
+        statistics.send(:tag_analysis, group[0], group[1]).tap do |result|
+          expect(result.passed_count).to eq 0
+          expect(result.failed_count).to eq 1
+          expect(result.pending_count).to eq 1
+          expect(result.status).to eq 'failed'
+        end
 
         # @foo
         group = groups[1]
-        res = statistics.send(:tag_analysis, group[0], group[1])
-        expect([res.passed, res.failed, res.pending]).to eq [0, 1, 0]
-        expect(res.status).to eq 'failed'
+        statistics.send(:tag_analysis, group[0], group[1]).tap do |result|
+          expect(result.passed_count).to eq 0
+          expect(result.failed_count).to eq 1
+          expect(result.pending_count).to eq 0
+          expect(result.status).to eq 'failed'
+        end
 
         # @hoge
         group = groups[2]
-        res = statistics.send(:tag_analysis, group[0], group[1])
-        expect([res.passed, res.failed, res.pending]).to eq [1, 0, 1]
-        expect(res.status).to eq 'pending'
+        statistics.send(:tag_analysis, group[0], group[1]).tap do |result|
+          expect(result.passed_count).to eq 1
+          expect(result.failed_count).to eq 0
+          expect(result.pending_count).to eq 1
+          expect(result.status).to eq 'pending'
+        end
 
         # no tags (turnip)
         group = groups[3]
-        res = statistics.send(:tag_analysis, group[0], group[1])
-        expect([res.passed, res.failed, res.pending]).to eq [1, 0, 0]
-        expect(res.status).to eq 'passed'
+        statistics.send(:tag_analysis, group[0], group[1]).tap do |result|
+          expect(result.passed_count).to eq 1
+          expect(result.failed_count).to eq 0
+          expect(result.pending_count).to eq 0
+          expect(result.status).to eq 'passed'
+        end
       end
     end
   end

data/turnip_formatter.gemspec

@@ -22,9 +22,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sass'
   spec.add_dependency 'uglifier'
   spec.add_dependency 'therubyracer'
-  spec.add_dependency 'rspec', '~> 2.13.0'
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency 'rspec-html-matchers'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'guard-rspec'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turnip_formatter
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: turnip
@@ -76,39 +76,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
-  type: :runtime
+        version: '1.3'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec-html-matchers
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements: