Download as
Browse Code »

Commit 56703bf0dc8d09997abaf452e98ebafe11810e49

Authored by Leandro Santos
1 parent 06ad5d30
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Fix LinkListBlock unit test

Showing 2 changed files with 5 additions and 3 deletions   Show diff stats
app/models/link_list_block.rb
  Diff comments   View file @56703bf
1 class LinkListBlock < Block 1 class LinkListBlock < Block
2 2
3 - attr_accessible :links 3 + attr_accessible :links, :display
4 4
5 ICONS = [ 5 ICONS = [
6 ['no-icon', _('(No icon)')], 6 ['no-icon', _('(No icon)')],
@@ -52,7 +52,7 @@ class LinkListBlock &lt; Block @@ -52,7 +52,7 @@ class LinkListBlock &lt; Block
52 def content(args={}) 52 def content(args={})
53 block_title(title) + 53 block_title(title) +
54 content_tag('ul', 54 content_tag('ul',
55 - links.select{|i| !i[:name].blank? and !i[:address].blank?}.map{|i| content_tag('li', link_html(i))} 55 + links.select{|i| !i[:name].blank? and !i[:address].blank?}.map{|i| content_tag('li', link_html(i))}.join(',')
56 ) 56 )
57 end 57 end
58 58
test/unit/link_list_block_test.rb
  Diff comments   View file @56703bf
@@ -77,7 +77,9 @@ class LinkListBlockTest &lt; ActiveSupport::TestCase @@ -77,7 +77,9 @@ class LinkListBlockTest &lt; ActiveSupport::TestCase
77 should 'be able to update display setting' do 77 should 'be able to update display setting' do
78 user = create_user('testinguser').person 78 user = create_user('testinguser').person
79 box = fast_create(Box, :owner_id => user.id) 79 box = fast_create(Box, :owner_id => user.id)
80 - block = LinkListBlock.create!(:display => 'never', :box => box) 80 + block = LinkListBlock.new(:display => 'never').tap do |b|
  81 + b.box = box
  82 + end
81 assert block.update_attributes!(:display => 'always') 83 assert block.update_attributes!(:display => 'always')
82 block.reload 84 block.reload
83 assert_equal 'always', block.display 85 assert_equal 'always', block.display