pretty_face 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fcac730a6081ca4ace109d40718f905952736ca
-  data.tar.gz: 855f600e38ef96da9e8e82d29237843b685cadf7
+  metadata.gz: 41294070b2073474df6f23b32f9d9635fa6e1496
+  data.tar.gz: 2bbd6c2564c79e8b29bdc0ac44f5a592a6c1fe7a
 SHA512:
-  metadata.gz: 906d1390fbcdb37bc59a771ecac27fa8dfe781a248be4238047106dc97a33fc8e64b21984cddb032aa0d4884d1b61838cee9e7bce38ae00a57f2808e9c7581c5
-  data.tar.gz: 7f814fac8069095ac687afcd77b34147bea3a78e77e8ab3287c97ad4f0bd0cdfe33c503de4239d95303a103e3810abe62536c46fe50e9552a694b9cdd6070bdf
+  metadata.gz: b4ca6f847ea979f8cdda0283cb1d16b8af689b78d5be3526476267abe19d76715be909c5a883b2cb0dff2db64d8fed476d19434f1a41dc8d96e738a025ec2d74
+  data.tar.gz: 9b9959330f568d4a0032891cb7de498df895e07116fb10c6a27cb8360e654564c2701521c3d694184ec018cbefc335259c2c0bcedb3de76bb7871db46bf4b0eb

data/ChangeLog

@@ -1,3 +1,6 @@
+=== Release 0.10.3 / 2014-12-12
+* Fixed issue where two screenshots could not be inserted after a scenario (Thanks Tomas Mudrak)
+
 === Release 0.10.2 / 2014-6-2
 *  Included explicit require of module Mime due to dependency load changes in ActionPack 4.1.1
 

data/features/step_definitions/report_steps.rb

@@ -27,10 +27,10 @@ end
 Then(/^the background of the error message row should be "(.*?)"$/) do |background|
   @browser = Watir::Browser.new :firefox
   visit ErrorDisplay do |page|
-    page.error_background.should include background
+    expect(page.error_background).to include background
   end
 end
 
 Then(/^the text of the of the error message row should be "(.*?)"$/) do |color|
-  on(ErrorDisplay).error_text_color.should include color
+  expect(on(ErrorDisplay).error_text_color).to include color
 end

data/lib/pretty_face/formatter/html.rb

@@ -51,9 +51,9 @@ module PrettyFace
       end
 
       def embed_image(src, label)
-        @report.current_scenario.image = src.split(separator).last
-        @report.current_scenario.image_label = label
-        @report.current_scenario.image_id = "img_#{@img_id}"
+        @report.current_scenario.image << src.split(separator).last
+        @report.current_scenario.image_label << label
+        @report.current_scenario.image_id << "img_#{@img_id}"
         @img_id += 1
         filename = "#{File.dirname(@path)}#{separator}images"
         FileUtils.cp src, filename

data/lib/pretty_face/formatter/report.rb

@@ -166,6 +166,9 @@ module PrettyFace
 
       def initialize(scenario)
         @steps = []
+        @image = []
+        @image_label = []
+        @image_id = []
         @start = Time.now
       end
 
@@ -256,10 +259,12 @@ module PrettyFace
 
         def lines_around(file, line)
           if File.file?(file)
-            lines = File.open(file).read.split("\n")
+            # lines = File.open(file).read.split("\n")
+            lines = File.readlines(file)
             min = [0, line-3].max
             max = [line+1, lines.length-1].min
-            lines[min..max].join("\n")
+            # lines[min..max].join("\n")
+            lines[min..max].join
           else
             "# Couldn't get snippet for #{file}"
           end

data/lib/pretty_face/templates/feature.erb

@@ -114,9 +114,11 @@
 	    
         <div class="img_container">
           <% if scenario.has_image? %>
-		        <a href='' onclick="img=document.getElementById('<%= scenario.image_id %>'); img.style.display = (img.style.display == 'none' ? 'block' : 'none');return false"><%= "#{scenario.image_label}" %></a><br />
-		        <img id='<%= scenario.image_id %>' style='display: none' src='<%= feature.directory_prefix_for(feature.file) %>images/<%= scenario.image %>'/>
-	        <% end %>
+            <% scenario.image.length.times do |i| %>
+              <a href='' onclick="img=document.getElementById('<%= scenario.image_id[i] %>'); img.style.display = (img.style.display == 'none' ? 'block' : 'none');return false"><%= "#{scenario.image_label[i]}" %></a><br />
+		          <img id='<%= scenario.image_id[i] %>' style='display: none' src='<%= feature.directory_prefix_for(feature.file) %>images/<%= scenario.image[i] %>'/>
+	          <% end %>
+          <% end %>
 	        <br /><br />
 	      <% end %>
 	      </div>

data/lib/pretty_face/version.rb

@@ -1,3 +1,3 @@
 module PrettyFace
-  VERSION = "0.10.2"
+  VERSION = "0.10.3"
 end

data/spec/lib/customization_spec.rb

@@ -13,9 +13,9 @@ describe PrettyFace::Formatter::Html do
 
   context "when not customizing the report" do
     it "indicates that there are no custom components" do
-      formatter.custom_suite_header?.should be_false
-      formatter.custom_feature_header?.should be_false
-      formatter.send(:logo_file).should be_nil
+      expect(formatter.custom_suite_header?).to be false
+      expect(formatter.custom_feature_header?).to be false
+      expect(formatter.send(:logo_file)).to be nil
     end
 
   end

data/spec/lib/html_formatter_spec.rb

@@ -9,131 +9,131 @@ describe PrettyFace::Formatter::Html do
 
   context "when building the header for the main page" do
     it "should know the start time" do
-      formatter.stub(:make_output_directories)
+      allow(formatter).to receive(:make_output_directories)
       formatter.before_features(nil)
-      formatter.start_time.should eq Time.now.strftime("%a %B %-d, %Y at %H:%M:%S")
+      expect(formatter.start_time).to eql Time.now.strftime("%a %B %-d, %Y at %H:%M:%S")
     end
 
     it "should know how long it takes" do
-      formatter.should_receive(:generate_report)
-      formatter.should_receive(:copy_images)
-      formatter.should_receive(:copy_stylesheets)
-      formatter.stub(:make_output_directories)
+      expect(formatter).to receive(:generate_report)
+      expect(formatter).to receive(:copy_images)
+      expect(formatter).to receive(:copy_stylesheets)
+      allow(formatter).to receive(:make_output_directories)
       formatter.before_features(nil)
 
       formatter.after_features(nil)
-      formatter.total_duration.should include '0.0'
+      expect(formatter.total_duration).to include '0.0'
     end
   end
 
   context "when building the report for scenarios" do
     it "should track number of scenarios" do
-      step_mother.should_receive(:scenarios).and_return([1,2,3])
-      formatter.scenario_count.should eq 3
+      expect(step_mother).to receive(:scenarios).and_return([1,2,3])
+      expect(formatter.scenario_count).to eql 3
     end
 
     it "should keep track of passing scenarios" do
-      step_mother.should_receive(:scenarios).with(:passed).and_return([1,2])
-      step_mother.should_receive(:scenarios).and_return([1,2])
-      formatter.scenarios_summary_for(:passed).should == "2 <span class=\"percentage\">(100.0%)</span>"
+      expect(step_mother).to receive(:scenarios).with(:passed).and_return([1,2])
+      expect(step_mother).to receive(:scenarios).and_return([1,2])
+      expect(formatter.scenarios_summary_for(:passed)).to eql "2 <span class=\"percentage\">(100.0%)</span>"
     end
 
     it "should keep track of failing scenarios" do
-      step_mother.should_receive(:scenarios).with(:failed).and_return([1,2])
-      step_mother.should_receive(:scenarios).and_return([1,2])
-      formatter.scenarios_summary_for(:failed).should == "2 <span class=\"percentage\">(100.0%)</span>"
+      expect(step_mother).to receive(:scenarios).with(:failed).and_return([1,2])
+      expect(step_mother).to receive(:scenarios).and_return([1,2])
+      expect(formatter.scenarios_summary_for(:failed)).to eql "2 <span class=\"percentage\">(100.0%)</span>"
     end
 
     it "should keep track of pending scenarios" do
-      step_mother.should_receive(:scenarios).with(:pending).and_return([1,2])
-      step_mother.should_receive(:scenarios).and_return([1,2])
-      formatter.scenarios_summary_for(:pending).should == "2 <span class=\"percentage\">(100.0%)</span>"
+      expect(step_mother).to receive(:scenarios).with(:pending).and_return([1,2])
+      expect(step_mother).to receive(:scenarios).and_return([1,2])
+      expect(formatter.scenarios_summary_for(:pending)).to eql "2 <span class=\"percentage\">(100.0%)</span>"
     end
 
     it "should keep track of undefined scenarios" do
-      step_mother.should_receive(:scenarios).with(:undefined).and_return([1,2])
-      step_mother.should_receive(:scenarios).and_return([1,2])
-      formatter.scenarios_summary_for(:undefined).should == "2 <span class=\"percentage\">(100.0%)</span>"
+      expect(step_mother).to receive(:scenarios).with(:undefined).and_return([1,2])
+      expect(step_mother).to receive(:scenarios).and_return([1,2])
+      expect(formatter.scenarios_summary_for(:undefined)).to eql "2 <span class=\"percentage\">(100.0%)</span>"
     end
 
     it "should keep track of skipped scenarios" do
-      step_mother.should_receive(:scenarios).with(:skipped).and_return([1,2])
-      step_mother.should_receive(:scenarios).and_return([1,2])
-      formatter.scenarios_summary_for(:skipped).should == "2 <span class=\"percentage\">(100.0%)</span>"
+      expect(step_mother).to receive(:scenarios).with(:skipped).and_return([1,2])
+      expect(step_mother).to receive(:scenarios).and_return([1,2])
+      expect(formatter.scenarios_summary_for(:skipped)).to eql "2 <span class=\"percentage\">(100.0%)</span>"
     end
   end
 
   context "when building the report for steps" do
     it "should track number of steps" do
-      step_mother.should_receive(:steps).and_return([1,2])
-      formatter.step_count.should == 2
+      expect(step_mother).to receive(:steps).and_return([1,2])
+      expect(formatter.step_count).to eql 2
     end
 
     it "should keep track of passing steps" do
-      step_mother.should_receive(:steps).with(:passed).and_return([1,2])
-      step_mother.should_receive(:steps).and_return([1,2])
-      formatter.steps_summary_for(:passed).should == "2 <span class=\"percentage\">(100.0%)</span>"
+      expect(step_mother).to receive(:steps).with(:passed).and_return([1,2])
+      expect(step_mother).to receive(:steps).and_return([1,2])
+      expect(formatter.steps_summary_for(:passed)).to eql "2 <span class=\"percentage\">(100.0%)</span>"
     end
 
     it "should keep track of failing steps" do
-      step_mother.should_receive(:steps).with(:failed).and_return([1,2])
-      step_mother.should_receive(:steps).and_return([1,2])
-      formatter.steps_summary_for(:failed).should == "2 <span class=\"percentage\">(100.0%)</span>"
+      expect(step_mother).to receive(:steps).with(:failed).and_return([1,2])
+      expect(step_mother).to receive(:steps).and_return([1,2])
+      expect(formatter.steps_summary_for(:failed)).to eql "2 <span class=\"percentage\">(100.0%)</span>"
     end
 
     it "should keep track of skipped steps" do
-      step_mother.should_receive(:steps).with(:skipped).and_return([1,2])
-      step_mother.should_receive(:steps).and_return([1,2])
-      formatter.steps_summary_for(:skipped).should == "2 <span class=\"percentage\">(100.0%)</span>"
+      expect(step_mother).to receive(:steps).with(:skipped).and_return([1,2])
+      expect(step_mother).to receive(:steps).and_return([1,2])
+      expect(formatter.steps_summary_for(:skipped)).to eql "2 <span class=\"percentage\">(100.0%)</span>"
     end
 
     it "should keep track of pending steps" do
-      step_mother.should_receive(:steps).with(:pending).and_return([1,2])
-      step_mother.should_receive(:steps).and_return([1,2])
-      formatter.steps_summary_for(:pending).should == "2 <span class=\"percentage\">(100.0%)</span>"
+      expect(step_mother).to receive(:steps).with(:pending).and_return([1,2])
+      expect(step_mother).to receive(:steps).and_return([1,2])
+      expect(formatter.steps_summary_for(:pending)).to eql "2 <span class=\"percentage\">(100.0%)</span>"
     end
 
     it "should keep track of undefined steps" do
-      step_mother.should_receive(:steps).with(:undefined).and_return([1,2])
-      step_mother.should_receive(:steps).and_return([1,2])
-      formatter.steps_summary_for(:undefined).should == "2 <span class=\"percentage\">(100.0%)</span>"
+      expect(step_mother).to receive(:steps).with(:undefined).and_return([1,2])
+      expect(step_mother).to receive(:steps).and_return([1,2])
+      expect(formatter.steps_summary_for(:undefined)).to eql "2 <span class=\"percentage\">(100.0%)</span>"
     end
   end
 
   context "when embedding an image" do
     before(:each) do
       cuke_feature = double('cuke_feature')
-      cuke_feature.should_receive(:description)
+      expect(cuke_feature).to receive(:description)
       report_feature = ReportFeature.new(cuke_feature, 'foo')
       formatter.report.features << report_feature
       @scenario = ReportScenario.new(nil)
       formatter.report.current_feature.scenarios << @scenario
-      File.stub(:dirname).and_return('')
-      FileUtils.stub(:cp)
+      allow(File).to receive(:dirname).and_return('')
+      allow(FileUtils).to receive(:cp)
     end
 
     it "should generate an id" do
       formatter.embed('image.png', 'image/png', 'the label')
-      @scenario.image_id.should == 'img_0'
+      expect(@scenario.image_id).to include 'img_0'
     end
 
     it "should get the filename from the src" do
       formatter.embed('directory/image.png', 'image/png', 'the label')
-      @scenario.image.should == 'image.png'
+      expect(@scenario.image).to include 'image.png'
     end
 
     it "should get the image label" do
       formatter.embed('directory/image.png', 'image/png', 'the label')
-      @scenario.image_label.should == 'the label'
+      expect(@scenario.image_label).to include 'the label'
     end
 
     it "scenario should know if it has an image" do
       formatter.embed('directory/image.png', 'image/png', 'the label')
-      @scenario.should have_image
+      expect(@scenario).to have_image
     end
 
     it "should copy the image to the output directory" do
-      FileUtils.should_receive(:cp).with('directory/image.png', '/images')
+      expect(FileUtils).to receive(:cp).with('directory/image.png', '/images')
       formatter.embed('directory/image.png', 'image/png', 'the label')
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pretty_face
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Jeffrey S. Morgan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: pretty_face
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: HTML Report/Formatter  for Cucumber and RSpec