radiant 0.6.9 → 0.7.0

data/vendor/rails/actionpack/test/template/template_object_test.rb

@@ -0,0 +1,95 @@
+require 'abstract_unit'
+
+class TemplateObjectTest < Test::Unit::TestCase
+  LOAD_PATH_ROOT = File.join(File.dirname(__FILE__), '..', 'fixtures')
+  ActionView::TemplateFinder.process_view_paths(LOAD_PATH_ROOT)
+  
+  class TemplateTest < Test::Unit::TestCase
+    def setup
+      @view = ActionView::Base.new(LOAD_PATH_ROOT)
+      @path = "test/hello_world.erb"
+    end
+    
+    def test_should_create_valid_template
+      template = ActionView::Template.new(@view, @path, true)
+      
+      assert_kind_of ActionView::TemplateHandlers::ERB, template.handler
+      assert_equal "test/hello_world.erb", template.path
+      assert_nil template.instance_variable_get(:"@source")
+      assert_equal "erb", template.extension
+    end
+    
+    uses_mocha 'Template preparation tests' do
+      
+      def test_should_prepare_template_properly
+        template = ActionView::Template.new(@view, @path, true)
+        view = template.instance_variable_get(:"@view")
+        
+        view.expects(:evaluate_assigns)
+        template.handler.expects(:compile_template).with(template)
+        view.expects(:method_names).returns({})
+        
+        template.prepare!
+      end
+      
+    end
+  end
+  
+  class PartialTemplateTest < Test::Unit::TestCase
+    def setup
+      @view = ActionView::Base.new(LOAD_PATH_ROOT)
+      @path = "test/partial_only"
+    end
+    
+    def test_should_create_valid_partial_template
+      template = ActionView::PartialTemplate.new(@view, @path, nil)
+      
+      assert_equal "test/_partial_only", template.path
+      assert_equal :partial_only, template.variable_name
+      
+      assert template.locals.has_key?(:object)
+      assert template.locals.has_key?(:partial_only)
+    end
+    
+    def test_partial_with_errors
+      template = ActionView::PartialTemplate.new(@view, 'test/raise', nil)
+      assert_raise(ActionView::TemplateError) { template.render_template }
+    end
+    
+    uses_mocha 'Partial template preparation tests' do
+      def test_should_prepare_on_initialization
+        ActionView::PartialTemplate.any_instance.expects(:prepare!)
+        template = ActionView::PartialTemplate.new(@view, @path, 1)
+      end
+    end
+  end
+  
+  class PartialTemplateFallbackTest < Test::Unit::TestCase
+    def setup
+      @view = ActionView::Base.new(LOAD_PATH_ROOT)
+      @path = 'test/layout_for_partial'
+    end
+
+    def test_default
+      template = ActionView::PartialTemplate.new(@view, @path, nil)
+      assert_equal 'test/_layout_for_partial', template.path
+      assert_equal 'erb', template.extension
+      assert_equal :html, @view.template_format
+    end
+
+    def test_js
+      @view.template_format = :js
+      template = ActionView::PartialTemplate.new(@view, @path, nil)
+      assert_equal 'test/_layout_for_partial', template.path
+      assert_equal 'erb', template.extension
+      assert_equal :html, @view.template_format
+    end
+
+    def test_xml
+      @view.template_format = :xml
+      assert_raise ActionView::MissingTemplate do
+        ActionView::PartialTemplate.new(@view, @path, nil)
+      end
+    end
+  end
+end

data/vendor/rails/actionpack/test/template/test_test.rb

@@ -0,0 +1,56 @@
+require 'abstract_unit'
+
+module PeopleHelper
+  def title(text)
+    content_tag(:h1, text)
+  end
+
+  def homepage_path
+    people_path
+  end
+
+  def homepage_url
+    people_url
+  end
+
+  def link_to_person(person)
+    link_to person.name, person
+  end
+end
+
+class PeopleHelperTest < ActionView::TestCase
+  def setup
+    ActionController::Routing::Routes.draw do |map|
+      map.people 'people', :controller => 'people', :action => 'index'
+      map.connect ':controller/:action/:id'
+    end
+  end
+
+  def test_title
+    assert_equal "<h1>Ruby on Rails</h1>", title("Ruby on Rails")
+  end
+
+  def test_homepage_path
+    assert_equal "/people", homepage_path
+  end
+
+  def test_homepage_url
+    assert_equal "http://test.host/people", homepage_url
+  end
+
+  uses_mocha "link_to_person" do
+    def test_link_to_person
+      person = mock(:name => "David")
+      expects(:mocha_mock_path).with(person).returns("/people/1")
+      assert_equal '<a href="/people/1">David</a>', link_to_person(person)
+    end
+  end
+end
+
+class CrazyHelperTest < ActionView::TestCase
+  tests PeopleHelper
+
+  def test_helper_class_can_be_set_manually_not_just_inferred
+    assert_equal PeopleHelper, self.class.helper_class
+  end
+end

data/vendor/rails/actionpack/test/template/text_helper_test.rb

@@ -1,9 +1,8 @@
-require "#{File.dirname(__FILE__)}/../abstract_unit"
-require "#{File.dirname(__FILE__)}/../testing_sandbox"
+require 'abstract_unit'
+require 'testing_sandbox'
 
-class TextHelperTest < Test::Unit::TestCase
-  include ActionView::Helpers::TextHelper
-  include ActionView::Helpers::TagHelper
+class TextHelperTest < ActionView::TestCase
+  tests ActionView::Helpers::TextHelper
   include TestingSandbox
 
   def setup
@@ -24,6 +23,9 @@ class TextHelperTest < Test::Unit::TestCase
 
     text = "A\r\n  \nB\n\n\r\n\t\nC\nD".freeze
     assert_equal "<p>A\n<br />  \n<br />B</p>\n\n<p>\t\n<br />C\n<br />D</p>", simple_format(text)
+
+     assert_equal %q(<p class="test">This is a classy test</p>), simple_format("This is a classy test", :class => 'test')
+     assert_equal %Q(<p class="test">para 1</p>\n\n<p class="test">para 2</p>), simple_format("para 1\n\npara 2", :class => 'test')
   end
 
   def test_truncate
@@ -36,16 +38,26 @@ class TextHelperTest < Test::Unit::TestCase
     assert_equal str[0...27] + "...", truncate(str)
   end
 
-  def test_truncate_multibyte
-    with_kcode 'none' do
-      assert_equal "\354\225\210\353\205\225\355...", truncate("\354\225\210\353\205\225\355\225\230\354\204\270\354\232\224", 10) 
+  if RUBY_VERSION < '1.9.0'
+    def test_truncate_multibyte
+      with_kcode 'none' do
+        assert_equal "\354\225\210\353\205\225\355...", truncate("\354\225\210\353\205\225\355\225\230\354\204\270\354\232\224", 10)
+      end
+      with_kcode 'u' do
+        assert_equal "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 ...",
+          truncate("\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 \354\225\204\353\235\274\353\246\254\354\230\244", 10)
+      end
     end
-    with_kcode 'u' do
-      assert_equal "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 ...",
-        truncate("\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 \354\225\204\353\235\274\353\246\254\354\230\244", 10)
+  else
+    def test_truncate_multibyte
+      assert_equal "\354\225\210\353\205\225\355...",
+        truncate("\354\225\210\353\205\225\355\225\230\354\204\270\354\232\224", 10)
+
+      assert_equal "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 ...".force_encoding('UTF-8'),
+        truncate("\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 \354\225\204\353\235\274\353\246\254\354\230\244".force_encoding('UTF-8'), 10)
     end
   end
-  
+
   def test_highlighter
     assert_equal(
       "This is a <strong class=\"highlight\">beautiful</strong> morning",
@@ -61,7 +73,7 @@ class TextHelperTest < Test::Unit::TestCase
       "This is a <b>beautiful</b> morning, but also a <b>beautiful</b> day",
       highlight("This is a beautiful morning, but also a beautiful day", "beautiful", '<b>\1</b>')
     )
-    
+
     assert_equal(
       "This text is not changed because we supplied an empty phrase",
       highlight("This text is not changed because we supplied an empty phrase", nil)
@@ -92,26 +104,50 @@ class TextHelperTest < Test::Unit::TestCase
   end
 
   def test_excerpt
-    assert_equal("...is a beautiful morni...", excerpt("This is a beautiful morning", "beautiful", 5))
+    assert_equal("...is a beautiful morn...", excerpt("This is a beautiful morning", "beautiful", 5))
     assert_equal("This is a...", excerpt("This is a beautiful morning", "this", 5))
     assert_equal("...iful morning", excerpt("This is a beautiful morning", "morning", 5))
     assert_nil excerpt("This is a beautiful morning", "day")
   end
 
+  def test_excerpt_in_borderline_cases
+    assert_equal("", excerpt("", "", 0))
+    assert_equal("a", excerpt("a", "a", 0))
+    assert_equal("...b...", excerpt("abc", "b", 0))
+    assert_equal("abc", excerpt("abc", "b", 1))
+    assert_equal("abc...", excerpt("abcd", "b", 1))
+    assert_equal("...abc", excerpt("zabc", "b", 1))
+    assert_equal("...abc...", excerpt("zabcd", "b", 1))
+    assert_equal("zabcd", excerpt("zabcd", "b", 2))
+
+    # excerpt strips the resulting string before ap-/prepending excerpt_string.
+    # whether this behavior is meaningful when excerpt_string is not to be
+    # appended is questionable.
+    assert_equal("zabcd", excerpt("  zabcd  ", "b", 4))
+    assert_equal("...abc...", excerpt("z  abc  d", "b", 1))
+  end
+
   def test_excerpt_with_regex
-    assert_equal('...is a beautiful! morn...', excerpt('This is a beautiful! morning', 'beautiful', 5))
-    assert_equal('...is a beautiful? morn...', excerpt('This is a beautiful? morning', 'beautiful', 5))
+    assert_equal('...is a beautiful! mor...', excerpt('This is a beautiful! morning', 'beautiful', 5))
+    assert_equal('...is a beautiful? mor...', excerpt('This is a beautiful? morning', 'beautiful', 5))
   end
 
-  def test_excerpt_with_utf8
-    with_kcode('u') do
-      assert_equal("...fficiency could not be h...", excerpt("That's why efficiency could not be helped", 'could', 8))
+  if RUBY_VERSION < '1.9'
+    def test_excerpt_with_utf8
+      with_kcode('u') do
+        assert_equal("...\357\254\203ciency could not be...", excerpt("That's why e\357\254\203ciency could not be helped", 'could', 8))
+      end
+      with_kcode('none') do
+        assert_equal("...\203ciency could not be...", excerpt("That's why e\357\254\203ciency could not be helped", 'could', 8))
+      end
     end
-    with_kcode('none') do
-      assert_equal("...\203ciency could not be h...", excerpt("That's why efficiency could not be helped", 'could', 8))
+  else
+    def test_excerpt_with_utf8
+      assert_equal("...\357\254\203ciency could not be...".force_encoding('UTF-8'), excerpt("That's why e\357\254\203ciency could not be helped".force_encoding('UTF-8'), 'could', 8))
+      assert_equal("...\203ciency could not be...", excerpt("That's why e\357\254\203ciency could not be helped", 'could', 8))
     end
   end
-    
+
   def test_word_wrap
     assert_equal("my very very\nvery long\nstring", word_wrap("my very very very long string", 15))
   end
@@ -130,18 +166,9 @@ class TextHelperTest < Test::Unit::TestCase
     assert_equal("2 counters", pluralize(2, "count", "counters"))
     assert_equal("0 counters", pluralize(nil, "count", "counters"))
     assert_equal("2 people", pluralize(2, "person"))
-    assert_equal("10 buffaloes", pluralize(10, "buffalo")) 
-  end
-
-  uses_mocha("should_just_add_s_for_pluralize_without_inflector_loaded") do
-    def test_should_just_add_s_for_pluralize_without_inflector_loaded
-      Object.expects(:const_defined?).with("Inflector").times(4).returns(false)
-      assert_equal("1 count", pluralize(1, "count"))
-      assert_equal("2 persons", pluralize(2, "person"))
-      assert_equal("2 personss", pluralize("2", "persons"))
-      assert_equal("2 counts", pluralize(2, "count"))
-      assert_equal("10 buffalos", pluralize(10, "buffalo"))
-    end
+    assert_equal("10 buffaloes", pluralize(10, "buffalo"))
+    assert_equal("1 berry", pluralize(1, "berry"))
+    assert_equal("12 berries", pluralize(12, "berry"))
   end
 
   def test_auto_link_parsing
@@ -158,6 +185,9 @@ class TextHelperTest < Test::Unit::TestCase
               http://www.rubyonrails.com/~minam/contact;new?with=query&string=params
               http://en.wikipedia.org/wiki/Wikipedia:Today%27s_featured_picture_%28animation%29/January_20%2C_2007
               http://www.mail-archive.com/rails@lists.rubyonrails.org/
+              http://www.amazon.com/Testing-Equal-Sign-In-Path/ref=pd_bbs_sr_1?ie=UTF8&s=books&qid=1198861734&sr=8-1
+              http://en.wikipedia.org/wiki/Sprite_(computer_graphics)
+              http://en.wikipedia.org/wiki/Texas_hold'em
             )
 
     urls.each do |url|
@@ -234,6 +264,8 @@ class TextHelperTest < Test::Unit::TestCase
     assert_equal email2_result, auto_link(email2_raw)
     assert_equal '', auto_link(nil)
     assert_equal '', auto_link('')
+    assert_equal "#{link_result} #{link_result} #{link_result}", auto_link("#{link_raw} #{link_raw} #{link_raw}")
+    assert_equal '<a href="http://www.rubyonrails.com">Ruby On Rails</a>', auto_link('<a href="http://www.rubyonrails.com">Ruby On Rails</a>')
   end
 
   def test_auto_link_at_eol
@@ -261,7 +293,7 @@ class TextHelperTest < Test::Unit::TestCase
     assert_equal("2", value.to_s)
     assert_equal("3", value.to_s)
   end
-  
+
   def test_cycle_class_with_no_arguments
     assert_raise(ArgumentError) { value = Cycle.new() }
   end
@@ -274,11 +306,11 @@ class TextHelperTest < Test::Unit::TestCase
     assert_equal("2", cycle("one", 2, "3"))
     assert_equal("3", cycle("one", 2, "3"))
   end
-  
+
   def test_cycle_with_no_arguments
     assert_raise(ArgumentError) { value = cycle() }
   end
-  
+
   def test_cycle_resets_with_new_values
     assert_equal("even", cycle("even", "odd"))
     assert_equal("odd", cycle("even", "odd"))
@@ -288,7 +320,7 @@ class TextHelperTest < Test::Unit::TestCase
     assert_equal("3", cycle(1, 2, 3))
     assert_equal("1", cycle(1, 2, 3))
   end
-  
+
   def test_named_cycles
     assert_equal("1", cycle(1, 2, 3, :name => "numbers"))
     assert_equal("red", cycle("red", "blue", :name => "colors"))
@@ -297,24 +329,24 @@ class TextHelperTest < Test::Unit::TestCase
     assert_equal("3", cycle(1, 2, 3, :name => "numbers"))
     assert_equal("red", cycle("red", "blue", :name => "colors"))
   end
-  
+
   def test_default_named_cycle
     assert_equal("1", cycle(1, 2, 3))
     assert_equal("2", cycle(1, 2, 3, :name => "default"))
     assert_equal("3", cycle(1, 2, 3))
   end
-  
+
   def test_reset_cycle
     assert_equal("1", cycle(1, 2, 3))
     assert_equal("2", cycle(1, 2, 3))
     reset_cycle
     assert_equal("1", cycle(1, 2, 3))
   end
-  
+
   def test_reset_unknown_cycle
     reset_cycle("colors")
   end
-  
+
   def test_recet_named_cycle
     assert_equal("1", cycle(1, 2, 3, :name => "numbers"))
     assert_equal("red", cycle("red", "blue", :name => "colors"))
@@ -324,7 +356,7 @@ class TextHelperTest < Test::Unit::TestCase
     assert_equal("2", cycle(1, 2, 3, :name => "numbers"))
     assert_equal("red", cycle("red", "blue", :name => "colors"))
   end
-  
+
   def test_cycle_no_instance_variable_clashes
     @cycles = %w{Specialized Fuji Giant}
     assert_equal("red", cycle("red", "blue"))

data/vendor/rails/actionpack/test/template/url_helper_test.rb

@@ -1,11 +1,9 @@
-require "#{File.dirname(__FILE__)}/../abstract_unit"
+require 'abstract_unit'
 
 RequestMock = Struct.new("Request", :request_uri, :protocol, :host_with_port, :env)
 
-class UrlHelperTest < Test::Unit::TestCase
-  include ActionView::Helpers::AssetTagHelper
-  include ActionView::Helpers::UrlHelper
-  include ActionView::Helpers::TagHelper
+class UrlHelperTest < ActionView::TestCase
+  tests ActionView::Helpers::UrlHelper
 
   def setup
     @controller = Class.new do
@@ -286,6 +284,7 @@ class UrlHelperTest < Test::Unit::TestCase
     assert_dom_equal "<a href=\"&#109;&#97;&#105;&#108;&#116;&#111;&#58;%6d%65@%64%6f%6d%61%69%6e.%63%6f%6d\">My email</a>", mail_to("me@domain.com", "My email", :encode => "hex", :replace_at => "(at)")
     assert_dom_equal "<a href=\"&#109;&#97;&#105;&#108;&#116;&#111;&#58;%6d%65@%64%6f%6d%61%69%6e.%63%6f%6d\">&#109;&#101;&#40;&#97;&#116;&#41;&#100;&#111;&#109;&#97;&#105;&#110;&#40;&#100;&#111;&#116;&#41;&#99;&#111;&#109;</a>", mail_to("me@domain.com", nil, :encode => "hex", :replace_at => "(at)", :replace_dot => "(dot)")
     assert_dom_equal "<script type=\"text/javascript\">eval(unescape('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%22%6d%61%69%6c%74%6f%3a%6d%65%40%64%6f%6d%61%69%6e%2e%63%6f%6d%22%3e%4d%79%20%65%6d%61%69%6c%3c%2f%61%3e%27%29%3b'))</script>", mail_to("me@domain.com", "My email", :encode => "javascript", :replace_at => "(at)", :replace_dot => "(dot)")
+    assert_dom_equal "<script type=\"text/javascript\">eval(unescape('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%22%6d%61%69%6c%74%6f%3a%6d%65%40%64%6f%6d%61%69%6e%2e%63%6f%6d%22%3e%6d%65%28%61%74%29%64%6f%6d%61%69%6e%28%64%6f%74%29%63%6f%6d%3c%2f%61%3e%27%29%3b'))</script>", mail_to("me@domain.com", nil, :encode => "javascript", :replace_at => "(at)", :replace_dot => "(dot)")
   end
   
   def protect_against_forgery?
@@ -293,7 +292,7 @@ class UrlHelperTest < Test::Unit::TestCase
   end
 end
 
-class UrlHelperWithControllerTest < Test::Unit::TestCase
+class UrlHelperWithControllerTest < ActionView::TestCase
   class UrlHelperController < ActionController::Base
     self.view_paths = [ "#{File.dirname(__FILE__)}/../fixtures/" ]
 
@@ -307,10 +306,14 @@ class UrlHelperWithControllerTest < Test::Unit::TestCase
       render :inline => "<%= show_named_route_#{params[:kind]} %>"
     end
 
+    def nil_url_for
+      render :inline => '<%= url_for(nil) %>'
+    end
+
     def rescue_action(e) raise e end
   end
 
-  include ActionView::Helpers::UrlHelper
+  tests ActionView::Helpers::UrlHelper
 
   def setup
     @request    = ActionController::TestRequest.new
@@ -323,7 +326,7 @@ class UrlHelperWithControllerTest < Test::Unit::TestCase
     assert_equal '/url_helper_with_controller/show_url_for', @response.body
   end
 
-  def test_named_route_shows_host_and_path
+  def test_named_route_url_shows_host_and_path
     with_url_helper_routing do
       get :show_named_route, :kind => 'url'
       assert_equal 'http://test.host/url_helper_with_controller/show_named_route', @response.body
@@ -337,6 +340,11 @@ class UrlHelperWithControllerTest < Test::Unit::TestCase
     end
   end
 
+  def test_url_for_nil_returns_current_path
+    get :nil_url_for
+    assert_equal '/url_helper_with_controller/nil_url_for', @response.body
+  end
+
   protected
     def with_url_helper_routing
       with_routing do |set|
@@ -348,7 +356,7 @@ class UrlHelperWithControllerTest < Test::Unit::TestCase
     end
 end
 
-class LinkToUnlessCurrentWithControllerTest < Test::Unit::TestCase
+class LinkToUnlessCurrentWithControllerTest < ActionView::TestCase
   class TasksController < ActionController::Base
     self.view_paths = ["#{File.dirname(__FILE__)}/../fixtures/"]
 
@@ -372,7 +380,7 @@ class LinkToUnlessCurrentWithControllerTest < Test::Unit::TestCase
       end
   end
 
-  include ActionView::Helpers::UrlHelper
+  tests ActionView::Helpers::UrlHelper
 
   def setup
     @request    = ActionController::TestRequest.new
@@ -440,7 +448,7 @@ class Session
   end
 end
 
-class PolymorphicControllerTest < Test::Unit::TestCase
+class PolymorphicControllerTest < ActionView::TestCase
   class WorkshopsController < ActionController::Base
     self.view_paths = ["#{File.dirname(__FILE__)}/../fixtures/"]
 
@@ -479,7 +487,7 @@ class PolymorphicControllerTest < Test::Unit::TestCase
     def rescue_action(e) raise e end
   end
 
-  include ActionView::Helpers::UrlHelper
+  tests ActionView::Helpers::UrlHelper
 
   def setup
     @request    = ActionController::TestRequest.new