diff options
author | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-20 20:18:52 +0000 |
---|---|---|
committer | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-20 20:18:52 +0000 |
commit | 1d15d5f08032acf1b7bceacbb450d617ff6e0931 (patch) | |
tree | a3785a79899302bc149e4a6e72f624ac27dc1f10 /spec/ruby/library/uri/merge_spec.rb | |
parent | 75bfc6440d595bf339007f4fb280fd4d743e89c1 (diff) | |
download | ruby-1d15d5f08032acf1b7bceacbb450d617ff6e0931.tar.gz |
Move spec/rubyspec to spec/ruby for consistency
* Other ruby implementations use the spec/ruby directory.
[Misc #13792] [ruby-core:82287]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59979 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec/ruby/library/uri/merge_spec.rb')
-rw-r--r-- | spec/ruby/library/uri/merge_spec.rb | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/spec/ruby/library/uri/merge_spec.rb b/spec/ruby/library/uri/merge_spec.rb new file mode 100644 index 0000000000..c62e80d6b2 --- /dev/null +++ b/spec/ruby/library/uri/merge_spec.rb @@ -0,0 +1,20 @@ +require File.expand_path('../../../spec_helper', __FILE__) +require 'uri' + +describe "URI#merge" do + it "returns the receiver and the argument, joined as per URI.join" do + URI("http://localhost/").merge("main.rbx").should == URI.parse("http://localhost/main.rbx") + URI("http://localhost/a/b/c/d").merge("http://ruby-lang.com/foo").should == URI.parse("http://ruby-lang.com/foo") + URI("http://localhost/a/b/c/d").merge("../../e/f").to_s.should == "http://localhost/a/e/f" + end + + it "accepts URI objects as argument" do + URI("http://localhost/").merge(URI("main.rbx")).should == URI.parse("http://localhost/main.rbx") + end + + it "accepts a string-like argument" do + str = mock('string-like') + str.should_receive(:to_str).and_return("foo/bar") + URI("http://localhost/").merge(str).should == URI.parse("http://localhost/foo/bar") + end +end |