Skip to content

Commit 0826f83

Browse files
committed
Make the URI tests pass with ruby-head
* host is "" instead of nil, following the upstream change: ruby/uri@81263c9
1 parent 58eb15d commit 0826f83

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

lib/sprockets/uri_utils.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def split_file_uri(uri)
5353
path = path[1..-1]
5454
end
5555

56-
[scheme, host, path, query]
56+
[scheme, host || '', path, query]
5757
end
5858

5959
# Internal: Join file: URI component parts into String.

test/test_uri_utils.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,23 @@ def test_split_file_uri
3939
assert_equal ['file', 'localhost', '/etc/fstab', nil], parts
4040

4141
parts = split_file_uri("file:///etc/fstab")
42-
assert_equal ['file', nil, '/etc/fstab', nil], parts
42+
assert_equal ['file', '', '/etc/fstab', nil], parts
4343

4444
parts = split_file_uri("file:///usr/local/bin/ruby%20on%20rails")
45-
assert_equal ['file', nil, '/usr/local/bin/ruby on rails', nil], parts
45+
assert_equal ['file', '', '/usr/local/bin/ruby on rails', nil], parts
4646

4747
parts = split_file_uri("file:///usr/local/var/github/app/assets/javascripts/application.js")
48-
assert_equal ['file', nil, '/usr/local/var/github/app/assets/javascripts/application.js', nil], parts
48+
assert_equal ['file', '', '/usr/local/var/github/app/assets/javascripts/application.js', nil], parts
4949

5050
if DOSISH
5151
parts = split_file_uri("file:///C:/Documents%20and%20Settings/davris/FileSchemeURIs.doc")
52-
assert_equal ['file', nil, 'C:/Documents and Settings/davris/FileSchemeURIs.doc', nil], parts
52+
assert_equal ['file', '', 'C:/Documents and Settings/davris/FileSchemeURIs.doc', nil], parts
5353

5454
parts = split_file_uri("file:///D:/Program%20Files/Viewer/startup.htm")
55-
assert_equal ['file', nil, 'D:/Program Files/Viewer/startup.htm', nil], parts
55+
assert_equal ['file', '', 'D:/Program Files/Viewer/startup.htm', nil], parts
5656

5757
parts = split_file_uri("file:///C:/Program%20Files/Music/Web%20Sys/main.html?REQUEST=RADIO")
58-
assert_equal ['file', nil, 'C:/Program Files/Music/Web Sys/main.html', 'REQUEST=RADIO'], parts
58+
assert_equal ['file', '', 'C:/Program Files/Music/Web Sys/main.html', 'REQUEST=RADIO'], parts
5959
end
6060
end
6161

0 commit comments

Comments
 (0)