turnip_formatter 0.6.0.pre.beta.1 → 0.6.0.pre.beta.2

data/lib/turnip_formatter/template/turnip_formatter.scss

@@ -86,14 +86,14 @@ div#steps-statistics section.scenario {
                 @extend .panel-body;
             }
 
-            table.step_outline {
+            table.step_data_table {
                margin-top: 2em;
                @extend .table;
                @extend .table-striped;
                @extend .table-bordered;
             }
 
-            pre.multiline {
+            pre.step_doc_string {
                 margin-top: 2em;
                 font-size: 13px;
                 color: #586e75;

data/lib/turnip_formatter/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
 module TurnipFormatter
-  VERSION = '0.6.0-beta.1'
+  VERSION = '0.6.0-beta.2'
 end

data/spec/support/step_helper.rb

@@ -18,7 +18,7 @@ module StepHelper
   private
 
     def base_step(example)
-      TurnipFormatter::Step.new(example, step_description)
+      TurnipFormatter::Resource::Step.new(example, step_description)
     end
 
     def step_description

data/spec/turnip_formatter/scenario/base_spec.rb

@@ -31,7 +31,7 @@ describe TurnipFormatter::Scenario::Base do
 
     it 'returns step array' do
       expect(subject).to be_a Array
-      expect(subject[0]).to be_a TurnipFormatter::Step
+      expect(subject[0]).to be_a TurnipFormatter::Resource::Step
     end
   end
 

data/test/helper.rb

@@ -0,0 +1,31 @@
+require 'test/unit'
+require 'oga'
+
+def html_parse(str)
+  Oga.parse_xml(str)
+end
+
+module TurnipFormatter
+  module TestHelper
+    @@sample_feature = nil
+
+    def sample_step
+      sample_feature.scenarios[0].steps[0]
+    end
+
+    def sample_step_with_docstring
+      sample_feature.scenarios[0].steps[1]
+    end
+
+    def sample_step_with_datatable
+      sample_feature.scenarios[0].steps[2]
+    end
+
+    def sample_feature
+      return @@sample_feature if @@sample_feature
+
+      filename = File.expand_path('./sample.feature', File.dirname(__FILE__))
+      @@sample_feature = Turnip::Builder.build(filename)
+    end
+  end
+end

data/test/sample.feature

@@ -0,0 +1,16 @@
+Feature: Feature
+
+  Scenario: Scenario
+    When step
+    When step with DocString
+      """
+      DocString
+      """
+    When step with DataTable:
+      | nam   | age |
+      | Tom   |  10 |
+      | Jerry |  23 |
+
+  @tag1 @tag2
+  Scenario: Scenario With Tags
+    When step

data/test/turnip_formatter/renderer/html/test_data_table.rb

@@ -0,0 +1,30 @@
+require 'helper'
+require 'turnip_formatter/renderer/html/data_table'
+require 'turnip/table'
+
+module TurnipFormatter::Renderer::Html
+  class TestDataTable < Test::Unit::TestCase
+    def test_render
+      renderer = DataTable.new(
+        table(
+          [
+            ['name', 'hp'],
+            ['slime', '10'],
+            ['daemon', '300']
+          ]
+        )
+      )
+
+      document = html_parse(renderer.render).at_xpath('table')
+
+      assert_equal(3, document.xpath('./tr').size)
+      assert_equal(6, document.xpath('.//td').size)
+    end
+
+    private
+
+    def table(rows)
+      Turnip::Table.new(rows)
+    end
+  end
+end

data/test/turnip_formatter/renderer/html/test_doc_string.rb

@@ -0,0 +1,17 @@
+require 'helper'
+require 'turnip_formatter/renderer/html/doc_string'
+
+module TurnipFormatter::Renderer::Html
+  class TestDocString < Test::Unit::TestCase
+    def test_render
+      renderer = DocString.new(<<-'EOS')
+        I Am a Cat
+      EOS
+
+      document = html_parse(renderer.render).at_xpath('pre')
+
+      assert_equal('step_doc_string', document.get('class'))
+      assert_equal('I Am a Cat', document.text.strip)
+    end
+  end
+end

data/test/turnip_formatter/renderer/html/test_step.rb

@@ -0,0 +1,38 @@
+require 'helper'
+require 'turnip_formatter/renderer/html/step'
+require 'turnip_formatter/resource/step'
+
+module TurnipFormatter::Renderer::Html
+  class TestStep < Test::Unit::TestCase
+    include TurnipFormatter::TestHelper
+
+    sub_test_case 'step without argument' do
+      def setup
+        resource = TurnipFormatter::Resource::Step.new(nil, sample_step)
+        @renderer = Step.new(resource)
+      end
+
+      def test_render
+        document = html_parse(@renderer.render).at_xpath('/div')
+
+        assert_equal('step passed', document.get('class'))
+        assert_equal('When step', document.at_css('div.step-title').text)
+        assert_nil(document.at_css('div.step-body'))
+      end
+    end
+
+    sub_test_case 'step with argument' do
+      def setup
+        resource = TurnipFormatter::Resource::Step.new(nil, sample_step_with_docstring)
+        @renderer = Step.new(resource)
+      end
+
+      def test_render
+        document = html_parse(@renderer.render).at_xpath('/div')
+
+        assert_equal('When step with DocString', document.at_css('div.step-title').text)
+        assert_not_nil(document.at_css('div.step-body'))
+      end
+    end
+  end
+end

data/turnip_formatter.gemspec

@@ -18,12 +18,19 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'turnip', '~> 3.0.0.pre.beta'
+  spec.add_dependency 'turnip', '~> 3.0.0.pre.beta.4'
   spec.add_dependency 'slim'
+  spec.add_dependency 'tilt'
   spec.add_dependency 'rspec', [">=3.0", "<3.5"]
+
+  # For ruby >= 2.1
+  spec.add_dependency 'activesupport', '~> 4.2.7'
+
+  spec.add_development_dependency 'test-unit'
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'sass'
   spec.add_development_dependency 'bootstrap-sass'
+  spec.add_development_dependency 'oga'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turnip_formatter
 version: !ruby/object:Gem::Version
-  version: 0.6.0.pre.beta.1
+  version: 0.6.0.pre.beta.2
 platform: ruby
 authors:
 - Wataru MIYAGUNI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: turnip
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.pre.beta
+        version: 3.0.0.pre.beta.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.pre.beta
+        version: 3.0.0.pre.beta.4
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +72,34 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.7
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +170,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: oga
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: RSpec custom formatter for Turnip
 email:
 - gonngo@gmail.com
@@ -171,11 +227,17 @@ files:
 - lib/turnip_formatter/printer/index.rb
 - lib/turnip_formatter/printer/runtime_error.rb
 - lib/turnip_formatter/printer/scenario.rb
-- lib/turnip_formatter/printer/step.rb
-- lib/turnip_formatter/printer/step_extra_args.rb
 - lib/turnip_formatter/printer/tab_feature_statistics.rb
 - lib/turnip_formatter/printer/tab_speed_statistics.rb
 - lib/turnip_formatter/printer/tab_tag_statistics.rb
+- lib/turnip_formatter/renderer/html/base.rb
+- lib/turnip_formatter/renderer/html/data_table.rb
+- lib/turnip_formatter/renderer/html/doc_string.rb
+- lib/turnip_formatter/renderer/html/step.rb
+- lib/turnip_formatter/renderer/html/views/data_table.html.erb
+- lib/turnip_formatter/renderer/html/views/doc_string.html.erb
+- lib/turnip_formatter/renderer/html/views/step.html.erb
+- lib/turnip_formatter/resource/step.rb
 - lib/turnip_formatter/scenario/base.rb
 - lib/turnip_formatter/scenario/failure.rb
 - lib/turnip_formatter/scenario/pass.rb
@@ -190,9 +252,6 @@ files:
 - lib/turnip_formatter/template/index.slim
 - lib/turnip_formatter/template/runtime_exception.slim
 - lib/turnip_formatter/template/scenario.slim
-- lib/turnip_formatter/template/step.slim
-- lib/turnip_formatter/template/step_multiline.slim
-- lib/turnip_formatter/template/step_outline.slim
 - lib/turnip_formatter/template/tab_feature_statistics.slim
 - lib/turnip_formatter/template/tab_speed_statistics.slim
 - lib/turnip_formatter/template/tab_tag_statistics.slim
@@ -206,8 +265,6 @@ files:
 - spec/support/step_helper.rb
 - spec/turnip_formatter/printer/index_spec.rb
 - spec/turnip_formatter/printer/scenario_spec.rb
-- spec/turnip_formatter/printer/step_extra_args_spec.rb
-- spec/turnip_formatter/printer/step_spec.rb
 - spec/turnip_formatter/printer/tab_feature_statistics_spec.rb
 - spec/turnip_formatter/printer/tab_speed_statistics_spec.rb
 - spec/turnip_formatter/printer/tab_tag_statistics_spec.rb
@@ -218,6 +275,11 @@ files:
 - spec/turnip_formatter/step_template/exception_spec.rb
 - spec/turnip_formatter/step_template/source_spec.rb
 - spec/turnip_formatter/template_spec.rb
+- test/helper.rb
+- test/sample.feature
+- test/turnip_formatter/renderer/html/test_data_table.rb
+- test/turnip_formatter/renderer/html/test_doc_string.rb
+- test/turnip_formatter/renderer/html/test_step.rb
 - turnip_formatter.gemspec
 homepage: https://github.com/gongo/turnip_formatter
 licenses:
@@ -250,8 +312,6 @@ test_files:
 - spec/support/step_helper.rb
 - spec/turnip_formatter/printer/index_spec.rb
 - spec/turnip_formatter/printer/scenario_spec.rb
-- spec/turnip_formatter/printer/step_extra_args_spec.rb
-- spec/turnip_formatter/printer/step_spec.rb
 - spec/turnip_formatter/printer/tab_feature_statistics_spec.rb
 - spec/turnip_formatter/printer/tab_speed_statistics_spec.rb
 - spec/turnip_formatter/printer/tab_tag_statistics_spec.rb

data/lib/turnip_formatter/printer/step.rb

@@ -1,35 +0,0 @@
-require 'turnip_formatter/printer'
-
-module TurnipFormatter
-  module Printer
-    class Step
-      class << self
-        include TurnipFormatter::Printer
-
-        def print_out(step)
-          step_templates = TurnipFormatter.step_templates_for(step.status)
-
-          render_template(:step,
-            {
-              step: step,
-              has_args_or_documents: has_args_or_documents?(step, step_templates),
-              step_docs: documents(step, step_templates)
-            }
-          )
-        end
-
-        private
-
-        def has_args_or_documents?(step, templates)
-          step.argument || (templates.length > 0)
-        end
-
-        def documents(step, templates)
-          templates.map do |template, method|
-            template.send(method, step.example)
-          end.join("\n")
-        end
-      end
-    end
-  end
-end

data/lib/turnip_formatter/printer/step_extra_args.rb

@@ -1,24 +0,0 @@
-require 'turnip_formatter/printer'
-
-module TurnipFormatter
-  module Printer
-    class StepExtraArgs
-      class << self
-        include TurnipFormatter::Printer
-
-        #
-        # @param  [nil or String or Turnip::Table]  Step argument
-        #
-        def print_out(argument)
-          return '' if argument.nil?
-
-          if argument.instance_of?(Turnip::Table)
-            render_template(:step_outline, { table: argument.to_a })
-          else
-            render_template(:step_multiline, { lines: argument })
-          end
-        end
-      end
-    end
-  end
-end

data/lib/turnip_formatter/template/step.slim

@@ -1,6 +0,0 @@
-div class="step #{step.status}"
-  .step-title= step.name
-  - if has_args_or_documents
-    div.step-body
-      == TurnipFormatter::Printer::StepExtraArgs.print_out(step.argument)
-      == step_docs

data/lib/turnip_formatter/template/step_multiline.slim

@@ -1 +0,0 @@
-pre.multiline= lines

data/lib/turnip_formatter/template/step_outline.slim

@@ -1,6 +0,0 @@
-table.step_outline
-  - table.each do |tr|
-    tr
-      - tr.each do |td|
-        td
-          = td

data/spec/turnip_formatter/printer/step_extra_args_spec.rb

@@ -1,32 +0,0 @@
-require 'spec_helper'
-require 'turnip_formatter/printer/step_extra_args'
-
-module TurnipFormatter::Printer
-  describe StepExtraArgs do
-    context 'Turnip::Table' do
-      describe '.print_out' do
-        let(:string) do
-          ::Turnip::Table.new([
-              ["State", "Money"],
-              ["<Tokushima>", "555"],
-              ["<Okinawa>", "368"]
-            ])
-        end
-
-        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>} }
-      end
-    end
-
-    context 'String' do
-      describe '.print_out' do
-        let(:string) { 'a<a>a' }
-        subject { StepExtraArgs.print_out(string) }
-        it { should match %r{<pre class="multiline">a&lt;a&gt;a</pre>} }
-      end
-    end
-  end
-end

data/spec/turnip_formatter/printer/step_spec.rb

@@ -1,49 +0,0 @@
-require 'spec_helper'
-require 'turnip_formatter/printer/step'
-
-describe TurnipFormatter::Printer::Step do
-  describe '.print_out' do
-    subject { described_class.print_out(step) }
-
-    context 'not has extra argument' do
-      let(:step) do
-        step = passed_step
-        expect(step).to receive(:argument).and_return(nil)
-        step
-      end
-
-      it {
-        should match %r{<div class="step passed">}
-        should match %r{<div class="step-title">}
-      }
-    end
-
-    context 'has table argument' do
-      let(:table) { Turnip::Table.new [] }
-
-      let(:step) do
-        step = passed_step
-        allow(step).to receive(:argument).and_return(table)
-        step
-      end
-
-      it {
-        should match %r{<div class="step-body">}
-        should match %r{<table class="step_outline">}
-      }
-    end
-
-    context 'has outline argument' do
-      let(:step) do
-        step = passed_step
-        allow(step).to receive(:argument).and_return('DocString')
-        step
-      end
-
-      it {
-        should match %r{<div class="step-body">}
-        should match %r{<pre class="multiline">}
-      }
-    end
-  end
-end