diff options
author | Emilio Tagua <miloops@gmail.com> | 2009-07-21 11:27:23 -0300 |
---|---|---|
committer | Emilio Tagua <miloops@gmail.com> | 2009-07-21 11:27:23 -0300 |
commit | f32c3709830eb8d9f68a59c94f6791621c2b52ac (patch) | |
tree | b34cf0b9321dfd40b795cc761b158be4cbde48f6 /actionpack/test | |
parent | 9a28bd787660b08aae36155066e61d3608d0b4dd (diff) | |
parent | 9d7aae710384fb5f04129c35b86c5ea5fb9d83a9 (diff) | |
download | rails-f32c3709830eb8d9f68a59c94f6791621c2b52ac.tar.gz rails-f32c3709830eb8d9f68a59c94f6791621c2b52ac.tar.bz2 rails-f32c3709830eb8d9f68a59c94f6791621c2b52ac.zip |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/activerecord/render_partial_with_record_identification_test.rb | 3 | ||||
-rw-r--r-- | actionpack/test/controller/record_identifier_test.rb | 3 | ||||
-rw-r--r-- | actionpack/test/controller/redirect_test.rb | 3 | ||||
-rw-r--r-- | actionpack/test/javascript/ajax_test.rb | 115 | ||||
-rw-r--r-- | actionpack/test/lib/controller/fake_models.rb | 6 | ||||
-rw-r--r-- | actionpack/test/template/active_record_helper_test.rb | 9 | ||||
-rw-r--r-- | actionpack/test/template/atom_feed_helper_test.rb | 3 | ||||
-rw-r--r-- | actionpack/test/template/form_helper_test.rb | 15 | ||||
-rw-r--r-- | actionpack/test/template/prototype_helper_test.rb | 12 | ||||
-rw-r--r-- | actionpack/test/template/record_tag_helper_test.rb | 3 | ||||
-rw-r--r-- | actionpack/test/template/test_test.rb | 2 | ||||
-rw-r--r-- | actionpack/test/template/url_helper_test.rb | 6 |
12 files changed, 158 insertions, 22 deletions
diff --git a/actionpack/test/activerecord/render_partial_with_record_identification_test.rb b/actionpack/test/activerecord/render_partial_with_record_identification_test.rb index 0122bc7d8f..df50c3dc6f 100644 --- a/actionpack/test/activerecord/render_partial_with_record_identification_test.rb +++ b/actionpack/test/activerecord/render_partial_with_record_identification_test.rb @@ -126,7 +126,8 @@ class RenderPartialWithRecordIdentificationController < ActionController::Base end class Game < Struct.new(:name, :id) - extend ActiveModel::APICompliant + extend ActiveModel::Naming + include ActiveModel::Conversion def to_param id.to_s end diff --git a/actionpack/test/controller/record_identifier_test.rb b/actionpack/test/controller/record_identifier_test.rb index 10f51639cf..44e49ed3f8 100644 --- a/actionpack/test/controller/record_identifier_test.rb +++ b/actionpack/test/controller/record_identifier_test.rb @@ -1,7 +1,8 @@ require 'abstract_unit' class Comment - extend ActiveModel::APICompliant + extend ActiveModel::Naming + include ActiveModel::Conversion attr_reader :id def save; @id = 1 end diff --git a/actionpack/test/controller/redirect_test.rb b/actionpack/test/controller/redirect_test.rb index a71c39e504..b3321303c0 100644 --- a/actionpack/test/controller/redirect_test.rb +++ b/actionpack/test/controller/redirect_test.rb @@ -4,7 +4,8 @@ class WorkshopsController < ActionController::Base end class Workshop - extend ActiveModel::APICompliant + extend ActiveModel::Naming + include ActiveModel::Conversion attr_accessor :id, :new_record def initialize(id, new_record) diff --git a/actionpack/test/javascript/ajax_test.rb b/actionpack/test/javascript/ajax_test.rb new file mode 100644 index 0000000000..b67a91dad3 --- /dev/null +++ b/actionpack/test/javascript/ajax_test.rb @@ -0,0 +1,115 @@ +require "abstract_unit" + +class AjaxTestCase < ActiveSupport::TestCase + include ActionView::Helpers::AjaxHelper + include ActionView::Helpers::TagHelper + + def assert_html(html, matches) + matches.each do |match| + assert_match Regexp.new(Regexp.escape(match)), html + end + end + + def self.assert_callbacks_work(&blk) + define_method(:assert_callbacks_work, &blk) + + [:complete, :failure, :success, :interactive, :loaded, :loading, 404].each do |callback| + test "#{callback} callback" do + markup = assert_callbacks_work(callback) + assert_html markup, %W(data-#{callback}-code="undoRequestCompleted\(request\)") + end + end + end +end + +class LinkToRemoteTest < AjaxTestCase + def url_for(hash) + "/blog/destroy/4" + end + + def link(options = {}) + link_to_remote("Delete this post", "/blog/destroy/3", options) + end + + test "with no update" do + assert_html link, %w(href="/blog/destroy/3" Delete\ this\ post data-remote="true") + end + + test "basic" do + assert_html link(:update => "#posts"), + %w(data-update-success="#posts") + end + + test "using a url hash" do + link = link_to_remote("Delete this post", {:controller => :blog}, :update => "#posts") + assert_html link, %w(href="/blog/destroy/4" data-update-success="#posts") + end + + test "with :html options" do + expected = %{<a href="/blog/destroy/3" data-custom="me" data-update-success="#posts">Delete this post</a>} + assert_equal expected, link(:update => "#posts", :html => {"data-custom" => "me"}) + end + + test "with a hash for :update" do + link = link(:update => {:success => "#posts", :failure => "#error"}) + assert_match /data-update-success="#posts"/, link + assert_match /data-update-failure="#error"/, link + end + + test "with positional parameters" do + link = link(:position => :top, :update => "#posts") + assert_match /data\-update\-position="top"/, link + end + + test "with an optional method" do + link = link(:method => "delete") + assert_match /data-method="delete"/, link + end + + class LegacyLinkToRemoteTest < AjaxTestCase + include ActionView::Helpers::AjaxHelper::Rails2Compatibility + + def link(options) + link_to_remote("Delete this post", "/blog/destroy/3", options) + end + + test "basic link_to_remote with :url =>" do + expected = %{<a href="/blog/destroy/3" data-update-success="#posts">Delete this post</a>} + assert_equal expected, + link_to_remote("Delete this post", :url => "/blog/destroy/3", :update => "#posts") + end + + assert_callbacks_work do |callback| + link(callback => "undoRequestCompleted(request)") + end + end +end + +class ButtonToRemoteTest < AjaxTestCase + def button(options, html = {}) + button_to_remote("Remote outpost", options, html) + end + + def url_for(*) + "/whatnot" + end + + class StandardTest < ButtonToRemoteTest + test "basic" do + button = button({:url => {:action => "whatnot"}}, {:class => "fine"}) + [/input/, /class="fine"/, /type="button"/, /value="Remote outpost"/, + /data-url="\/whatnot"/].each do |match| + assert_match match, button + end + end + end + + class LegacyButtonToRemoteTest < ButtonToRemoteTest + include ActionView::Helpers::AjaxHelper::Rails2Compatibility + + assert_callbacks_work do |callback| + button(callback => "undoRequestCompleted(request)") + end + end + +end
\ No newline at end of file diff --git a/actionpack/test/lib/controller/fake_models.rb b/actionpack/test/lib/controller/fake_models.rb index 07f01e1c47..c6726432ec 100644 --- a/actionpack/test/lib/controller/fake_models.rb +++ b/actionpack/test/lib/controller/fake_models.rb @@ -1,7 +1,8 @@ require "active_model" class Customer < Struct.new(:name, :id) - extend ActiveModel::APICompliant + extend ActiveModel::Naming + include ActiveModel::Conversion def to_param id.to_s @@ -16,7 +17,8 @@ end module Quiz class Question < Struct.new(:name, :id) - extend ActiveModel::APICompliant + extend ActiveModel::Naming + include ActiveModel::Conversion def to_param id.to_s diff --git a/actionpack/test/template/active_record_helper_test.rb b/actionpack/test/template/active_record_helper_test.rb index c1bbdae8fb..b07ce6cf5d 100644 --- a/actionpack/test/template/active_record_helper_test.rb +++ b/actionpack/test/template/active_record_helper_test.rb @@ -5,15 +5,18 @@ class ActiveRecordHelperTest < ActionView::TestCase silence_warnings do class Post < Struct.new(:title, :author_name, :body, :secret, :written_on) - extend ActiveModel::APICompliant + extend ActiveModel::Naming + include ActiveModel::Conversion end class User < Struct.new(:email) - extend ActiveModel::APICompliant + extend ActiveModel::Naming + include ActiveModel::Conversion end class Column < Struct.new(:type, :name, :human_name) - extend ActiveModel::APICompliant + extend ActiveModel::Naming + include ActiveModel::Conversion end end diff --git a/actionpack/test/template/atom_feed_helper_test.rb b/actionpack/test/template/atom_feed_helper_test.rb index 89ff01ab0e..3acaecd142 100644 --- a/actionpack/test/template/atom_feed_helper_test.rb +++ b/actionpack/test/template/atom_feed_helper_test.rb @@ -1,7 +1,8 @@ require 'abstract_unit' class Scroll < Struct.new(:id, :to_param, :title, :body, :updated_at, :created_at) - extend ActiveModel::APICompliant + extend ActiveModel::Naming + include ActiveModel::Conversion def new_record? true diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb index 883afd985b..99160dd8b1 100644 --- a/actionpack/test/template/form_helper_test.rb +++ b/actionpack/test/template/form_helper_test.rb @@ -2,7 +2,8 @@ require 'abstract_unit' silence_warnings do class Post < Struct.new(:title, :author_name, :body, :secret, :written_on, :cost) - extend ActiveModel::APICompliant + extend ActiveModel::Naming + include ActiveModel::Conversion alias_method :secret?, :secret @@ -25,7 +26,8 @@ silence_warnings do end class Comment - extend ActiveModel::APICompliant + extend ActiveModel::Naming + include ActiveModel::Conversion attr_reader :id attr_reader :post_id @@ -43,7 +45,8 @@ silence_warnings do end class Tag - extend ActiveModel::APICompliant + extend ActiveModel::Naming + include ActiveModel::Conversion attr_reader :id attr_reader :post_id @@ -61,7 +64,8 @@ silence_warnings do end class CommentRelevance - extend ActiveModel::APICompliant + extend ActiveModel::Naming + include ActiveModel::Conversion attr_reader :id attr_reader :comment_id @@ -75,7 +79,8 @@ silence_warnings do end class TagRelevance - extend ActiveModel::APICompliant + extend ActiveModel::Naming + include ActiveModel::Conversion attr_reader :id attr_reader :tag_id diff --git a/actionpack/test/template/prototype_helper_test.rb b/actionpack/test/template/prototype_helper_test.rb index 301a110076..acbf311212 100644 --- a/actionpack/test/template/prototype_helper_test.rb +++ b/actionpack/test/template/prototype_helper_test.rb @@ -1,11 +1,14 @@ require 'abstract_unit' require 'active_model' -Bunny = Struct.new(:Bunny, :id) -Bunny.extend ActiveModel::APICompliant +class Bunny < Struct.new(:Bunny, :id) + extend ActiveModel::Naming + include ActiveModel::Conversion +end class Author - extend ActiveModel::APICompliant + extend ActiveModel::Naming + include ActiveModel::Conversion attr_reader :id def save; @id = 1 end @@ -16,7 +19,8 @@ class Author end class Article - extend ActiveModel::APICompliant + extend ActiveModel::Naming + include ActiveModel::Conversion attr_reader :id attr_reader :author_id def save; @id = 1; @author_id = 1 end diff --git a/actionpack/test/template/record_tag_helper_test.rb b/actionpack/test/template/record_tag_helper_test.rb index bae26f555d..4144fea678 100644 --- a/actionpack/test/template/record_tag_helper_test.rb +++ b/actionpack/test/template/record_tag_helper_test.rb @@ -1,7 +1,8 @@ require 'abstract_unit' class Post - extend ActiveModel::APICompliant + extend ActiveModel::Naming + include ActiveModel::Conversion def id 45 end diff --git a/actionpack/test/template/test_test.rb b/actionpack/test/template/test_test.rb index 98307fbae4..f32d0b3d42 100644 --- a/actionpack/test/template/test_test.rb +++ b/actionpack/test/template/test_test.rb @@ -41,7 +41,7 @@ class PeopleHelperTest < ActionView::TestCase def test_link_to_person person = mock(:name => "David") - person.class.extend ActiveModel::APICompliant + person.class.extend ActiveModel::Naming expects(:mocha_mock_path).with(person).returns("/people/1") assert_equal '<a href="/people/1">David</a>', link_to_person(person) end diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb index 4569689534..9eeb26831c 100644 --- a/actionpack/test/template/url_helper_test.rb +++ b/actionpack/test/template/url_helper_test.rb @@ -494,7 +494,8 @@ class LinkToUnlessCurrentWithControllerTest < ActionView::TestCase end class Workshop - extend ActiveModel::APICompliant + extend ActiveModel::Naming + include ActiveModel::Conversion attr_accessor :id, :new_record def initialize(id, new_record) @@ -511,7 +512,8 @@ class Workshop end class Session - extend ActiveModel::APICompliant + extend ActiveModel::Naming + include ActiveModel::Conversion attr_accessor :id, :workshop_id, :new_record def initialize(id, new_record) |