From 76f947edf755f57ec721b412c6cef9a9c2c8f4b5 Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Mon, 23 May 2011 16:29:20 -0700
Subject: Move javascript/css helpers into the Sprockets helper and just have
 them override the old behavior

---
 actionpack/test/template/sprockets_helper_test.rb | 24 +++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'actionpack/test/template')

diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb
index 0059317c78..7d26beb9e4 100644
--- a/actionpack/test/template/sprockets_helper_test.rb
+++ b/actionpack/test/template/sprockets_helper_test.rb
@@ -78,17 +78,17 @@ class SprocketsHelperTest < ActionView::TestCase
 
   test "javascript include tag" do
     assert_equal '<script src="/assets/application-d41d8cd98f00b204e9800998ecf8427e.js" type="text/javascript"></script>',
-      sprockets_javascript_include_tag(:application)
+      javascript_include_tag(:application)
 
     assert_equal '<script src="/assets/xmlhr-d41d8cd98f00b204e9800998ecf8427e.js" type="text/javascript"></script>',
-      sprockets_javascript_include_tag("xmlhr")
+      javascript_include_tag("xmlhr")
     assert_equal '<script src="/assets/xmlhr-d41d8cd98f00b204e9800998ecf8427e.js" type="text/javascript"></script>',
-      sprockets_javascript_include_tag("xmlhr.js")
+      javascript_include_tag("xmlhr.js")
     assert_equal '<script src="http://www.example.com/xmlhr" type="text/javascript"></script>',
-      sprockets_javascript_include_tag("http://www.example.com/xmlhr")
+      javascript_include_tag("http://www.example.com/xmlhr")
 
     assert_equal "<script src=\"/assets/xmlhr-d41d8cd98f00b204e9800998ecf8427e.js?body=1\" type=\"text/javascript\"></script>\n<script src=\"/assets/application-d41d8cd98f00b204e9800998ecf8427e.js?body=1\" type=\"text/javascript\"></script>",
-      sprockets_javascript_include_tag(:application, :debug => true)
+      javascript_include_tag(:application, :debug => true)
   end
 
   test "stylesheet path" do
@@ -106,21 +106,21 @@ class SprocketsHelperTest < ActionView::TestCase
 
   test "stylesheet link tag" do
     assert_equal '<link href="/assets/application-68b329da9893e34099c7d8ad5cb9c940.css" media="screen" rel="stylesheet" type="text/css" />',
-      sprockets_stylesheet_link_tag(:application)
+      stylesheet_link_tag(:application)
 
     assert_equal '<link href="/assets/style-d41d8cd98f00b204e9800998ecf8427e.css" media="screen" rel="stylesheet" type="text/css" />',
-      sprockets_stylesheet_link_tag("style")
+      stylesheet_link_tag("style")
     assert_equal '<link href="/assets/style-d41d8cd98f00b204e9800998ecf8427e.css" media="screen" rel="stylesheet" type="text/css" />',
-      sprockets_stylesheet_link_tag("style.css")
+      stylesheet_link_tag("style.css")
 
     assert_equal '<link href="http://www.example.com/style.css" media="screen" rel="stylesheet" type="text/css" />',
-      sprockets_stylesheet_link_tag("http://www.example.com/style.css")
+      stylesheet_link_tag("http://www.example.com/style.css")
     assert_equal '<link href="/assets/style-d41d8cd98f00b204e9800998ecf8427e.css" media="all" rel="stylesheet" type="text/css" />',
-      sprockets_stylesheet_link_tag("style", :media => "all")
+      stylesheet_link_tag("style", :media => "all")
     assert_equal '<link href="/assets/style-d41d8cd98f00b204e9800998ecf8427e.css" media="print" rel="stylesheet" type="text/css" />',
-      sprockets_stylesheet_link_tag("style", :media => "print")
+      stylesheet_link_tag("style", :media => "print")
 
     assert_equal "<link href=\"/assets/style-d41d8cd98f00b204e9800998ecf8427e.css?body=1\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<link href=\"/assets/application-68b329da9893e34099c7d8ad5cb9c940.css?body=1\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />",
-      sprockets_stylesheet_link_tag(:application, :debug => true)
+      stylesheet_link_tag(:application, :debug => true)
   end
 end
-- 
cgit v1.2.3