closer 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7f2fd9b39f7bae359dc8706696eafbbd64d4b80
-  data.tar.gz: fe643a88933b0ba11063b1e174ff77eac468f405
+  metadata.gz: 62426b90fd66e70685392766ccc2729ff35fe0f9
+  data.tar.gz: 6009df630e527185163fe5cab93fcc5fad4ce2d0
 SHA512:
-  metadata.gz: 5831d7fa8aabe71ef68e972f463e4e0e5fc6106e643672b296c95257ab2a8bb8e7ace400705c6a43954ccdb1be1d9d6785b07a2fe29cbb08e3a3eaf378af48cb
-  data.tar.gz: 41a3f047321d9a1f57a9d28360c6f8a6b75cc81e2dd1fd7f16bc71f5dbce738551ed7ff1f61fa85354d39e2a343703128aae0e49ca5bc49f09fc827961eccf22
+  metadata.gz: 3b3bc50815bc539a9eb99c3f7ce35d9c3774402b4da26cb424b25cba2e306c30719e74c2bab0829d68911622a7270900c4a33a779c2e02101872fc4f2c8cb711
+  data.tar.gz: 3d84bb737b67caf73722e04d2513330fddd1f20e145a6ff8fe6f035057ff97331b0f439e04bd6da46bc7268052bcd65d00b633b2eaaa13a4ad81e9b970c2f0c0

data/closer.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.0'
 
-  spec.add_runtime_dependency 'cucumber', '~> 1.3'
+  spec.add_runtime_dependency 'cucumber', '~> 2.0'
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/closer/formatter/closer.css

@@ -7,9 +7,11 @@
   font-weight: bold;
 }
 
-.cucumber ol li.step, td ol li.step, th ol li.step {
-  padding: 3px 3px 3px 10px;
-  margin: 5px 0px 5px 1.2em;
+.cucumber .step.passed table td.skipped {
+  border-left: 1px solid gray;
+  border-bottom: 1px solid gray;
+  background: #FFFFFF;
+  color: #000000;
 }
 
 .cucumber ol li.passed,
@@ -33,15 +35,6 @@ th ol li.passed,
   background: #F0F8FF;
 }
 
-.cucumber ol li.message, td ol li.message, th ol li.message {
-  border-left: 5px solid #999999;
-  border-bottom: 1px solid #999999;
-  background: #F0F8FF;
-  color: #001111;
-  margin: 5px 0px 5px 1.2em;
-  padding: 3px 15px 3px 10px;
-}
-
 .feature_dir {
   font-size: 1.2em;
   font-weight: bold;
@@ -78,9 +71,8 @@ div.contents {
 }
 
 div.feature .narrative {
-  margin: 1.2em;
+  margin: 10px 21px;
   line-height: 1.5em;
-  font-size: 1.2em;
 }
 
 div.feature .narrative > div {
@@ -167,8 +159,6 @@ del.differ {
   background: #ffffff;
   width: 48%;
   height: 48%;
-  max-width: 98%;
-  max-height: 98%;
   cursor: pointer;
 }
 

data/lib/closer/formatter/closer_html.rb

@@ -11,6 +11,10 @@ module Closer
         @_ruby_version_dir
       end
 
+      def gem_dir
+        File.join(Gem.dir, 'gems')
+      end
+
       def feature_id
         @feature.file.gsub(/(\/|\.|\\)/, '_')
       end

data/lib/closer/formatter/cucumber.css

@@ -151,7 +151,7 @@ body {
   padding: 0px;
 }
 .cucumber ol li.step, td ol li.step, th ol li.step {
-  padding: 3px 3px 3px 18px;
+  padding: 3px 3px 3px 13px;
   margin: 5px 0px 5px 5px;
 }
 .cucumber ol li, td ol li, th ol li {
@@ -166,6 +166,7 @@ body {
   border-bottom: 1px solid #c20000;
   background: #fffbd3;
   color: #c20000;
+  padding: 3px 3px 3px 8px;
 }
 .cucumber ol li.passed, td ol li.passed, th ol li.passed {
   border-left: 5px solid #65c400;
@@ -192,11 +193,12 @@ body {
   color: #131313;
 }
 .cucumber ol li.message, td ol li.message, th ol li.message {
-  border-left: 5px solid aqua;
-  border-bottom: 1px solid aqua;
-  background: #e0ffff;
+  border-left: 5px solid #999999;
+  border-bottom: 1px solid #999999;
+  background: #F0F8FF;
   color: #001111;
-  margin-left: 10px;
+  margin: 5px 0px 18px 18px;
+  padding: 3px 10px 3px 10px;
 }
 .cucumber #summary, td #summary, th #summary {
   margin: 0px;
@@ -282,4 +284,4 @@ body {
   padding: 0.1em 1em 0.2em 0;
   color: black;
   background: #fffbd3;
-}
+}

data/lib/closer/formatter/html.rb

@@ -1,12 +1,21 @@
 require 'erb'
-require 'cucumber/formatter/ordered_xml_markup'
+require 'builder'
 require 'cucumber/formatter/duration'
 require 'cucumber/formatter/io'
+require 'pathname'
 require_relative 'closer_html'
 
 module Closer
   module Formatter
     class Html
+
+      # TODO: remove coupling to types
+      AST_CLASSES = {
+        Cucumber::Core::Ast::Scenario        => 'scenario',
+        Cucumber::Core::Ast::ScenarioOutline => 'scenario outline'
+      }
+      AST_DATA_TABLE = ::Cucumber::Formatter::LegacyApi::Ast::MultilineArg::DataTable
+
       include ERB::Util # for the #h method
       include ::Cucumber::Formatter::Duration
       include ::Cucumber::Formatter::Io
@@ -24,35 +33,55 @@ module Closer
         @header_red = nil
         @delayed_messages = []
         @img_id = 0
+        @text_id = 0
         @inside_outline = false
+        @previous_step_keyword = nil
       end
 
       def embed(src, mime_type, label)
         case(mime_type)
         when /^image\/(png|gif|jpg|jpeg)/
+          unless File.file?(src) or src =~ /^data:image\/(png|gif|jpg|jpeg);base64,/
+            type = mime_type =~ /;base[0-9]+$/ ? mime_type : mime_type + ";base64"
+            src = "data:" + type + "," + src
+          end
           embed_image(src, label)
+        when /^text\/plain/
+          embed_text(src, label)
         end
       end
 
       def embed_image(src, label)
         id = "img_#{@img_id}"
         @img_id += 1
+        if @io.respond_to?(:path) and File.file?(src)
+          out_dir = Pathname.new(File.dirname(File.absolute_path(@io.path)))
+          src = Pathname.new(File.absolute_path(src)).relative_path_from(out_dir)
+        end        
         @builder.span(:class => 'embed') do |pre|
           pre << %{<a href="" onclick="img=document.getElementById('#{id}'); img.style.display = (img.style.display == 'none' ? 'block' : 'none');return false">#{label}</a><br>&nbsp;
           <img id="#{id}" style="display: none" src="#{src}"/>}
         end
       end
 
+      def embed_text(src, label)
+        id = "text_#{@text_id}"
+        @text_id += 1
+        @builder.span(:class => 'embed') do |pre|
+          pre << %{<a id="#{id}" href="#{src}" title="#{label}">#{label}</a>}
+        end
+      end
+
 
       def before_features(features)
-        @step_count = features.step_count
+        @step_count = features && features.step_count || 0 #TODO: Make this work with core!
 
         @builder.declare!(:DOCTYPE, :html)
 
         @builder << '<html>'
           @builder.head do
           @builder.meta('http-equiv' => 'Content-Type', :content => 'text/html;charset=utf-8')
-          @builder.title 'Cucumber Features'
+          @builder.title 'Cucumber'
           inline_css
           inline_js
         end
@@ -67,8 +96,8 @@ module Closer
             @builder.p('',:id => 'totals')
             @builder.p('',:id => 'duration')
             @builder.div(:id => 'expand-collapse') do
-              @builder.p('すべて開く', :id => 'expander')
-              @builder.p('すべて閉じる', :id => 'collapser')
+              @builder.p('Expand All', :id => 'expander')
+              @builder.p('Collapse All', :id => 'collapser')
             end
           end
         end
@@ -156,7 +185,7 @@ module Closer
 
       def background_name(keyword, name, file_colon_line, source_indent)
         @listing_background = true
-        @builder.h3 do |h3|
+        @builder.h3(:id => "background_#{@scenario_number}") do |h3|
           @builder.span(keyword, :class => 'keyword')
           @builder.text!(' ')
           @builder.span(name, :class => 'val')
@@ -166,16 +195,18 @@ module Closer
       def before_feature_element(feature_element)
         @scenario_number+=1
         @scenario_red = false
-        css_class = {
-          ::Cucumber::Ast::Scenario        => 'scenario',
-          ::Cucumber::Ast::ScenarioOutline => 'scenario outline'
-        }[feature_element.class]
+        css_class = AST_CLASSES[feature_element.class]
         @builder << "<div class='#{css_class}'>"
+        @in_scenario_outline = feature_element.class == Cucumber::Core::Ast::ScenarioOutline
       end
 
       def after_feature_element(feature_element)
+        unless @in_scenario_outline
+          print_messages
+          @builder << '</ol>'
+        end
         @builder << '</div>'
-        @open_step_list = true
+        @in_scenario_outline = nil
       end
 
       def scenario_name(keyword, name, file_colon_line, source_indent)
@@ -183,14 +214,20 @@ module Closer
           @builder << file_colon_line
         end
         @listing_background = false
+        scenario_id = "scenario_#{@scenario_number}"
+        if @inside_outline
+          @outline_row += 1
+          scenario_id += "_#{@outline_row}"
+          @scenario_red = false
+        end
 
         lines = name.split("\n")
-        @builder.h3 do
+        @builder.h3(:id => scenario_id) do
           @builder.span(lines[0], :class => 'val')
         end
-        
+
         if lines.size > 1
-          @builder.div(:class => 'narrative', :style => 'display: none;') do
+          @builder.pre(:class => 'narrative', :style => 'display: none;') do
             @builder << lines[1..-1].join("\n")
           end
         end
@@ -209,7 +246,7 @@ module Closer
       end
 
       def before_examples(examples)
-         @builder << '<div class="examples">'
+        @builder << '<div class="examples">'
       end
 
       def after_examples(examples)
@@ -229,10 +266,12 @@ module Closer
       end
 
       def after_steps(steps)
-        @builder << '</ol>'
+        print_messages
+        @builder << '</ol>' if @in_background or @in_scenario_outline
       end
 
       def before_step(step)
+        print_messages
         @step_id = step.dom_id
         @step_number += 1
         @step = step
@@ -261,20 +300,24 @@ module Closer
         set_scenario_color(status)
 
         if ! @delayed_messages.empty? and status == :passed
-          @builder << "<li class='step #{status} expand'>"
+          @builder << "<li id='#{@step_id}' class='step #{status} expand'>"
         else
-          @builder << "<li class='step #{status}'>"
+          @builder << "<li id='#{@step_id}' class='step #{status}'>"
         end
       end
 
       def after_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
         return if @hide_this_step
         # print snippet for undefined steps
+        unless outline_step?(@step)
+          keyword = @step.actual_keyword(@previous_step_keyword)
+          @previous_step_keyword = keyword
+        end
         if status == :undefined
-          keyword = @step.actual_keyword if @step.respond_to?(:actual_keyword)
-          step_multiline_class = @step.multiline_arg ? @step.multiline_arg.class : nil
           @builder.pre do |pre|
-            pre << @runtime.snippet_text(keyword,step_match.instance_variable_get("@name") || '',step_multiline_class)
+            # TODO: snippet text should be an event sent to the formatter so we don't 
+            # have this couping to the runtime.
+            pre << @runtime.snippet_text(keyword,step_match.instance_variable_get("@name") || '', @step.multiline_arg)
           end
         end
         @builder << '</li>'
@@ -286,7 +329,8 @@ module Closer
             line_index = $2.to_i - 1
 
             file = $1.force_encoding('UTF-8')
-            File.readlines(File.expand_path(file))[line_index..-1].each do |line|
+            file = File.join(gem_dir, file) unless File.exist?(file)
+            File.readlines(file)[line_index..-1].each do |line|
               step_contents << line
               break if line.chop == 'end' or line.chop.start_with?('end ')
             end
@@ -309,6 +353,7 @@ module Closer
 
       def exception(exception, status)
         return if @hide_this_step
+        print_messages
         build_exception_detail(exception)
       end
 
@@ -319,14 +364,14 @@ module Closer
 
       def before_multiline_arg(multiline_arg)
         return if @hide_this_step || @skip_step
-        if ::Cucumber::Ast::Table === multiline_arg
+        if AST_DATA_TABLE === multiline_arg
           @builder << '<table>'
         end
       end
 
       def after_multiline_arg(multiline_arg)
         return if @hide_this_step || @skip_step
-        if ::Cucumber::Ast::Table === multiline_arg
+        if AST_DATA_TABLE === multiline_arg
           @builder << '</table>'
         end
       end
@@ -338,7 +383,6 @@ module Closer
         end
       end
 
-
       def before_table_row(table_row)
         @row_id = table_row.dom_id
         @col_index = 0
@@ -401,12 +445,24 @@ module Closer
       end
 
       def print_table_row_messages
+        return if @delayed_messages.empty?
+
+        @builder.td(:class => 'message') do
+          @builder << @delayed_messages.join(", ")
+        end
+        empty_messages
       end
 
       def empty_messages
         @delayed_messages = []
       end
 
+      def after_test_case(test_case, result)
+        if result.failed? and not @scenario_red
+          set_scenario_color_failed
+        end
+      end
+
       protected
 
       def build_exception_detail(exception)
@@ -449,26 +505,23 @@ module Closer
       end
 
       def set_scenario_color_failed
-        id = current_time_string
-        style = 'display: none; margin: 0; padding: 0;'
-        @builder << "<div id=\"#{id}\" style=\"#{style}\"></div>"
-
         @builder.script do
           @builder.text!("makeRed('cucumber-header');") unless @header_red
           @header_red = true
-          @builder.text!("$(function() { $('##{id}').closest('.scenario').addClass('faild'); });") unless @scenario_red
+          scenario_or_background = @in_background ? "background" : "scenario"
+          @builder.text!("makeRed('#{scenario_or_background}_#{@scenario_number}');") unless @scenario_red
           @scenario_red = true
+          if @options[:expand] and @inside_outline
+            @builder.text!("makeRed('#{scenario_or_background}_#{@scenario_number}_#{@outline_row}');")
+          end
         end
       end
 
       def set_scenario_color_pending
-        id = current_time_string
-        style = 'display: none; margin: 0; padding: 0;'
-        @builder << "<div id=\"#{id}\" style=\"#{style}\"></div>"
-
         @builder.script do
           @builder.text!("makeYellow('cucumber-header');") unless @header_red
-          @builder.text!("$(function() { $('##{id}').closest('.scenario').addClass('pending'); });") unless @scenario_red
+          scenario_or_background = @in_background ? "background" : "scenario"
+          @builder.text!("makeYellow('#{scenario_or_background}_#{@scenario_number}');") unless @scenario_red
         end
       end
 
@@ -491,14 +544,14 @@ module Closer
           end
         end
 
-        step_file = step_match.file_colon_line.force_encoding('UTF-8')
+        step_file = step_match.file_colon_line
         step_file.gsub(/^([^:]*\.rb):(\d*)/) do
           step_file = "<span style=\"cursor: pointer;\" onclick=\"toggle_step_file(this); return false;\">#{step_file}</span>"
-        end
 
-        @builder.div(:class => 'step_file') do |div|
-          @builder.span do
-            @builder << step_file
+          @builder.div(:class => 'step_file') do |div|
+            @builder.span do
+              @builder << step_file
+            end
           end
         end
       end
@@ -549,7 +602,7 @@ module Closer
       def inline_js_content
         <<-EOF
 
-  SCENARIOS = "div.scenario h3";
+  SCENARIOS = "h3[id^='scenario_'],h3[id^=background_]";
 
   $(document).ready(function() {
     $(SCENARIOS).css('cursor', 'pointer');
@@ -566,7 +619,6 @@ module Closer
     $("#expander").css('cursor', 'pointer');
     $("#expander").click(function() {
       $(SCENARIOS).siblings().show();
-      $('li.message').show();
     });
   })
 
@@ -586,7 +638,7 @@ module Closer
       end
 
       def move_progress
-        @builder << " <script type=\"text/javascript\">moveProgressBar('#{percent_done}');</script>"
+        #@builder << " <script type=\"text/javascript\">moveProgressBar('#{percent_done}');</script>"
       end
 
       def percent_done
@@ -602,7 +654,7 @@ module Closer
       end
 
       def backtrace_line(line)
-        line.gsub(/\A([^:]*\.(?:rb|feature|haml)):(\d*).*\z/) do
+        line.gsub(/^([^:]*\.(?:rb|feature|haml)):(\d*).*$/) do
           if ENV['TM_PROJECT_DIRECTORY']
             "<a href=\"txmt://open?url=file://#{File.expand_path($1)}&line=#{$2}\">#{$1}:#{$2}</a> "
           else
@@ -640,7 +692,11 @@ module Closer
       end
 
       def create_builder(io)
-        ::Cucumber::Formatter::OrderedXmlMarkup.new(:target => io, :indent => 0)
+        Builder::XmlMarkup.new(:target => io, :indent => 0)
+      end
+
+      def outline_step?(step)
+        not @step.step.respond_to?(:actual_keyword)
       end
 
       class SnippetExtractor #:nodoc:
@@ -666,8 +722,12 @@ module Closer
 
         def lines_around(file, line)
           if File.file?(file)
+            begin
             lines = File.open(file).read.split("\n")
-            min = [0, line-3].max
+          rescue ArgumentError
+            return "# Couldn't get snippet for #{file}"
+          end
+          min = [0, line-3].max
             max = [line+1, lines.length-1].min
             selected_lines = []
             selected_lines.join("\n")

data/lib/closer/helpers.rb

@@ -0,0 +1,3 @@
+Dir::glob(File.dirname(__FILE__) + '/helpers/*.rb').each do |file|
+  require file
+end

data/lib/closer/helpers/capture.rb

@@ -0,0 +1,70 @@
+module Closer
+  module Helpers
+    module Capture
+      feature_dir = 'features'
+      ARGV.each_with_index do |arg, i|
+        if %w{ -r --require }.include?(arg)
+          feature_dir = ARGV[i + 1]
+          break
+        end
+      end
+      IMAGE_DIR = File.join(feature_dir, 'reports', 'images')
+      FileUtils.mkdir_p(File.basename(IMAGE_DIR))
+
+      @@_screen_count = 0
+      @@_images = []
+    
+      def capture(options = {})
+        options ||= {}
+        options = {:title => options} if options.is_a?(String)
+        return if ENV['FORMAT'] == 'junit'
+
+        url = Rack::Utils.unescape(current_url)
+    
+        @@_screen_count += 1
+
+        image = File.join(IMAGE_DIR, "#{@@_screen_count}.png")
+        page.driver.save_screenshot(image, :full => true)
+
+        attrs = {
+          :class => 'screenshot',
+          :src => "#{File.basename(IMAGE_DIR)}/#{File.basename(image)}",
+          :title => options[:title],
+          :alt => url
+        }
+        image_tag = "<img #{attrs.map{|k, v| "#{k}=\"#{v}\"" }.join(' ')} />"
+
+        if options[:flash]
+          puts image_tag
+        else
+          @@_images << image_tag
+        end
+      end
+
+      def resize_window(width, height)
+        case Capybara.current_driver
+        when :poltergeist
+          Capybara.current_session.driver.resize(width, height)
+        when :selenium
+          Capybara.current_session.driver.browser.manage.window.resize_to(width, height)
+        when :webkit
+          # TODO
+        end
+      end
+
+      def flash_image_tags
+        if @@_images.size > 0
+          puts @@_images.join("\n")
+          @@_images.clear
+        end
+      end
+
+    end
+  end
+end
+
+World(Closer::Helpers::Capture)
+
+AfterStep do |step|
+  flash_image_tags
+end

data/lib/closer/version.rb

@@ -1,3 +1,3 @@
 module Closer
-  VERSION = '0.1.6'
+  VERSION = '0.2.0'
 end

data/lib/tasks/close.rake

@@ -40,8 +40,7 @@ task :close => dependencies do |t, args|
   end
 
   args = [
-    "-r #{feature_dir}",
-    feature_dir == 'features' ? '' : '--exclude features/step_definitions',
+    "--require #{feature_dir}",
     '--guess',
     '--quiet',
     '--no-multiline',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: closer
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2015-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -74,6 +74,8 @@ files:
 - lib/closer/formatter/html.rb
 - lib/closer/formatter/jquery-min.js
 - lib/closer/formatter/screenshot.js
+- lib/closer/helpers.rb
+- lib/closer/helpers/capture.rb
 - lib/closer/rails/engine.rb
 - lib/closer/rails/railtie.rb
 - lib/closer/tasks.rb