actionpack 1.13.6 → 2.0.0

data/test/controller/verification_test.rb

@@ -37,6 +37,8 @@ class VerificationTest < Test::Unit::TestCase
     verify :only => :guarded_one_for_named_route_test, :params => "one",
            :redirect_to => :foo_url
 
+    verify :only => :no_default_action, :params => "santa"
+
     def guarded_one
       render :text => "#{params[:one]}"
     end
@@ -89,6 +91,10 @@ class VerificationTest < Test::Unit::TestCase
       render :text => "Was a post!"
     end
     
+    def no_default_action
+      # Will never run
+    end
+    
     protected
       def rescue_action(e) raise end
 
@@ -229,6 +235,11 @@ class VerificationTest < Test::Unit::TestCase
     assert_equal "Was a post!", @response.body
   end
     
+  def test_default_failure_should_be_a_bad_request
+    post :no_default_action
+    assert_response :bad_request
+  end
+    
   def test_guarded_post_and_calls_render_fails_and_sets_allow_header
     get :must_be_post
     assert_response 405

data/test/controller/view_paths_test.rb

@@ -0,0 +1,137 @@
+require File.dirname(__FILE__) + '/../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
+      self.class.view_paths.unshift "#{LOAD_PATH_ROOT}/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
+    ActionView::Base.cache_template_extensions = false
+    @controller = TestController.new
+    @request  = ActionController::TestRequest.new
+    @response = ActionController::TestResponse.new
+  
+    # Track the last warning.
+    @old_behavior = ActiveSupport::Deprecation.behavior
+    @last_message = nil
+    ActiveSupport::Deprecation.behavior = Proc.new { |message, callback| @last_message = message }
+  end
+  
+  def teardown
+    ActiveSupport::Deprecation.behavior = @old_behavior
+    ActionView::Base.cache_template_extensions = true
+  end
+  
+  def test_template_load_path_was_set_correctly
+    assert_equal [ LOAD_PATH_ROOT ], @controller.view_paths
+  end
+  
+  def test_controller_appends_view_path_correctly
+    TestController.append_view_path 'foo'
+    assert_equal [LOAD_PATH_ROOT, 'foo'], @controller.view_paths
+    
+    TestController.append_view_path(%w(bar baz))
+    assert_equal [LOAD_PATH_ROOT, 'foo', 'bar', 'baz'], @controller.view_paths
+  end
+  
+  def test_controller_prepends_view_path_correctly
+    TestController.prepend_view_path 'baz'
+    assert_equal ['baz', LOAD_PATH_ROOT], @controller.view_paths
+    
+    TestController.prepend_view_path(%w(foo bar))
+    assert_equal ['foo', 'bar', 'baz', LOAD_PATH_ROOT], @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
+    
+    @controller.append_view_path(%w(bar baz))
+    assert_equal [LOAD_PATH_ROOT, '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
+    
+    @controller.prepend_view_path(%w(foo bar))
+    assert_equal ['foo', 'bar', 'baz', LOAD_PATH_ROOT], @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.view_paths.unshift "#{LOAD_PATH_ROOT}/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" ]
+    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
+    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/controller/webservice_test.rb

@@ -1,20 +1,16 @@
 require File.dirname(__FILE__) + '/../abstract_unit'
-require 'stringio'
 
 class WebServiceTest < Test::Unit::TestCase
-
   class MockCGI < CGI #:nodoc:
-    attr_accessor :stdinput, :stdoutput, :env_table
+    attr_accessor :stdoutput, :env_table
 
-    def initialize(env, data = '')      
+    def initialize(env, data = '')
       self.env_table = env
-      self.stdinput = StringIO.new(data)
       self.stdoutput = StringIO.new
-      super()
+      super(nil, StringIO.new(data))
     end
   end
 
-
   class TestController < ActionController::Base
     session :off
 
@@ -40,10 +36,13 @@ class WebServiceTest < Test::Unit::TestCase
   
   def setup
     @controller = TestController.new
-    ActionController::Base.param_parsers.clear
-    ActionController::Base.param_parsers[Mime::XML] = :xml_node
+    @default_param_parsers = ActionController::Base.param_parsers.dup
   end
-  
+
+  def teardown
+    ActionController::Base.param_parsers = @default_param_parsers
+  end
+
   def test_check_parameters
     process('GET')
     assert_equal '', @controller.response.body
@@ -54,7 +53,7 @@ class WebServiceTest < Test::Unit::TestCase
     
     assert_equal 'entry', @controller.response.body
     assert @controller.params.has_key?(:entry)
-    assert_equal 'content...', @controller.params["entry"].summary.node_value
+    assert_equal 'content...', @controller.params["entry"]['summary']
     assert_equal 'true', @controller.params["entry"]['attributed']
   end
   
@@ -63,7 +62,7 @@ class WebServiceTest < Test::Unit::TestCase
     
     assert_equal 'entry', @controller.response.body
     assert @controller.params.has_key?(:entry)
-    assert_equal 'content...', @controller.params["entry"].summary.node_value
+    assert_equal 'content...', @controller.params["entry"]['summary']
     assert_equal 'true', @controller.params["entry"]['attributed']
   end
 
@@ -98,15 +97,6 @@ class WebServiceTest < Test::Unit::TestCase
     assert_nothing_raised { process('POST', 'application/xml', "") }
     assert_equal "", @controller.response.body
   end
-  
-  def test_deprecated_request_methods
-    process('POST', 'application/x-yaml')
-    assert_equal Mime::YAML, @controller.request.content_type
-    assert_equal true, @controller.request.post?
-    assert_equal :yaml, @controller.request.post_format
-    assert_equal true, @controller.request.yaml_post?
-    assert_equal false, @controller.request.xml_post?    
-  end
 
   def test_dasherized_keys_as_xml
     ActionController::Base.param_parsers[Mime::XML] = :xml_simple
@@ -192,57 +182,3 @@ class WebServiceTest < Test::Unit::TestCase
   end
     
 end
-
-
-class XmlNodeTest < Test::Unit::TestCase
-  def test_all
-    xn = XmlNode.from_xml(%{<?xml version="1.0" encoding="UTF-8"?>
-      <response success='true'>
-      <page title='Ajax Summit' id='1133' email_address='ry87ib@backpackit.com'>
-        <description>With O'Reilly and Adaptive Path</description>
-        <notes>
-          <note title='Hotel' id='1020' created_at='2005-05-14 16:41:11'>
-            Staying at the Savoy
-          </note>
-        </notes>
-        <tags>
-          <tag name='Technology' id='4' />
-          <tag name='Travel' id='5' />
-        </tags>
-      </page>
-      </response>
-     }
-    )     
-    assert_equal 'UTF-8', xn.node.document.encoding
-    assert_equal '1.0', xn.node.document.version
-    assert_equal 'true', xn['success']
-    assert_equal 'response', xn.node_name
-    assert_equal 'Ajax Summit', xn.page['title']
-    assert_equal '1133', xn.page['id']
-    assert_equal "With O'Reilly and Adaptive Path", xn.page.description.node_value
-    assert_equal nil, xn.nonexistent
-    assert_equal "Staying at the Savoy", xn.page.notes.note.node_value.strip
-    assert_equal 'Technology', xn.page.tags.tag[0]['name']
-    assert_equal 'Travel', xn.page.tags.tag[1][:name]
-    matches = xn.xpath('//@id').map{ |id| id.to_i }
-    assert_equal [4, 5, 1020, 1133], matches.sort
-    matches = xn.xpath('//tag').map{ |tag| tag['name'] }
-    assert_equal ['Technology', 'Travel'], matches.sort
-    assert_equal "Ajax Summit", xn.page['title']
-    xn.page['title'] = 'Ajax Summit V2'
-    assert_equal "Ajax Summit V2", xn.page['title']
-    assert_equal "Staying at the Savoy", xn.page.notes.note.node_value.strip
-    xn.page.notes.note.node_value = "Staying at the Ritz"
-    assert_equal "Staying at the Ritz", xn.page.notes.note.node_value.strip
-    assert_equal '5', xn.page.tags.tag[1][:id]
-    xn.page.tags.tag[1]['id'] = '7'
-    assert_equal '7', xn.page.tags.tag[1]['id']
-  end
-  
-
-  def test_small_entry
-    node = XmlNode.from_xml('<entry>hi</entry>')
-    assert_equal 'hi', node.node_value
-  end
-
-end

data/test/fixtures/db_definitions/sqlite.sql

@@ -9,7 +9,8 @@ CREATE TABLE 'replies' (
   'content' text, 
   'created_at' datetime, 
   'updated_at' datetime, 
-  'topic_id' integer
+  'topic_id' integer,
+  'developer_id' integer
 );
 
 CREATE TABLE 'topics' (

data/test/fixtures/developer.rb

@@ -1,5 +1,7 @@
 class Developer < ActiveRecord::Base
   has_and_belongs_to_many :projects
+  has_many :replies
+  has_many :topics, :through => :replies
 end
 
 class DeVeLoPeR < ActiveRecord::Base

data/test/fixtures/helpers/fun/pdf_helper.rb

@@ -1,3 +1,3 @@
-module Fun::PDFHelper
+module Fun::PdfHelper
   def foobar() 'baz' end
 end

data/test/fixtures/layout_tests/alt/hello.rhtml

@@ -0,0 +1 @@
+alt/hello.rhtml

data/test/fixtures/layout_tests/layouts/multiple_extensions.html.erb

@@ -0,0 +1 @@
+multiple_extensions.html.erb <%= yield %>

data/test/fixtures/multipart/bracketed_param

@@ -0,0 +1,5 @@
+--AaB03x
+Content-Disposition: form-data; name="foo[baz]"
+
+bar
+--AaB03x--

data/test/fixtures/override/test/hello_world.erb

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

data/test/fixtures/override2/layouts/test/sub.erb

@@ -0,0 +1 @@
+layout: <%= yield %>

data/test/fixtures/post_test/layouts/post.html.erb

@@ -0,0 +1 @@
+<html><div id="html"><%= yield %></div></html>

data/test/fixtures/post_test/layouts/super_post.iphone.erb

@@ -0,0 +1 @@
+<html><div id="super_iphone"><%= yield %></div></html>

data/test/fixtures/post_test/post/index.html.erb

@@ -0,0 +1 @@
+Hello Firefox

data/test/fixtures/post_test/post/index.iphone.erb

@@ -0,0 +1 @@
+Hello iPhone

data/test/fixtures/post_test/super_post/index.html.erb

@@ -0,0 +1 @@
+Super Firefox

data/test/fixtures/post_test/super_post/index.iphone.erb

@@ -0,0 +1 @@
+Super iPhone

data/test/fixtures/public/404.html

@@ -0,0 +1 @@
+404 error fixture

data/test/fixtures/public/500.html

@@ -0,0 +1 @@
+500 error fixture

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

@@ -1 +0,0 @@
-# Test file for javascript_include_tag

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

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

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

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

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

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

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

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

data/test/fixtures/replies.yml

@@ -1,6 +1,7 @@
 witty_retort:
   id: 1
   topic_id: 1
+  developer_id: 1
   content: Birdman is better!
   created_at: <%= 6.hours.ago.to_s(:db) %>
   updated_at: nil
@@ -8,6 +9,7 @@ witty_retort:
 another:
   id: 2
   topic_id: 2
+  developer_id: 1
   content: Nuh uh!
   created_at: <%= 1.hour.ago.to_s(:db) %>
   updated_at: nil

data/test/fixtures/reply.rb

@@ -1,5 +1,6 @@
 class Reply < ActiveRecord::Base
   belongs_to :topic, :include => [:replies]
-  
+  belongs_to :developer
+
   validates_presence_of :content
 end

data/test/fixtures/respond_to/custom_constant_handling_without_block.mobile.erb

@@ -0,0 +1 @@
+Mobile

data/test/fixtures/respond_to/iphone_with_html_response_type.html.erb

@@ -0,0 +1 @@
+Hello future from <%= @type -%>!

data/test/fixtures/respond_to/iphone_with_html_response_type.iphone.erb

@@ -0,0 +1 @@
+Hello iPhone future from <%= @type -%>!

data/test/fixtures/respond_to/layouts/missing.html.erb

@@ -0,0 +1 @@
+<html><div id="html_missing"><%= yield %></div></html>

data/test/fixtures/respond_to/layouts/standard.html.erb

@@ -0,0 +1 @@
+<html><div id="html"><%= yield %></div></html>

data/test/fixtures/respond_to/layouts/standard.iphone.erb

@@ -0,0 +1 @@
+<html><div id="iphone"><%= yield %></div></html>