actionpack 2.1.2 → 2.2.2

data/test/controller/view_paths_test.rb

@@ -1,30 +1,26 @@
 require 'abstract_unit'
 
 class ViewLoadPathsTest < Test::Unit::TestCase
-  
-  LOAD_PATH_ROOT = File.join(File.dirname(__FILE__), '..', 'fixtures')
-
-  ActionController::Base.view_paths = [ LOAD_PATH_ROOT ]
-
   class TestController < ActionController::Base
     def self.controller_path() "test" end
     def rescue_action(e) raise end
-    
+
     before_filter :add_view_path, :only => :hello_world_at_request_time
-    
+
     def hello_world() end
     def hello_world_at_request_time() render(:action => 'hello_world') end
+
     private
-    def add_view_path
-      prepend_view_path "#{LOAD_PATH_ROOT}/override"
-    end
+      def add_view_path
+        prepend_view_path "#{FIXTURE_LOAD_PATH}/override"
+      end
   end
-  
+
   class Test::SubController < ActionController::Base
     layout 'test/sub'
     def hello_world; render(:template => 'test/hello_world'); end
   end
-  
+
   def setup
     TestController.view_paths = nil
 
@@ -41,100 +37,105 @@ class ViewLoadPathsTest < Test::Unit::TestCase
     @last_message = nil
     ActiveSupport::Deprecation.behavior = Proc.new { |message, callback| @last_message = message }
   end
-  
+
   def teardown
     ActiveSupport::Deprecation.behavior = @old_behavior
   end
-  
+
   def test_template_load_path_was_set_correctly
-    assert_equal [ LOAD_PATH_ROOT ], @controller.view_paths
+    assert_equal [FIXTURE_LOAD_PATH], @controller.view_paths
   end
-  
+
   def test_controller_appends_view_path_correctly
     @controller.append_view_path 'foo'
-    assert_equal [LOAD_PATH_ROOT, 'foo'], @controller.view_paths
-    
+    assert_equal [FIXTURE_LOAD_PATH, 'foo'], @controller.view_paths
+
     @controller.append_view_path(%w(bar baz))
-    assert_equal [LOAD_PATH_ROOT, 'foo', 'bar', 'baz'], @controller.view_paths
+    assert_equal [FIXTURE_LOAD_PATH, 'foo', 'bar', 'baz'], @controller.view_paths
+
+    @controller.append_view_path(FIXTURE_LOAD_PATH)
+    assert_equal [FIXTURE_LOAD_PATH, 'foo', 'bar', 'baz', FIXTURE_LOAD_PATH], @controller.view_paths
   end
-  
+
   def test_controller_prepends_view_path_correctly
     @controller.prepend_view_path 'baz'
-    assert_equal ['baz', LOAD_PATH_ROOT], @controller.view_paths
-    
+    assert_equal ['baz', FIXTURE_LOAD_PATH], @controller.view_paths
+
     @controller.prepend_view_path(%w(foo bar))
-    assert_equal ['foo', 'bar', 'baz', LOAD_PATH_ROOT], @controller.view_paths
+    assert_equal ['foo', 'bar', 'baz', FIXTURE_LOAD_PATH], @controller.view_paths
+
+    @controller.prepend_view_path(FIXTURE_LOAD_PATH)
+    assert_equal [FIXTURE_LOAD_PATH, 'foo', 'bar', 'baz', FIXTURE_LOAD_PATH], @controller.view_paths
   end
-  
+
   def test_template_appends_view_path_correctly
     @controller.instance_variable_set :@template, ActionView::Base.new(TestController.view_paths, {}, @controller)
     class_view_paths = TestController.view_paths
 
     @controller.append_view_path 'foo'
-    assert_equal [LOAD_PATH_ROOT, 'foo'], @controller.view_paths
-    
+    assert_equal [FIXTURE_LOAD_PATH, 'foo'], @controller.view_paths
+
     @controller.append_view_path(%w(bar baz))
-    assert_equal [LOAD_PATH_ROOT, 'foo', 'bar', 'baz'], @controller.view_paths
+    assert_equal [FIXTURE_LOAD_PATH, 'foo', 'bar', 'baz'], @controller.view_paths
     assert_equal class_view_paths, TestController.view_paths
   end
-  
+
   def test_template_prepends_view_path_correctly
     @controller.instance_variable_set :@template, ActionView::Base.new(TestController.view_paths, {}, @controller)
     class_view_paths = TestController.view_paths
-    
+
     @controller.prepend_view_path 'baz'
-    assert_equal ['baz', LOAD_PATH_ROOT], @controller.view_paths
-    
+    assert_equal ['baz', FIXTURE_LOAD_PATH], @controller.view_paths
+
     @controller.prepend_view_path(%w(foo bar))
-    assert_equal ['foo', 'bar', 'baz', LOAD_PATH_ROOT], @controller.view_paths
+    assert_equal ['foo', 'bar', 'baz', FIXTURE_LOAD_PATH], @controller.view_paths
     assert_equal class_view_paths, TestController.view_paths
   end
-  
+
   def test_view_paths
     get :hello_world
     assert_response :success
     assert_equal "Hello world!", @response.body
   end
-  
+
   def test_view_paths_override
-    TestController.prepend_view_path "#{LOAD_PATH_ROOT}/override"
+    TestController.prepend_view_path "#{FIXTURE_LOAD_PATH}/override"
     get :hello_world
     assert_response :success
     assert_equal "Hello overridden world!", @response.body
   end
-  
+
   def test_view_paths_override_for_layouts_in_controllers_with_a_module
     @controller = Test::SubController.new
-    Test::SubController.view_paths = [ "#{LOAD_PATH_ROOT}/override", LOAD_PATH_ROOT, "#{LOAD_PATH_ROOT}/override2" ]
+    Test::SubController.view_paths = [ "#{FIXTURE_LOAD_PATH}/override", FIXTURE_LOAD_PATH, "#{FIXTURE_LOAD_PATH}/override2" ]
     get :hello_world
     assert_response :success
     assert_equal "layout: Hello overridden world!", @response.body
   end
-  
+
   def test_view_paths_override_at_request_time
     get :hello_world_at_request_time
     assert_response :success
     assert_equal "Hello overridden world!", @response.body
   end
-  
+
   def test_inheritance
     original_load_paths = ActionController::Base.view_paths
-    
+
     self.class.class_eval %{
       class A < ActionController::Base; end
       class B < A; end
       class C < ActionController::Base; end
     }
-  
-    A.view_paths = [ 'a/path' ]
-    
-    assert_equal [ 'a/path' ],        A.view_paths
-    assert_equal A.view_paths,   B.view_paths
+
+    A.view_paths = ['a/path']
+
+    assert_equal ['a/path'], A.view_paths
+    assert_equal A.view_paths, B.view_paths
     assert_equal original_load_paths, C.view_paths
-    
+
     C.view_paths = []
     assert_nothing_raised { C.view_paths << 'c/path' }
     assert_equal ['c/path'], C.view_paths
   end
-  
 end

data/test/fixtures/_top_level_partial.html.erb

@@ -0,0 +1 @@
+top level partial html

data/test/fixtures/_top_level_partial_only.erb

@@ -0,0 +1 @@
+top level partial

data/test/fixtures/developers/_developer.erb

@@ -0,0 +1 @@
+<%= developer.name %>

data/test/fixtures/fun/games/_game.erb

@@ -0,0 +1 @@
+<%= game.name %>

data/test/fixtures/fun/serious/games/_game.erb

@@ -0,0 +1 @@
+<%= game.name %>

data/test/fixtures/functional_caching/formatted_fragment_cached.html.erb

@@ -0,0 +1,3 @@
+<body>
+<% cache do %><p>ERB</p><% end %>
+</body>

data/test/fixtures/functional_caching/formatted_fragment_cached.js.rjs

@@ -0,0 +1,6 @@
+page.assign 'title', 'Hey'
+cache do
+  page['element_1'].visual_effect :highlight
+  page['element_2'].visual_effect :highlight
+end
+page.assign 'footer', 'Bye'

data/test/fixtures/functional_caching/formatted_fragment_cached.xml.builder

@@ -0,0 +1,5 @@
+xml.body do
+  cache do
+    xml.p "Builder"
+  end
+end

data/test/fixtures/functional_caching/inline_fragment_cached.html.erb

@@ -0,0 +1,2 @@
+<%= render :inline => 'Some inline content' %>
+<% cache do %>Some cached content<% end %>

data/test/fixtures/layouts/_column.html.erb

@@ -0,0 +1,2 @@
+<div id="column"><%= yield :column %></div>
+<div id="content"><%= yield %></div>

data/test/fixtures/projects/_project.erb

@@ -0,0 +1 @@
+<%= project.name %>

data/test/fixtures/public/javascripts/subdir/subdir.js

@@ -0,0 +1 @@
+// subdir js

data/test/fixtures/public/stylesheets/subdir/subdir.css

@@ -0,0 +1 @@
+/* subdir.css */

data/test/fixtures/replies/_reply.erb

@@ -0,0 +1 @@
+<%= reply.content %>

data/test/fixtures/test/_counter.html.erb

@@ -0,0 +1 @@
+<%= counter_counter %>

data/test/fixtures/test/_customer.erb

@@ -1 +1 @@
-Hello: <%= customer.name %>
+Hello: <%= customer.name rescue "Anonymous" %>

data/test/fixtures/test/_customer_with_var.erb

@@ -0,0 +1 @@
+<%= customer.name %> <%= object.name %> <%= customer_with_var.name %>

data/test/fixtures/test/_layout_for_block_with_args.html.erb

@@ -0,0 +1,3 @@
+Before
+<%= yield 'arg1', 'arg2' %>
+After

data/test/fixtures/test/_local_inspector.html.erb

@@ -0,0 +1 @@
+<%= local_assigns.keys.map(&:to_s).sort.join(",") -%>

data/test/fixtures/test/_partial_with_only_html_version.html.erb

@@ -0,0 +1 @@
+partial with only html version

data/test/fixtures/test/hello.builder

@@ -1,4 +1,4 @@
 xml.html do
   xml.p "Hello #{@name}"
-  xml << render_file("test/greeting")
+  xml << render("test/greeting")
 end

data/test/fixtures/test/hyphen-ated.erb

@@ -0,0 +1 @@
+Hello world!

data/test/fixtures/test/implicit_content_type.atom.builder

@@ -0,0 +1,2 @@
+xml.atom do
+end

data/test/fixtures/test/nested_layout.erb

@@ -0,0 +1,3 @@
+<% content_for :title, "title" -%>
+<% content_for :column do -%>column<% end -%>
+<% render :layout => 'layouts/column' do -%>content<% end -%>

data/test/fixtures/test/non_erb_block_content_for.builder

@@ -1,4 +1,4 @@
 content_for :title do
   'Putting stuff in the title!'
 end
-xml << "\nGreat stuff!"
+xml << "\nGreat stuff!"

data/test/fixtures/test/sub_template_raise.html.erb

@@ -0,0 +1 @@
+<%= render :partial => "test/raise" %>

data/test/fixtures/test/template.erb

@@ -0,0 +1 @@
+<%= template.path %>

data/test/fixtures/test/using_layout_around_block_with_args.html.erb

@@ -0,0 +1 @@
+<% render(:layout => "layout_for_block_with_args") do |*args| %><%= args.join %><% end %>

data/test/template/active_record_helper_i18n_test.rb

@@ -0,0 +1,46 @@
+require 'abstract_unit'
+
+class ActiveRecordHelperI18nTest < Test::Unit::TestCase
+  include ActionView::Helpers::ActiveRecordHelper
+  
+  attr_reader :request
+  uses_mocha 'active_record_helper_i18n_test' do
+    def setup
+      @object = stub :errors => stub(:count => 1, :full_messages => ['full_messages'])
+      @object_name = 'book'
+      stubs(:content_tag).returns 'content_tag'
+
+      I18n.stubs(:t).with(:'header', :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').returns "1 error prohibited this  from being saved"
+      I18n.stubs(:t).with(:'body', :locale => 'en', :scope => [:activerecord, :errors, :template]).returns 'There were problems with the following fields:'
+    end
+
+    def test_error_messages_for_given_a_header_option_it_does_not_translate_header_message
+      I18n.expects(:translate).with(:'header', :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').never
+      error_messages_for(:object => @object, :header_message => 'header message', :locale => 'en')
+    end
+
+    def test_error_messages_for_given_no_header_option_it_translates_header_message
+      I18n.expects(:t).with(:'header', :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').returns 'header message'
+      I18n.expects(:t).with('', :default => '', :count => 1, :scope => [:activerecord, :models]).once.returns ''
+      error_messages_for(:object => @object, :locale => 'en')
+    end
+
+    def test_error_messages_for_given_a_message_option_it_does_not_translate_message
+      I18n.expects(:t).with(:'body', :locale => 'en', :scope => [:activerecord, :errors, :template]).never
+      I18n.expects(:t).with('', :default => '', :count => 1, :scope => [:activerecord, :models]).once.returns ''
+      error_messages_for(:object => @object, :message => 'message', :locale => 'en')
+    end
+
+    def test_error_messages_for_given_no_message_option_it_translates_message
+      I18n.expects(:t).with(:'body', :locale => 'en', :scope => [:activerecord, :errors, :template]).returns 'There were problems with the following fields:'
+      I18n.expects(:t).with('', :default => '', :count => 1, :scope => [:activerecord, :models]).once.returns ''
+      error_messages_for(:object => @object, :locale => 'en')
+    end
+    
+    def test_error_messages_for_given_object_name_it_translates_object_name
+      I18n.expects(:t).with(:header, :locale => 'en', :scope => [:activerecord, :errors, :template], :count => 1, :model => @object_name).returns "1 error prohibited this #{@object_name} from being saved"
+      I18n.expects(:t).with(@object_name, :default => @object_name, :count => 1, :scope => [:activerecord, :models]).once.returns @object_name
+      error_messages_for(:object => @object, :locale => 'en', :object_name => @object_name)
+    end
+  end
+end

data/test/template/active_record_helper_test.rb

@@ -10,17 +10,17 @@ class ActiveRecordHelperTest < ActionView::TestCase
       alias_method :body_before_type_cast, :body unless respond_to?(:body_before_type_cast)
       alias_method :author_name_before_type_cast, :author_name unless respond_to?(:author_name_before_type_cast)
     end
-    
+
     User = Struct.new("User", :email)
     User.class_eval do
       alias_method :email_before_type_cast, :email unless respond_to?(:email_before_type_cast)
     end
-    
+
     Column = Struct.new("Column", :type, :name, :human_name)
   end
 
   def setup_post
-    @post = Post.new    
+    @post = Post.new
     def @post.errors
       Class.new {
         def on(field)
@@ -33,12 +33,12 @@ class ActiveRecordHelperTest < ActionView::TestCase
             false
           end
         end
-        def empty?() false end 
-        def count() 1 end 
+        def empty?() false end
+        def count() 1 end
         def full_messages() [ "Author name can't be empty" ] end
       }.new
     end
-    
+
     def @post.new_record?() true end
     def @post.to_param() nil end
 
@@ -58,16 +58,16 @@ class ActiveRecordHelperTest < ActionView::TestCase
   end
 
   def setup_user
-    @user = User.new    
+    @user = User.new
     def @user.errors
       Class.new {
         def on(field) field == "email" end
-        def empty?() false end 
-        def count() 1 end 
+        def empty?() false end
+        def count() 1 end
         def full_messages() [ "User email can't be empty" ] end
       }.new
     end
-    
+
     def @user.new_record?() true end
     def @user.to_param() nil end
 
@@ -81,7 +81,7 @@ class ActiveRecordHelperTest < ActionView::TestCase
 
     @user.email = ""
   end
-  
+
   def protect_against_forgery?
     @protect_against_forgery ? true : false
   end
@@ -92,7 +92,7 @@ class ActiveRecordHelperTest < ActionView::TestCase
     setup_user
 
     @response = ActionController::TestResponse.new
-    
+
     @controller = Object.new
     def @controller.url_for(options)
       options = options.symbolize_keys
@@ -111,7 +111,7 @@ class ActiveRecordHelperTest < ActionView::TestCase
     assert_dom_equal(
       %(<div class="fieldWithErrors"><textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea></div>),
       text_area("post", "body")
-    )    
+    )
   end
 
   def test_text_field_with_errors
@@ -140,7 +140,7 @@ class ActiveRecordHelperTest < ActionView::TestCase
       form("post")
     )
   end
-  
+
   def test_form_with_protect_against_forgery
     @protect_against_forgery = true
     @request_forgery_protection_token = 'authenticity_token'
@@ -150,7 +150,7 @@ class ActiveRecordHelperTest < ActionView::TestCase
       form("post")
     )
   end
-  
+
   def test_form_with_method_option
     assert_dom_equal(
       %(<form action="create" method="get"><p><label for="post_title">Title</label><br /><input id="post_title" name="post[title]" size="30" type="text" value="Hello World" /></p>\n<p><label for="post_body">Body</label><br /><div class="fieldWithErrors"><textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea></div></p><input name="commit" type="submit" value="Create" /></form>),
@@ -211,9 +211,9 @@ class ActiveRecordHelperTest < ActionView::TestCase
     other_post = @post
     assert_dom_equal "<div class=\"formError\">can't be empty</div>", error_message_on(other_post, :author_name)
   end
-  
-  def test_error_message_on_should_use_options
-    assert_dom_equal "<div class=\"differentError\">beforecan't be emptyafter</div>", error_message_on(:post, :author_name, "before", "after", "differentError")
+
+  def test_error_message_on_with_options_hash
+    assert_dom_equal "<div class=\"differentError\">beforecan't be emptyafter</div>", error_message_on(:post, :author_name, :css_class => 'differentError', :prepend_text => 'before', :append_text => 'after')
   end
 
   def test_error_messages_for_many_objects
@@ -224,10 +224,10 @@ class ActiveRecordHelperTest < ActionView::TestCase
 
     # add the default to put post back in the title
     assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>User email can't be empty</li><li>Author name can't be empty</li></ul></div>), error_messages_for("user", "post", :object_name => "post")
-    
+
     # symbols work as well
     assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>User email can't be empty</li><li>Author name can't be empty</li></ul></div>), error_messages_for(:user, :post, :object_name => :post)
-    
+
     # any default works too
     assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this monkey from being saved</h2><p>There were problems with the following fields:</p><ul><li>User email can't be empty</li><li>Author name can't be empty</li></ul></div>), error_messages_for(:user, :post, :object_name => "monkey")
 
@@ -242,7 +242,7 @@ class ActiveRecordHelperTest < ActionView::TestCase
     message = "Please fix the following fields and resubmit:"
     assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>#{header_message}</h2><p>#{message}</p><ul><li>User email can't be empty</li><li>Author name can't be empty</li></ul></div>), error_messages_for(:user, :post, :header_message => header_message, :message => message)
   end
-  
+
   def test_error_messages_for_non_instance_variable
     actual_user = @user
     actual_post = @post
@@ -251,14 +251,14 @@ class ActiveRecordHelperTest < ActionView::TestCase
 
   #explicitly set object
     assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>1 error prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>), error_messages_for("post", :object => actual_post)
-      
+
   #multiple objects
     assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this user from being saved</h2><p>There were problems with the following fields:</p><ul><li>User email can't be empty</li><li>Author name can't be empty</li></ul></div>), error_messages_for("user", "post", :object => [actual_user, actual_post])
-    
+
   #nil object
     assert_equal '', error_messages_for('user', :object => nil)
   end
-  
+
   def test_form_with_string_multipart
     assert_dom_equal(
       %(<form action="create" enctype="multipart/form-data" method="post"><p><label for="post_title">Title</label><br /><input id="post_title" name="post[title]" size="30" type="text" value="Hello World" /></p>\n<p><label for="post_body">Body</label><br /><div class="fieldWithErrors"><textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea></div></p><input name="commit" type="submit" value="Create" /></form>),