[DRE-commits] [ruby-prawn] 04/06: Drop 0900_rspec3.patch, fixed upstream
Cédric Boutillier
boutil at moszumanska.debian.org
Wed Jun 8 05:30:35 UTC 2016
This is an automated email from the git hooks/post-receive script.
boutil pushed a commit to branch master
in repository ruby-prawn.
commit 9565d6dbce537ddd7f84724d58b17a22a63c0240
Author: Cédric Boutillier <boutil at debian.org>
Date: Tue Jun 7 12:29:03 2016 +0200
Drop 0900_rspec3.patch, fixed upstream
---
debian/patches/0900_rspec3.patch | 304 ---------------------------------------
debian/patches/series | 1 -
2 files changed, 305 deletions(-)
diff --git a/debian/patches/0900_rspec3.patch b/debian/patches/0900_rspec3.patch
deleted file mode 100644
index c228e1b..0000000
--- a/debian/patches/0900_rspec3.patch
+++ /dev/null
@@ -1,304 +0,0 @@
-Description: use RSpec3 syntax for true/false
-Author: Cédric Boutillier <boutil at debian.org>
-Forwarded: https://github.com/prawnpdf/prawn/pull/895
-Last-Update: 2015-07-24
-
---- a/spec/text_spec.rb
-+++ b/spec/text_spec.rb
-@@ -63,7 +63,7 @@
- end
-
- it "should ignore call when string is nil" do
-- expect(@pdf.text(nil)).to be_false
-+ expect(@pdf.text(nil)).to be_falsey
- end
-
- it "should correctly render empty paragraphs" do
-@@ -91,13 +91,13 @@
- it "should default to use kerning information" do
- @pdf.text "hello world"
- text = PDF::Inspector::Text.analyze(@pdf.render)
-- expect(text.kerned[0]).to be_true
-+ expect(text.kerned[0]).to be_truthy
- end
-
- it "should be able to disable kerning with an option" do
- @pdf.text "hello world", :kerning => false
- text = PDF::Inspector::Text.analyze(@pdf.render)
-- expect(text.kerned[0]).to be_false
-+ expect(text.kerned[0]).to be_falsey
- end
-
- it "should be able to disable kerning document-wide" do
-@@ -105,14 +105,14 @@
- @pdf.default_kerning = false
- @pdf.text "hello world"
- text = PDF::Inspector::Text.analyze(@pdf.render)
-- expect(text.kerned[0]).to be_false
-+ expect(text.kerned[0]).to be_falsey
- end
-
- it "option should be able to override document-wide kerning disabling" do
- @pdf.default_kerning = false
- @pdf.text "hello world", :kerning => true
- text = PDF::Inspector::Text.analyze(@pdf.render)
-- expect(text.kerned[0]).to be_true
-+ expect(text.kerned[0]).to be_truthy
- end
-
- it "should raise_error ArgumentError if :at option included" do
---- a/spec/document_spec.rb
-+++ b/spec/document_spec.rb
-@@ -77,14 +77,14 @@
- Prawn::Document.extensions.delete(mod1)
- Prawn::Document.extensions.delete(mod2)
-
-- expect(Prawn::Document.new.respond_to?(:test_extensions1)).to be_false
-- expect(Prawn::Document.new.respond_to?(:test_extensions2)).to be_false
-+ expect(Prawn::Document.new.respond_to?(:test_extensions1)).to be_falsey
-+ expect(Prawn::Document.new.respond_to?(:test_extensions2)).to be_falsey
-
- # verify these still exist on custom class
- expect(custom_document.extensions).to eq([mod1, mod2])
-
-- expect(custom_document.new.respond_to?(:test_extensions1)).to be_true
-- expect(custom_document.new.respond_to?(:test_extensions2)).to be_true
-+ expect(custom_document.new.respond_to?(:test_extensions1)).to be_truthy
-+ expect(custom_document.new.respond_to?(:test_extensions2)).to be_truthy
- end
- end
-
-@@ -176,7 +176,7 @@
- end
-
- it "should be delegated from Document to renderer" do
-- expect(@pdf.respond_to?(:on_page_create)).to be_true
-+ expect(@pdf.respond_to?(:on_page_create)).to be_truthy
- end
-
- it "should be invoked with document" do
-@@ -712,17 +712,17 @@
- end
-
- it "returns nil given no filter" do
-- expect(@pdf.page_match?(:nil, 1)).to be_false
-+ expect(@pdf.page_match?(:nil, 1)).to be_falsey
- end
-
- it "must provide an :all filter" do
-- expect((1.. at pdf.page_count).all? { |i| @pdf.page_match?(:all, i) }).to be_true
-+ expect((1.. at pdf.page_count).all? { |i| @pdf.page_match?(:all, i) }).to be_truthy
- end
-
- it "must provide an :odd filter" do
- odd, even = (1.. at pdf.page_count).partition(&:odd?)
-- expect(odd.all? { |i| @pdf.page_match?(:odd, i) }).to be_true
-- expect(even.any? { |i| @pdf.page_match?(:odd, i) }).to be_false
-+ expect(odd.all? { |i| @pdf.page_match?(:odd, i) }).to be_truthy
-+ expect(even.any? { |i| @pdf.page_match?(:odd, i) }).to be_falsey
- end
-
- it "must be able to filter by an array of page numbers" do
---- a/spec/font_spec.rb
-+++ b/spec/font_spec.rb
-@@ -265,11 +265,11 @@
- end
-
- def page_should_include_font(font)
-- expect(page_includes_font?(font)).to be_true
-+ expect(page_includes_font?(font)).to be_truthy
- end
-
- def page_should_not_include_font(font)
-- expect(page_includes_font?(font)).to be_false
-+ expect(page_includes_font?(font)).to be_falsey
- end
- end
-
-@@ -313,13 +313,13 @@
- it "should not modify the original string when normalize_encoding() is used" do
- original = "Foo"
- normalized = @times.normalize_encoding(original)
-- expect(original.equal?(normalized)).to be_false
-+ expect(original.equal?(normalized)).to be_falsey
- end
-
- it "should modify the original string when normalize_encoding!() is used" do
- original = "Foo"
- normalized = @times.normalize_encoding!(original)
-- expect(original.equal?(normalized)).to be_true
-+ expect(original.equal?(normalized)).to be_truthy
- end
- end
-
-@@ -335,25 +335,25 @@
-
- it "should return true when present in an AFM font" do
- font = @pdf.find_font("Helvetica")
-- expect(font.glyph_present?("H")).to be_true
-+ expect(font.glyph_present?("H")).to be_truthy
- end
-
- it "should return false when absent in an AFM font" do
- font = @pdf.find_font("Helvetica")
-- expect(font.glyph_present?("再")).to be_false
-+ expect(font.glyph_present?("再")).to be_falsey
- end
-
- it "should return true when present in a TTF font" do
- font = @pdf.find_font("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf")
-- expect(font.glyph_present?("H")).to be_true
-+ expect(font.glyph_present?("H")).to be_truthy
- end
-
- it "should return false when absent in a TTF font" do
- font = @pdf.find_font("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf")
-- expect(font.glyph_present?("再")).to be_false
-+ expect(font.glyph_present?("再")).to be_falsey
-
- font = @pdf.find_font("/usr/share/fonts/truetype/arphic-gkai00mp/gkai00mp.ttf")
-- expect(font.glyph_present?("€")).to be_false
-+ expect(font.glyph_present?("€")).to be_falsey
- end
- end
-
-@@ -410,13 +410,13 @@
- it "should not modify the original string when normalize_encoding() is used" do
- original = "Foo"
- normalized = @font.normalize_encoding(original)
-- expect(original.equal?(normalized)).to be_false
-+ expect(original.equal?(normalized)).to be_falsey
- end
-
- it "should modify the original string when normalize_encoding!() is used" do
- original = "Foo"
- normalized = @font.normalize_encoding!(original)
-- expect(original.equal?(normalized)).to be_true
-+ expect(original.equal?(normalized)).to be_truthy
- end
- end
- end
---- a/spec/text_at_spec.rb
-+++ b/spec/text_at_spec.rb
-@@ -58,7 +58,7 @@
-
- text = rotated_text_inspector.analyze(@pdf.render)
-
-- expect(text.tm_operator_used).to(be_true)
-+ expect(text.tm_operator_used).to(be_truthy)
- end
-
- it "should not use rotation matrix by default" do
-@@ -66,7 +66,7 @@
-
- text = rotated_text_inspector.analyze(@pdf.render)
-
-- expect(text.tm_operator_used).to(be_false)
-+ expect(text.tm_operator_used).to(be_falsey)
- end
-
- it "should allow overriding default font for a single instance" do
---- a/spec/text_box_spec.rb
-+++ b/spec/text_box_spec.rb
-@@ -3,43 +3,43 @@
- require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
-
- describe "Text::Box#nothing_printed?" do
-- it "should be_true when nothing printed" do
-+ it "should be_truthy when nothing printed" do
- create_pdf
- string = "Hello world, how are you?\nI'm fine, thank you."
- text_box = Prawn::Text::Box.new(string,
- :height => 2,
- :document => @pdf)
- text_box.render
-- expect(text_box.nothing_printed?).to be_true
-+ expect(text_box.nothing_printed?).to be_truthy
- end
-- it "should be_false when something printed" do
-+ it "should be_falsey when something printed" do
- create_pdf
- string = "Hello world, how are you?\nI'm fine, thank you."
- text_box = Prawn::Text::Box.new(string,
- :height => 14,
- :document => @pdf)
- text_box.render
-- expect(text_box.nothing_printed?).to be_false
-+ expect(text_box.nothing_printed?).to be_falsey
- end
- end
-
- describe "Text::Box#everything_printed?" do
-- it "should be_false when not everything printed" do
-+ it "should be_falsey when not everything printed" do
- create_pdf
- string = "Hello world, how are you?\nI'm fine, thank you."
- text_box = Prawn::Text::Box.new(string,
- :height => 14,
- :document => @pdf)
- text_box.render
-- expect(text_box.everything_printed?).to be_false
-+ expect(text_box.everything_printed?).to be_falsey
- end
-- it "should be_true when everything printed" do
-+ it "should be_truthy when everything printed" do
- create_pdf
- string = "Hello world, how are you?\nI'm fine, thank you."
- text_box = Prawn::Text::Box.new(string,
- :document => @pdf)
- text_box.render
-- expect(text_box.everything_printed?).to be_true
-+ expect(text_box.everything_printed?).to be_truthy
- end
- end
-
---- a/spec/graphics_spec.rb
-+++ b/spec/graphics_spec.rb
-@@ -280,10 +280,10 @@
- expect(pattern[:Shading][:Coords]).to eq([0, 0, @pdf.bounds.width, 0])
- expect(pattern[:Shading][:Function][:C0].zip([1, 0, 0]).all?{ |x1, x2|
- (x1 - x2).abs < 0.01
-- }).to be_true
-+ }).to be_truthy
- expect(pattern[:Shading][:Function][:C1].zip([0, 0, 1]).all?{ |x1, x2|
- (x1 - x2).abs < 0.01
-- }).to be_true
-+ }).to be_truthy
- end
-
- it "fill_gradient should set fill color to the pattern" do
-@@ -319,10 +319,10 @@
- expect(pattern[:Shading][:Coords]).to eq([0, 0, 10, @pdf.bounds.width, 0, 20])
- expect(pattern[:Shading][:Function][:C0].zip([1, 0, 0]).all?{ |x1, x2|
- (x1 - x2).abs < 0.01
-- }).to be_true
-+ }).to be_truthy
- expect(pattern[:Shading][:Function][:C1].zip([0, 0, 1]).all?{ |x1, x2|
- (x1 - x2).abs < 0.01
-- }).to be_true
-+ }).to be_truthy
- end
-
- it "fill_gradient should set fill color to the pattern" do
---- a/spec/repeater_spec.rb
-+++ b/spec/repeater_spec.rb
-@@ -18,7 +18,7 @@
- doc = sample_document
- r = repeater(doc, :all) { :do_nothing }
-
-- expect((1..doc.page_count).all? { |i| r.match?(i) }).to be_true
-+ expect((1..doc.page_count).all? { |i| r.match?(i) }).to be_truthy
- end
-
- it "must provide an :odd filter" do
-@@ -27,8 +27,8 @@
-
- odd, even = (1..doc.page_count).partition(&:odd?)
-
-- expect(odd.all? { |i| r.match?(i) }).to be_true
-- expect(even.any? { |i| r.match?(i) }).to be_false
-+ expect(odd.all? { |i| r.match?(i) }).to be_truthy
-+ expect(even.any? { |i| r.match?(i) }).to be_falsey
- end
-
- it "must be able to filter by an array of page numbers" do
diff --git a/debian/patches/series b/debian/patches/series
index 1ad3690..6aca906 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@
0600_replace_require_relative_manual.patch
0700_use_deterministic_keys_for_gradients.patch
0800_enable_manual_to_be_built_reproducibly.patch
-0900_rspec3.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-prawn.git
More information about the Pkg-ruby-extras-commits
mailing list