Download as
Browse Code »

Commit 2716f355dd584bb25ea9c5029665ef5a44cfc2c7

Authored by Antonio Terceiro
1 parent c995df4c
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

The actual HTML generated by Rails 2.3.5 changed 

Fixing tests to first parse the HTML and then test the contents, instead
of rellying in the exact markup
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
test/unit/cms_helper_test.rb
  Diff comments   View file @2716f35
@@ -16,8 +16,8 @@ class CmsHelperTest < ActiveSupport::TestCase @@ -16,8 +16,8 @@ class CmsHelperTest < ActiveSupport::TestCase
16 should 'show custom options for blog' do 16 should 'show custom options for blog' do
17 CmsHelperTest.any_instance.stubs(:controller).returns(ActionController::Base.new) 17 CmsHelperTest.any_instance.stubs(:controller).returns(ActionController::Base.new)
18 result = options_for_article(Blog.new) 18 result = options_for_article(Blog.new)
19 - assert_match /id="article\[published\]" name="article\[published\]" type="hidden" value="1"/, result  
20 - assert_match /id="article\[accept_comments\]" name="article\[accept_comments\]" type="hidden" value="0"/, result 19 + assert_tag_in_string result, :tag => 'input', :attributes => { :name => 'article[published]' , :type => "hidden", :value => "1" }
  20 + assert_tag_in_string result, :tag => 'input', :attributes => { :name => "article[accept_comments]", :type => "hidden", :value => "0" }
21 end 21 end
22 22
23 should 'display link to folder content if article is folder' do 23 should 'display link to folder content if article is folder' do
test/unit/link_list_block_test.rb
  Diff comments   View file @2716f35
@@ -64,7 +64,7 @@ class LinkListBlockTest < ActiveSupport::TestCase @@ -64,7 +64,7 @@ class LinkListBlockTest < ActiveSupport::TestCase
64 64
65 should 'not add link to onclick' do 65 should 'not add link to onclick' do
66 l = LinkListBlock.new(:links => [{:name => 'link', :address => "#\" onclick=\"alert(123456)"}]) 66 l = LinkListBlock.new(:links => [{:name => 'link', :address => "#\" onclick=\"alert(123456)"}])
67 - assert_no_match /onclick/, l.link_html(l.links.first) 67 + assert_no_tag_in_string l.link_html(l.links.first), :attributes => { :onclick => /.*/ }
68 end 68 end
69 69
70 should 'add http in front of incomplete external links' do 70 should 'add http in front of incomplete external links' do