[DRE-commits] [ruby-sham-rack] 06/10: refresh patches
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Sun Aug 20 16:43:17 UTC 2017
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository ruby-sham-rack.
commit 69e6f4ace5615de455de587c66bb8c23de956bc0
Author: Pirate Praveen <praveen at debian.org>
Date: Sun Aug 20 21:51:57 2017 +0530
refresh patches
---
debian/patches/port-tests-rspec3.patch | 411 ---------------------------------
debian/patches/remove-patron.patch | 12 +-
debian/patches/series | 1 -
3 files changed, 6 insertions(+), 418 deletions(-)
diff --git a/debian/patches/port-tests-rspec3.patch b/debian/patches/port-tests-rspec3.patch
deleted file mode 100644
index 7ef90f4..0000000
--- a/debian/patches/port-tests-rspec3.patch
+++ /dev/null
@@ -1,411 +0,0 @@
-Description: Port tests to RSpec3 syntax
- Port the tests to support RSpec 3 syntax. Had to diasble a weird failing test.
-Author: Balasankar C <balasankarc at autistici.org>
-Last-Update: 2016-01-10
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/spec/sham_rack/stub_web_service_spec.rb
-+++ b/spec/sham_rack/stub_web_service_spec.rb
-@@ -17,7 +17,7 @@
-
- it "returns the last request" do
- get '/foo/bar'
-- @app.last_request.path_info.should == "/foo/bar"
-+ expect(@app.last_request.path_info).to eq("/foo/bar")
- end
-
- end
-@@ -31,7 +31,7 @@
- end
-
- it "returns a 404" do
-- last_response.status.should == 404
-+ expect(last_response.status).to eq(404)
- end
-
- end
-@@ -59,7 +59,7 @@
- end
-
- it "receives a response from the first handler" do
-- last_response.body.should == "response from first handler"
-+ expect(last_response.body).to eq("response from first handler")
- end
-
- end
-@@ -71,7 +71,7 @@
- end
-
- it "receives a response from the second handler" do
-- last_response.body.should == "response from second handler"
-+ expect(last_response.body).to eq("response from second handler")
- end
-
- end
-@@ -83,7 +83,7 @@
- end
-
- it "receives a response from the second handler" do
-- last_response.body.should == "response from second handler"
-+ expect(last_response.body).to eq("response from second handler")
- end
-
- end
-@@ -98,15 +98,15 @@
- end
-
- it "sets body" do
-- last_response.body.should == "STUFF"
-+ expect(last_response.body).to eq("STUFF")
- end
-
- it "sets content-type" do
-- last_response.content_type.should == "text/plain"
-+ expect(last_response.content_type).to eq("text/plain")
- end
-
- it "sets status code" do
-- last_response.status.should == 202
-+ expect(last_response.status).to eq(202)
- end
-
- end
---- a/spec/sham_rack_spec.rb
-+++ b/spec/sham_rack_spec.rb
-@@ -11,8 +11,8 @@
- class NetHttpProhibited < StandardError; end
-
- before do
-- any_instance_of(Net::HTTP) do |http|
-- stub(http).start do
-+ allow_any_instance_of(Net::HTTP) do |http|
-+ double(http).start do
- raise NetHttpProhibited, "real network calls are not allowed"
- end
- end
-@@ -32,35 +32,35 @@
- response = Net::HTTP.start("www.greetings.com") do |http|
- http.request(Net::HTTP::Get.new("/"))
- end
-- response.body.should == "Hello, world"
-+ expect(response.body).to eq("Hello, world")
- end
-
- it "can be accessed using Net::HTTP#get_response" do
- response = Net::HTTP.get_response(URI.parse("http://www.greetings.com/"))
-- response.body.should == "Hello, world"
-+ expect(response.body).to eq("Hello, world")
- end
-
- it "can be accessed using open-uri" do
- response = open("http://www.greetings.com")
-- response.status.should == ["200", "OK"]
-- response.read.should == "Hello, world"
-+ expect(response.status).to eq(["200", "OK"])
-+ expect(response.read).to eq("Hello, world")
- end
-
- it "can be accessed using RestClient" do
- response = RestClient.get("http://www.greetings.com")
-- response.code.should == 200
-- response.to_s.should == "Hello, world"
-+ expect(response.code).to eq(200)
-+ expect(response.to_s).to eq("Hello, world")
- end
-
- it "can be accessed using Mechanize" do
- response = Mechanize.new.get("http://www.greetings.com")
-- response.body.should == "Hello, world"
-+ expect(response.body).to eq("Hello, world")
- end
-
- xit "can be accessed using Patron" do
- patron = Patron::Session.new
- response = patron.get("http://www.greetings.com/foo/bar")
-- response.body.should == "Hello, world"
-+ expect(response.body).to eq("Hello, world")
- end
-
- end
-@@ -75,7 +75,7 @@
- ["200 OK", { "Content-type" => "text/plain" }, ["Easy, huh?"]]
- end
-
-- open("http://simple.xyz").read.should == "Easy, huh?"
-+ expect(open("http://simple.xyz").read).to eq("Easy, huh?")
-
- end
-
-@@ -84,9 +84,9 @@
- context "with a URL" do
-
- it "raises an ArgumentError" do
-- lambda do
-+ expect do
- ShamRack.at("http://www.greetings.com")
-- end.should raise_error(ArgumentError, "invalid address")
-+ end.to raise_error(ArgumentError, "invalid address")
- end
-
- end
-@@ -97,26 +97,26 @@
-
- ShamRack.at("hello.xyz").mount(GreetingApp.new)
-
-- open("http://hello.xyz").read.should == "Hello, world"
-+ expect(open("http://hello.xyz").read).to eq("Hello, world")
-
- end
-
- end
-
-- describe "#unmount" do
-+ # describe "#unmount" do
-
-- it "deregisters a mounted app" do
-+ #it "deregisters a mounted app" do
-
-- ShamRack.at("gone.xyz").mount(GreetingApp.new)
-- ShamRack.at("gone.xyz").unmount
-+ #ShamRack.at("gone.xyz").mount(GreetingApp.new)
-+ #ShamRack.at("gone.xyz").unmount
-
-- lambda do
-- open("http://gone.xyz").read
-- end.should raise_error(NetHttpProhibited)
-+ #expect do
-+ #open("http://gone.xyz").read
-+ #end.to raise_error(NetHttpProhibited)
-
-- end
-+ #end
-
-- end
-+ #end
-
- describe "#rackup" do
-
-@@ -128,11 +128,11 @@
- end
-
- it "mounts an app created using Rack::Builder" do
-- open("http://rackup.xyz").read.should == "HELLO, WORLD"
-+ expect(open("http://rackup.xyz").read).to eq("HELLO, WORLD")
- end
-
- it "returns the app" do
-- @return_value.should respond_to(:call)
-+ expect(@return_value).to respond_to(:call)
- end
-
- end
-@@ -148,11 +148,11 @@
- end
-
- it "mounts associated block as a Sinatra app" do
-- open("http://sinatra.xyz/hello/stranger").read.should == "Hello, stranger"
-+ expect(open("http://sinatra.xyz/hello/stranger").read).to eq("Hello, stranger")
- end
-
- it "returns the app" do
-- @return_value.should respond_to(:call)
-+ expect(@return_value).to respond_to(:call)
- end
-
- end
-@@ -164,11 +164,11 @@
- end
-
- it "mounts a StubWebService" do
-- ShamRack.application_for("stubbed.xyz").should be_kind_of(ShamRack::StubWebService)
-+ expect(ShamRack.application_for("stubbed.xyz")).to be_kind_of(ShamRack::StubWebService)
- end
-
- it "returns the StubWebService" do
-- @return_value.should == ShamRack.application_for("stubbed.xyz")
-+ expect(@return_value).to eq(ShamRack.application_for("stubbed.xyz"))
- end
-
- end
-@@ -181,7 +181,7 @@
-
- ShamRack.mount(GreetingApp.new, "hello.xyz")
-
-- open("http://hello.xyz").read.should == "Hello, world"
-+ expect(open("http://hello.xyz").read).to eq("Hello, world")
-
- end
-
-@@ -202,23 +202,23 @@
- let(:response) { Net::HTTP.get_response(URI.parse("http://www.greetings.com/")) }
-
- it "has status returned by app" do
-- response.code.should == "456"
-+ expect(response.code).to eq("456")
- end
-
- it "has status message returned by app" do
-- response.message.should == "Foo Bar"
-+ expect(response.message).to eq("Foo Bar")
- end
-
- it "has body returned by app" do
-- response.body.should == "BODY"
-+ expect(response.body).to eq("BODY")
- end
-
- it "has Content-Type returned by app" do
-- response.content_type.should == "text/plain"
-+ expect(response.content_type).to eq("text/plain")
- end
-
- it "has other headers returned by app" do
-- response["x-foo"].should =="bar"
-+ expect(response["x-foo"]).to eq("bar")
- end
-
- context "when the app returns a numeric status" do
-@@ -235,11 +235,11 @@
- end
-
- it "has status returned by app" do
-- response.code.should == "201"
-+ expect(response.code).to eq("201")
- end
-
- it "derives a status message" do
-- response.message.should == "Created"
-+ expect(response.message).to eq("Created")
- end
-
- end
-@@ -264,19 +264,19 @@
-
- open("http://env.xyz/blah?q=abc")
-
-- env["REQUEST_METHOD"].should == "GET"
-- env["SCRIPT_NAME"].should == ""
-- env["PATH_INFO"].should == "/blah"
-- env["QUERY_STRING"].should == "q=abc"
-- env["SERVER_NAME"].should == "env.xyz"
-- env["SERVER_PORT"].should == "80"
--
-- env["rack.version"].should be_kind_of(Array)
-- env["rack.url_scheme"].should == "http"
--
-- env["rack.multithread"].should == true
-- env["rack.multiprocess"].should == true
-- env["rack.run_once"].should == false
-+ expect(env["REQUEST_METHOD"]).to eq("GET")
-+ expect(env["SCRIPT_NAME"]).to eq("")
-+ expect(env["PATH_INFO"]).to eq("/blah")
-+ expect(env["QUERY_STRING"]).to eq("q=abc")
-+ expect(env["SERVER_NAME"]).to eq("env.xyz")
-+ expect(env["SERVER_PORT"]).to eq("80")
-+
-+ expect(env["rack.version"]).to be_kind_of(Array)
-+ expect(env["rack.url_scheme"]).to eq("http")
-+
-+ expect(env["rack.multithread"]).to eq(true)
-+ expect(env["rack.multiprocess"]).to eq(true)
-+ expect(env["rack.run_once"]).to eq(false)
-
- end
-
-@@ -288,7 +288,7 @@
- http.request(request)
- end
-
-- env["HTTP_FOO_BAR"].should == "baz"
-+ expect(env["HTTP_FOO_BAR"]).to eq("baz")
-
- end
-
-@@ -296,9 +296,9 @@
-
- RestClient.post("http://env.xyz/resource", "q" => "rack")
-
-- env["REQUEST_METHOD"].should == "POST"
-- env["CONTENT_TYPE"].should == "application/x-www-form-urlencoded"
-- env["rack.input"].read.should == "q=rack"
-+ expect(env["REQUEST_METHOD"]).to eq("POST")
-+ expect(env["CONTENT_TYPE"]).to eq("application/x-www-form-urlencoded")
-+ expect(env["rack.input"].read).to eq("q=rack")
-
- end
-
-@@ -308,8 +308,8 @@
- http.post("/resource", "q=rack")
- end
-
-- env["REQUEST_METHOD"].should == "POST"
-- env["rack.input"].read.should == "q=rack"
-+ expect(env["REQUEST_METHOD"]).to eq("POST")
-+ expect(env["rack.input"].read).to eq("q=rack")
-
- end
-
-@@ -318,11 +318,11 @@
- patron = Patron::Session.new
- response = patron.post("http://env.xyz/resource", "<xml/>", "Content-Type" => "application/xml")
-
-- response.status.should == 200
-+ expect(response.status).to eq(200)
-
-- env["REQUEST_METHOD"].should == "POST"
-- env["rack.input"].read.should == "<xml/>"
-- env["CONTENT_TYPE"].should == "application/xml"
-+ expect(env["REQUEST_METHOD"]).to eq("POST")
-+ expect(env["rack.input"].read).to eq("<xml/>")
-+ expect(env["CONTENT_TYPE"]).to eq("application/xml")
-
- end
-
-@@ -330,9 +330,9 @@
-
- RestClient.put("http://env.xyz/thing1", "stuff", :content_type => "text/plain")
-
-- env["REQUEST_METHOD"].should == "PUT"
-- env["CONTENT_TYPE"].should == "text/plain"
-- env["rack.input"].read.should == "stuff"
-+ expect(env["REQUEST_METHOD"]).to eq("PUT")
-+ expect(env["CONTENT_TYPE"]).to eq("text/plain")
-+ expect(env["rack.input"].read).to eq("stuff")
-
- end
-
-@@ -341,9 +341,9 @@
- patron = Patron::Session.new
- response = patron.put("http://env.xyz/resource", "stuff", "Content-Type" => "text/plain")
-
-- env["REQUEST_METHOD"].should == "PUT"
-- env["CONTENT_TYPE"].should == "text/plain"
-- env["rack.input"].read.should == "stuff"
-+ expect(env["REQUEST_METHOD"]).to eq("PUT")
-+ expect(env["CONTENT_TYPE"]).to eq("text/plain")
-+ expect(env["rack.input"].read).to eq("stuff")
-
- end
-
-@@ -351,8 +351,8 @@
-
- RestClient.delete("http://env.xyz/thing/1")
-
-- env["REQUEST_METHOD"].should == "DELETE"
-- env["PATH_INFO"].should == "/thing/1"
-+ expect(env["REQUEST_METHOD"]).to eq("DELETE")
-+ expect(env["PATH_INFO"]).to eq("/thing/1")
-
- end
-
-@@ -361,8 +361,8 @@
- patron = Patron::Session.new
- response = patron.delete("http://env.xyz/resource")
-
-- env["REQUEST_METHOD"].should == "DELETE"
-- env["PATH_INFO"].should == "/resource"
-+ expect(env["REQUEST_METHOD"]).to eq("DELETE")
-+ expect(env["PATH_INFO"]).to eq("/resource")
-
- end
-
diff --git a/debian/patches/remove-patron.patch b/debian/patches/remove-patron.patch
index dcbef6f..3429244 100644
--- a/debian/patches/remove-patron.patch
+++ b/debian/patches/remove-patron.patch
@@ -13,16 +13,16 @@ Author: Pirate Praveen <praveen at debian.org>
require "open-uri"
require "restclient"
require "mechanize"
-@@ -58,7 +57,7 @@
- response.body.should == "Hello, world"
+@@ -56,7 +55,7 @@
+ expect(response.body).to eq("Hello, world")
end
- it "can be accessed using Patron" do
+ xit "can be accessed using Patron" do
patron = Patron::Session.new
response = patron.get("http://www.greetings.com/foo/bar")
- response.body.should == "Hello, world"
-@@ -314,7 +313,7 @@
+ expect(response.body).to eq("Hello, world")
+@@ -342,7 +341,7 @@
end
@@ -31,7 +31,7 @@ Author: Pirate Praveen <praveen at debian.org>
patron = Patron::Session.new
response = patron.post("http://env.xyz/resource", "<xml/>", "Content-Type" => "application/xml")
-@@ -337,7 +336,7 @@
+@@ -365,7 +364,7 @@
end
@@ -40,7 +40,7 @@ Author: Pirate Praveen <praveen at debian.org>
patron = Patron::Session.new
response = patron.put("http://env.xyz/resource", "stuff", "Content-Type" => "text/plain")
-@@ -357,7 +356,7 @@
+@@ -385,7 +384,7 @@
end
diff --git a/debian/patches/series b/debian/patches/series
index b9a7848..ff97422 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
LICENSE-from-upstream-git.patch
remove-patron.patch
-port-tests-rspec3.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-sham-rack.git
More information about the Pkg-ruby-extras-commits
mailing list