test_uri.rb in drain-0.6.0

- old
+ new
@@ -1,35 +1,35 @@
 require 'helper'
 require 'dr/base/uri'
 
 describe DR::URIWrapper do
 	before do
-		@uri=DR::URIWrapper.new(URI.escape("http://ploum:secret@plam:443/foo bar"))
+		@uri=DR::URIWrapper.new(DR::URIEscape.escape("http://ploum:secret@plam:443/foo bar"))
 	end
 	it "Wraps an uri element" do
-		@uri.scheme.must_equal "http"
+		_(@uri.scheme).must_equal "http"
 	end
 	it "Auto escapes attribute" do
-		@uri.path.must_equal "/foo bar"
+		_(@uri.path).must_equal "/foo bar"
 	end
 	it "Auto escape setting elements" do
 		@uri.user="ploum plam"
-		@uri.user.must_equal "ploum plam"
+		_(@uri.user).must_equal "ploum plam"
 	end
 	it "Can convert to a hash" do
-		@uri.to_h[:user].must_equal("ploum")
+		_(@uri.to_h[:user]).must_equal("ploum")
 	end
 	it "Can convert to json" do
 		require 'json'
-		@uri.to_json.must_equal("{\"uri\":\"http://ploum:secret@plam:443/foo%20bar\",\"scheme\":\"http\",\"userinfo\":\"ploum:secret\",\"host\":\"plam\",\"port\":443,\"path\":\"/foo bar\",\"user\":\"ploum\",\"password\":\"secret\"}")
+		_(@uri.to_json).must_equal("{\"uri\":\"http://ploum:secret@plam:443/foo%20bar\",\"scheme\":\"http\",\"userinfo\":\"ploum:secret\",\"host\":\"plam\",\"port\":443,\"path\":\"/foo bar\",\"user\":\"ploum\",\"password\":\"secret\"}")
 	end
 	it "Can remove password" do
-		@uri.to_public.must_equal("http://ploum@plam:443/foo%20bar")
+		_(@uri.to_public).must_equal("http://ploum@plam:443/foo%20bar")
 	end
 	it "Can be merged" do
-		@uri.soft_merge("foo://plim@").to_s.must_equal("foo://plim:secret@plam:443/foo%20bar")
+		_(@uri.soft_merge("foo://plim@").to_s).must_equal("foo://plim:secret@plam:443/foo%20bar")
 	end
 	it "Can be reverse merged" do
-		DR::URIWrapper.parse("//user@server").reverse_merge(@uri).to_s.must_equal("http://user:secret@server:443/foo%20bar")
+		_(DR::URIWrapper.parse("//user@server").reverse_merge(@uri).to_s).must_equal("http://user:secret@server:443/foo%20bar")
 	end
 end
 