1 files changed, 31 insertions, 29 deletions
diff --git a/spec/ruby/library/uri/set_component_spec.rb b/spec/ruby/library/uri/set_component_spec.rb
index 642a5d6fcf..15f1ed1f87 100644
--- a/spec/ruby/library/uri/set_component_spec.rb
+++ b/spec/ruby/library/uri/set_component_spec.rb
@@ -6,40 +6,42 @@ 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)
+    -> { uri.password = 'bar' }.should.raise(URI::InvalidURIError)
     uri.userinfo = 'foo:bar'
     uri.to_s.should == 'http://foo:bar@example.com'
-    -> { uri.registry = 'bar' }.should raise_error(URI::InvalidURIError)
-    -> { uri.opaque = 'bar' }.should raise_error(URI::InvalidURIError)
+    -> { uri.registry = 'bar' }.should.raise(URI::InvalidURIError)
+    -> { uri.opaque = 'bar' }.should.raise(URI::InvalidURIError)
 
     uri = URI.parse('mailto:foo@example.com')
-    -> { uri.user = 'bar' }.should raise_error(URI::InvalidURIError)
-    -> { uri.password = 'bar' }.should raise_error(URI::InvalidURIError)
-    -> { uri.userinfo = ['bar', 'baz'] }.should raise_error(URI::InvalidURIError)
-    -> { uri.host = 'bar' }.should raise_error(URI::InvalidURIError)
-    -> { uri.port = 'bar' }.should raise_error(URI::InvalidURIError)
-    -> { uri.path = 'bar' }.should raise_error(URI::InvalidURIError)
-    -> { uri.query = 'bar' }.should raise_error(URI::InvalidURIError)
+    -> { uri.user = 'bar' }.should.raise(URI::InvalidURIError)
+    -> { uri.password = 'bar' }.should.raise(URI::InvalidURIError)
+    -> { uri.userinfo = ['bar', 'baz'] }.should.raise(URI::InvalidURIError)
+    -> { uri.host = 'bar' }.should.raise(URI::InvalidURIError)
+    -> { uri.port = 'bar' }.should.raise(URI::InvalidURIError)
+    -> { uri.path = 'bar' }.should.raise(URI::InvalidURIError)
+    -> { uri.query = 'bar' }.should.raise(URI::InvalidURIError)
   end
 end