4 files changed, 39 insertions, 24 deletions
diff --git a/spec/ruby/library/uri/generic/host_spec.rb b/spec/ruby/library/uri/generic/host_spec.rb
index f2076d2bc1..4a5a162512 100644
--- a/spec/ruby/library/uri/generic/host_spec.rb
+++ b/spec/ruby/library/uri/generic/host_spec.rb
@@ -2,7 +2,10 @@ require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#host" do
-  it "needs to be reviewed for spec completeness"
+  # https://hackerone.com/reports/156615
+  it "returns empty string when host is empty" do
+    URI.parse('http:////foo.com').host.should == ''
+  end
 end
 
 describe "URI::Generic#host=" do
diff --git a/spec/ruby/library/uri/generic/to_s_spec.rb b/spec/ruby/library/uri/generic/to_s_spec.rb
index 8c90d7645b..c436ee3c03 100644
--- a/spec/ruby/library/uri/generic/to_s_spec.rb
+++ b/spec/ruby/library/uri/generic/to_s_spec.rb
@@ -2,5 +2,8 @@ require_relative '../../../spec_helper'
 require 'uri'
 
 describe "URI::Generic#to_s" do
-  it "needs to be reviewed for spec completeness"
+  # https://hackerone.com/reports/156615
+  it "preserves / characters when host is empty" do
+    URI('http:///foo.com').to_s.should == 'http:///foo.com'
+  end
 end
diff --git a/spec/ruby/library/uri/set_component_spec.rb b/spec/ruby/library/uri/set_component_spec.rb
index 642a5d6fcf..1d4165c535 100644
--- a/spec/ruby/library/uri/set_component_spec.rb
+++ b/spec/ruby/library/uri/set_component_spec.rb
@@ -6,25 +6,27 @@ describe "URI#select" do
   it "conforms to the MatzRuby tests" do
     uri = URI.parse('http://foo:bar@baz')
     (uri.user = 'oof').should == 'oof'
-    uri.to_s.should == 'http://oof:bar@baz'
-    (uri.password = 'rab').should == 'rab'
-    uri.to_s.should == 'http://oof:rab@baz'
-    (uri.userinfo = 'foo').should == 'foo'
-    uri.to_s.should == 'http://foo:rab@baz'
-    (uri.userinfo = ['foo', 'bar']).should == ['foo', 'bar']
-    uri.to_s.should == 'http://foo:bar@baz'
-    (uri.userinfo = ['foo']).should == ['foo']
-    uri.to_s.should == 'http://foo:bar@baz'
-    (uri.host = 'zab').should == 'zab'
-    uri.to_s.should == 'http://foo:bar@zab'
-    (uri.port = 8080).should == 8080
-    uri.to_s.should == 'http://foo:bar@zab:8080'
-    (uri.path = '/').should == '/'
-    uri.to_s.should == 'http://foo:bar@zab:8080/'
-    (uri.query = 'a=1').should == 'a=1'
-    uri.to_s.should == 'http://foo:bar@zab:8080/?a=1'
-    (uri.fragment = 'b123').should == 'b123'
-    uri.to_s.should == 'http://foo:bar@zab:8080/?a=1#b123'
+    version_is(URI::VERSION, "1.0.4") do
+      uri.to_s.should == 'http://oof@baz'
+      (uri.password = 'rab').should == 'rab'
+      uri.to_s.should == 'http://oof:rab@baz'
+      (uri.userinfo = 'foo').should == 'foo'
+      uri.to_s.should == 'http://foo@baz'
+      (uri.userinfo = ['foo', 'bar']).should == ['foo', 'bar']
+      uri.to_s.should == 'http://foo:bar@baz'
+      (uri.userinfo = ['foo']).should == ['foo']
+      uri.to_s.should == 'http://foo@baz'
+      (uri.host = 'zab').should == 'zab'
+      uri.to_s.should == 'http://zab'
+      (uri.port = 8080).should == 8080
+      uri.to_s.should == 'http://zab:8080'
+      (uri.path = '/').should == '/'
+      uri.to_s.should == 'http://zab:8080/'
+      (uri.query = 'a=1').should == 'a=1'
+      uri.to_s.should == 'http://zab:8080/?a=1'
+      (uri.fragment = 'b123').should == 'b123'
+      uri.to_s.should == 'http://zab:8080/?a=1#b123'
+    end
 
     uri = URI.parse('http://example.com')
     -> { uri.password = 'bar' }.should raise_error(URI::InvalidURIError)
diff --git a/spec/ruby/library/uri/shared/parse.rb b/spec/ruby/library/uri/shared/parse.rb
index 87e1ee933e..c5057b6c4b 100644
--- a/spec/ruby/library/uri/shared/parse.rb
+++ b/spec/ruby/library/uri/shared/parse.rb
@@ -192,8 +192,15 @@ describe :uri_parse, shared: true do
     file.should be_kind_of(URI::Generic)
   end
 
-  it "raises errors on malformed URIs" do
-    -> { @object.parse('http://a_b:80/') }.should raise_error(URI::InvalidURIError)
-    -> { @object.parse('http://a_b/') }.should raise_error(URI::InvalidURIError)
+  if URI::DEFAULT_PARSER == URI::RFC2396_Parser
+    it "raises errors on malformed URIs" do
+      -> { @object.parse('http://a_b:80/') }.should raise_error(URI::InvalidURIError)
+      -> { @object.parse('http://a_b/') }.should raise_error(URI::InvalidURIError)
+    end
+  elsif URI::DEFAULT_PARSER == URI::RFC3986_Parser
+    it "does not raise errors on URIs contained underscore" do
+      -> { @object.parse('http://a_b:80/') }.should_not raise_error(URI::InvalidURIError)
+      -> { @object.parse('http://a_b/') }.should_not raise_error(URI::InvalidURIError)
+    end
   end
 end