spec/session_ssl_spec.rb in patron-0.4.20 vs spec/session_ssl_spec.rb in patron-0.5.0

- old
+ new

@@ -36,201 +36,201 @@ end it "should retrieve a url with :get" do response = @session.get("/test") body = YAML::load(response.body) - body.request_method.should == "GET" + expect(body.request_method).to be == "GET" end it "should download content with :get and a file path" do tmpfile = "/tmp/patron_test.yaml" response = @session.get_file "/test", tmpfile - response.body.should be_nil + expect(response.body).to be_nil body = YAML::load_file(tmpfile) - body.request_method.should == "GET" + expect(body.request_method).to be == "GET" FileUtils.rm tmpfile end it "should download correctly(md5 ok) with get_file" do tmpfile = "/tmp/picture" response = @session.get_file "/picture", tmpfile - response.body.should be_nil - File.size(File.join(File.dirname(__FILE__),"../pic.png")).should == File.size(tmpfile) + expect(response.body).to be_nil + expect(File.size(File.join(File.dirname(__FILE__),"../pic.png"))).to be == File.size(tmpfile) FileUtils.rm tmpfile end it "should include custom headers in a request" do response = @session.get("/test", {"User-Agent" => "PatronTest"}) body = YAML::load(response.body) - body.header["user-agent"].should == ["PatronTest"] + expect(body.header["user-agent"]).to be == ["PatronTest"] end it "should merge custom headers with session headers" do @session.headers["X-Test"] = "Testing" response = @session.get("/test", {"User-Agent" => "PatronTest"}) body = YAML::load(response.body) - body.header["user-agent"].should == ["PatronTest"] - body.header["x-test"].should == ["Testing"] + expect(body.header["user-agent"]).to be == ["PatronTest"] + expect(body.header["x-test"]).to be == ["Testing"] end it "should raise an exception on timeout" do @session.timeout = 1 - lambda {@session.get("/timeout")}.should raise_error(Patron::TimeoutError) + expect {@session.get("/timeout")}.to raise_error(Patron::TimeoutError) end it "should follow redirects by default" do @session.max_redirects = 1 response = @session.get("/redirect") body = YAML::load(response.body) - response.status.should == 200 - body.path.should == "/test" + expect(response.status).to be == 200 + expect(body.path).to be == "/test" end it "should include redirect count in response" do @session.max_redirects = 1 response = @session.get("/redirect") - response.redirect_count.should == 1 + expect(response.redirect_count).to be == 1 end it "should not follow redirects when configured to do so" do @session.max_redirects = 0 response = @session.get("/redirect") - response.status.should == 301 - response.body.should be_empty + expect(response.status).to be == 301 + expect(response.body).to be_empty end it "should retrieve URL metadata with :head" do response = @session.head("/test") - response.status.should == 200 - response.body.should be_empty - response.headers.should_not be_empty + expect(response.status).to be == 200 + expect(response.body).to be_empty + expect(response.headers).to_not be_empty end it "should send a delete request with :delete" do response = @session.delete("/test") body = YAML::load(response.body) - body.request_method.should == "DELETE" + expect(body.request_method).to be == "DELETE" end it "should send a COPY request with :copy" do response = @session.copy("/test", "/test2") body = YAML::load(response.body) - body.request_method.should == "COPY" + expect(body.request_method).to be == "COPY" end it "should include a Destination header in COPY requests" do response = @session.copy("/test", "/test2") body = YAML::load(response.body) - body.header['destination'].first.should == "/test2" + expect(body.header['destination'].first).to be == "/test2" end it "should upload data with :get" do data = "upload data" response = @session.request(:get, "/test", {}, :data => data) body = YAML::load(response.body) - body.request_method.should == "GET" - body.header['content-length'].should == [data.size.to_s] + expect(body.request_method).to be == "GET" + expect(body.header['content-length']).to be == [data.size.to_s] end it "should upload data with :put" do data = "upload data" response = @session.put("/test", data) body = YAML::load(response.body) - body.request_method.should == "PUT" - body.header['content-length'].should == [data.size.to_s] + expect(body.request_method).to be == "PUT" + expect(body.header['content-length']).to be == [data.size.to_s] end it "should raise when no data is provided to :put" do - lambda { @session.put("/test", nil) }.should raise_error(ArgumentError) + expect { @session.put("/test", nil) }.to raise_error(ArgumentError) end it "should upload a file with :put" do response = @session.put_file("/test", "LICENSE") body = YAML::load(response.body) - body.request_method.should == "PUT" + expect(body.request_method).to be == "PUT" end it "should raise when no file is provided to :put" do - lambda { @session.put_file("/test", nil) }.should raise_error(ArgumentError) + expect { @session.put_file("/test", nil) }.to raise_error(ArgumentError) end it "should use chunked encoding when uploading a file with :put" do response = @session.put_file("/test", "LICENSE") body = YAML::load(response.body) - body.header['transfer-encoding'].first.should == "chunked" + expect(body.header['transfer-encoding'].first).to be == "chunked" end it "should upload data with :post" do data = "upload data" response = @session.post("/test", data) body = YAML::load(response.body) - body.request_method.should == "POST" - body.header['content-length'].should == [data.size.to_s] + expect(body.request_method).to be == "POST" + expect(body.header['content-length']).to be == [data.size.to_s] end it "should post a hash of arguments as a urlencoded form" do data = {:foo => 123, 'baz' => '++hello world++'} response = @session.post("/testpost", data) body = YAML::load(response.body) - body['content_type'].should == "application/x-www-form-urlencoded" - body['body'].should match(/baz=%2B%2Bhello%20world%2B%2B/) - body['body'].should match(/foo=123/) + expect(body['content_type']).to be == "application/x-www-form-urlencoded" + expect(body['body']).to match(/baz=%2B%2Bhello%20world%2B%2B/) + expect(body['body']).to match(/foo=123/) end it "should raise when no data is provided to :post" do - lambda { @session.post("/test", nil) }.should raise_error(ArgumentError) + expect { @session.post("/test", nil) }.to raise_error(ArgumentError) end it "should upload a file with :post" do response = @session.post_file("/test", "LICENSE") body = YAML::load(response.body) - body.request_method.should == "POST" + expect(body.request_method).to be == "POST" end it "should upload a multipart with :post" do response = @session.post_multipart("/test", { :test_data => "123" }, { :test_file => "LICENSE" } ) body = YAML::load(response.body) - body.request_method.should == "POST" + expect(body.request_method).to be == "POST" end it "should raise when no file is provided to :post" do - lambda { @session.post_file("/test", nil) }.should raise_error(ArgumentError) + expect { @session.post_file("/test", nil) }.to raise_error(ArgumentError) end it "should use chunked encoding when uploading a file with :post" do response = @session.post_file("/test", "LICENSE") body = YAML::load(response.body) - body.header['transfer-encoding'].first.should == "chunked" + expect(body.header['transfer-encoding'].first).to be == "chunked" end it "should handle cookies if set" do @session.handle_cookies response = @session.get("/setcookie").body - YAML::load(response).header['cookie'].first.should == "session_id=foo123" + expect(YAML::load(response).header['cookie'].first).to be == "session_id=foo123" end it "should not handle cookies by default" do response = @session.get("/setcookie").body - YAML::load(response).header.should_not include('cookie') + expect(YAML::load(response).header).to_not include('cookie') end it "should ignore a wrong Content-Length when asked to" do - lambda { + expect { @session.ignore_content_length = true @session.get("/wrongcontentlength") - }.should_not raise_error + }.to_not raise_error end it "should fail by default with a Content-Length too high" do - lambda { + expect { @session.ignore_content_length = nil @session.get("/wrongcontentlength") - }.should raise_error(Patron::PartialFileError) + }.to raise_error(Patron::PartialFileError) end it "should raise exception if cookie store is not writable or readable" do - lambda { @session.handle_cookies("/trash/clash/foo") }.should raise_error(ArgumentError) + expect { @session.handle_cookies("/trash/clash/foo") }.to raise_error(ArgumentError) end it "should work with multiple threads" do threads = [] 3.times do @@ -242,43 +242,42 @@ end end threads.each {|t| t.join } end - xit "should fail when insecure mode is off" do - # This spec fails, but I suspect that it is a setup problem. - lambda { + it "should fail when insecure mode is off" do + expect { @session.insecure = nil response = @session.get("/test") - }.should raise_error(Patron::Error) + }.to raise_error(Patron::Error) end it "should work when insecure mode is off but certificate is supplied" do @session.insecure = nil @session.cacert = 'spec/certs/cacert.pem' response = @session.get("/test") body = YAML::load(response.body) - body.request_method.should == "GET" + expect(body.request_method).to be == "GET" end it "should work with different SSL versions" do ['SSLv3', 'TLSv1'].each do |version| @session.ssl_version = version response = @session.get("/test") - response.status.should == 200 + expect(response.status).to be == 200 end end # ------------------------------------------------------------------------ describe 'when debug is enabled' do it 'it should not clobber stderr' do rdev = STDERR.stat.rdev @session.enable_debug - STDERR.stat.rdev.should be == rdev + expect(STDERR.stat.rdev).to be == rdev @session.enable_debug - STDERR.stat.rdev.should be == rdev + expect(STDERR.stat.rdev).to be == rdev end end end