0
@@ -44,7 +44,7 @@ module Merb
0
         if filename !~ /#{'\\' + ASSET_FILE_EXTENSIONS[asset_type]}\Z/ && filename.index('?').nil?
0
           filename = "#{filename}#{ASSET_FILE_EXTENSIONS[asset_type]}" # don't modify receiver
0
         end
0
-        if filename !~ %r{^https?://}
0
+        if filename !~ %r{^(/|https?://)}
0
           filename = "/#{asset_type}s/#{filename}"
0
         end
0
         if local_path

0
@@ -82,34 +82,50 @@ describe "External JavaScript and Stylesheets" do
0
   it "should require a js file only once" do
0
     require_js 'jquery'
0
     require_js 'jquery', 'effects'
0
-
0
-    include_required_js.scan(%r{/javascripts/jquery.js}).should have(1).things
0
-    include_required_js.scan(%r{/javascripts/effects.js}).should have(1).things
0
+    
0
+    include_required_js.scan(%r{src="/javascripts/jquery.js"}).should have(1).things
0
+    include_required_js.scan(%r{src="/javascripts/effects.js"}).should have(1).things
0
   end
0
 
0
   it "should require a css file only once" do
0
     require_css('style')
0
     require_css('style', 'ie-specific')
0
 
0
-    include_required_css.scan(%r{/stylesheets/style.css}).should have(1).things
0
-    include_required_css.scan(%r{/stylesheets/ie-specific.css}).should have(1).things
0
+    include_required_css.scan(%r{href="/stylesheets/style.css"}).should have(1).things
0
+    include_required_css.scan(%r{href="/stylesheets/ie-specific.css"}).should have(1).things
0
   end
0
 
0
   it "should require included js" do
0
     require_js 'jquery', 'effects', 'validation'
0
     result = include_required_js
0
     result.scan(/<script/).should have(3).things
0
-    result.should match(%r{/javascripts/jquery.js})
0
-    result.should match(%r{/javascripts/effects.js})
0
-    result.should match(%r{/javascripts/validation.js})
0
+    result.should match(%r{src="/javascripts/jquery.js"})
0
+    result.should match(%r{src="/javascripts/effects.js"})
0
+    result.should match(%r{src="/javascripts/validation.js"})
0
   end
0
 
0
   it "should require included css" do
0
     require_css 'style', 'ie-specific'
0
     result = include_required_css
0
     result.scan(/<link/).should have(2).things
0
-    result.should match(%r{/stylesheets/style.css})
0
-    result.should match(%r{/stylesheets/ie-specific.css})
0
+    result.should match(%r{href="/stylesheets/style.css"})
0
+    result.should match(%r{href="/stylesheets/ie-specific.css"})
0
+  end
0
+
0
+  it "should require included js from an absolute path" do
0
+    require_js '/other/scripts.js', '/other/utils'
0
+    result = include_required_js
0
+    result.scan(/<script/).should have(2).things
0
+    result.should match(%r{src="/other/scripts.js"})
0
+    result.should match(%r{src="/other/utils.js"})
0
+  end
0
+
0
+  it "should require included css from an absolute path" do
0
+    require_css '/styles/theme.css', '/styles/fonts'
0
+    result = include_required_css
0
+    result.scan(/<link/).should have(2).things
0
+    result.should match(%r{href="/styles/theme.css"})
0
+    result.should match(%r{href="/styles/fonts.css"})
0
   end
0
 
0
   it "should create a js include tag with the extension specified" do