diff --git a/app/models/my_network_block.rb b/app/models/my_network_block.rb index 3a6c868..01e0227 100644 --- a/app/models/my_network_block.rb +++ b/app/models/my_network_block.rb @@ -14,10 +14,10 @@ class MyNetworkBlock < Block block_title(title) + content_tag( 'ul', - content_tag('li', link_to(n_( 'One article published', '%d articles published', owner.articles.count) % owner.articles.count, owner.public_profile_url.merge(:action => 'sitemap') )) + - content_tag('li', link_to(n__('One friend', '%d friends', owner.friends.count) % owner.friends.count, owner.public_profile_url.merge(:action => 'friends'))) + - content_tag('li', link_to(n__('One community', '%d communities', owner.communities.count) % owner.communities.count, owner.public_profile_url.merge(:action => 'communities'))) + - content_tag('li', link_to(n_('One tag', '%d tags', owner.tags.count) % owner.tags.count, owner.public_profile_url.merge(:action => 'tags'))) + content_tag('li', link_to(n_( 'One article published', '%d articles published', owner.articles.size) % owner.articles.size, owner.public_profile_url.merge(:action => 'sitemap') )) + + content_tag('li', link_to(n__('One friend', '%d friends', owner.friends.size) % owner.friends.size, owner.public_profile_url.merge(:action => 'friends'))) + + content_tag('li', link_to(n__('One community', '%d communities', owner.communities.size) % owner.communities.size, owner.public_profile_url.merge(:action => 'communities'))) + + content_tag('li', link_to(n_('One tag', '%d tags', owner.tags.size) % owner.tags.size, owner.public_profile_url.merge(:action => 'tags'))) ) end diff --git a/test/unit/my_network_block_test.rb b/test/unit/my_network_block_test.rb index 3dea326..0c4d16f 100644 --- a/test/unit/my_network_block_test.rb +++ b/test/unit/my_network_block_test.rb @@ -23,7 +23,7 @@ class MyNetworkBlockTest < ActiveSupport::TestCase mock_articles = mock owner.stubs(:articles).returns(mock_articles) owner.stubs(:tags).returns({}) # don't let tags call articles - mock_articles.stubs(:count).returns(5) + mock_articles.stubs(:size).returns(5) assert_tag_in_string block.content, :tag => 'li', :descendant => { :tag => 'a', :content => '5 articles published', :attributes => { :href => /\/profile\/testuser\/sitemap$/ } } end @@ -31,7 +31,7 @@ class MyNetworkBlockTest < ActiveSupport::TestCase should 'count friends' do mock_friends = mock owner.stubs(:friends).returns(mock_friends) - mock_friends.stubs(:count).returns(8) + mock_friends.stubs(:size).returns(8) assert_tag_in_string block.content, :tag => 'li', :descendant => { :tag => 'a', :content => '8 friends', :attributes => { :href => /\profile\/testuser\/friends/ }} end @@ -39,7 +39,7 @@ class MyNetworkBlockTest < ActiveSupport::TestCase should 'count communities' do mock_communities = mock owner.stubs(:communities).returns(mock_communities) - mock_communities.stubs(:count).returns(23) + mock_communities.stubs(:size).returns(23) assert_tag_in_string block.content, :tag => 'li', :descendant => { :tag => 'a', :content => '23 communities', :attributes => { :href => /\profile\/testuser\/communities/ }} end @@ -47,7 +47,7 @@ class MyNetworkBlockTest < ActiveSupport::TestCase should 'count tags' do mock_tags = mock owner.stubs(:tags).returns(mock_tags) - mock_tags.stubs(:count).returns(436) + mock_tags.stubs(:size).returns(436) assert_tag_in_string block.content, :tag => 'li', :descendant => { :tag => 'a', :content => '436 tags', :attributes => { :href => /\profile\/testuser\/tags/ }} end diff --git a/test/unit/profile_test.rb b/test/unit/profile_test.rb index b839ae9..ce40629 100644 --- a/test/unit/profile_test.rb +++ b/test/unit/profile_test.rb @@ -318,7 +318,7 @@ class ProfileTest < Test::Unit::TestCase end should 'provide tag count' do - assert_equal 0, Profile.new.tags.count + assert_equal 0, Profile.new.tags.size end should 'have administator role' do -- libgit2 0.21.2