[DRE-commits] [SCM] ruby-prawn.git branch, master, updated. upstream/1.0.0_rc1-44-g6e97afc

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit b2fa651c08c76bcf467f5448dc3a850273f48e51
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Thu Nov 24 09:40:04 2011 +0100

    disable some more specs using to removed images

diff --git a/debian/patches/0500_disable_tests_using_removed_files.patch b/debian/patches/0500_disable_tests_using_removed_files.patch
index 5158a3c..6efe81e 100644
--- a/debian/patches/0500_disable_tests_using_removed_files.patch
+++ b/debian/patches/0500_disable_tests_using_removed_files.patch
@@ -119,3 +119,52 @@ Last-Update: 2011-11-21
    it "should read the basic attributes correctly" do
      jpg = Prawn::Images::JPG.new(@img_data)
      
+--- a/spec/images_spec.rb
++++ b/spec/images_spec.rb
+@@ -43,17 +43,20 @@
+     info.height.should == 453
+   end
+ 
+-  it "should raise an UnsupportedImageType if passed a BMP" do
++  # spec disabled since tru256.bmp removed from source package (Debian patch)
++  xit "should raise an UnsupportedImageType if passed a BMP" do
+     filename = "#{Prawn::DATADIR}/images/tru256.bmp"
+     lambda { @pdf.image filename, :at => [100,100] }.should.raise(Prawn::Errors::UnsupportedImageType)
+   end
+ 
+-  it "should raise an UnsupportedImageType if passed an interlaced PNG" do
++  # spec disabled since dice_interlaced.png removed from source package (Debian patch)
++  xit "should raise an UnsupportedImageType if passed an interlaced PNG" do
+     filename = "#{Prawn::DATADIR}/images/dice_interlaced.png"
+     lambda { @pdf.image filename, :at => [100,100] }.should.raise(Prawn::Errors::UnsupportedImageType)
+   end
+ 
+-  it "should bump PDF version to 1.5 or greater on embedding 16-bit PNGs" do
++  # spec disabled since 16bit.png removed from source package (Debian patch)
++  xit "should bump PDF version to 1.5 or greater on embedding 16-bit PNGs" do
+     @pdf.image "#{Prawn::DATADIR}/images/16bit.png"
+     @pdf.state.version.should >= 1.5
+   end
+@@ -62,7 +65,8 @@
+   # channels. Verified experimentally [BE] but not confirmed in documentation
+   # or anything. OS X Preview handles those files just fine.
+   #
+-  it "should embed 8-bit alpha channels for 16-bit PNGs" do
++  # spec disabled since 16bit.png removed from source package (Debian patch)
++  xit "should embed 8-bit alpha channels for 16-bit PNGs" do
+     @pdf.image "#{Prawn::DATADIR}/images/16bit.png"
+ 
+     output = @pdf.render
+--- a/spec/object_store_spec.rb
++++ b/spec/object_store_spec.rb
+@@ -46,8 +46,9 @@
+     lambda { Prawn::Core::ObjectStore.new(:template => filename) }.should.raise(ArgumentError)
+   end
+ 
++  # replace dice.png by pigs.jpg as dice.png has been removed from the source package. (Debian patch)
+   it "should raise Prawn::Errors::TemplateError when given a non PDF as a template" do
+-    filename = "#{Prawn::DATADIR}/images/dice.png"
++    filename = "#{Prawn::DATADIR}/images/pigs.jpg"
+ 
+     lambda { Prawn::Core::ObjectStore.new(:template => filename) }.should.raise(Prawn::Errors::TemplateError)
+   end

-- 
ruby-prawn.git