Merge branch 'fix_people_block' into 'master'

Fix people block tests See merge request !375

Merge branch 'fix_people_block' into 'master'
Fix people block tests See merge request !375
Antonio Terceiro
2 parents 85542f3a bef9c7c4
Showing 4 changed files with 24 additions and 25 deletions Show diff stats
app/helpers/sweeper_helper.rb
plugins/people_block/test/unit/friends_block_test.rb
plugins/people_block/test/unit/members_block_test.rb
plugins/people_block/test/unit/people_block_test.rb
@@ -56,12 +56,12 @@ module SweeperHelper
     if profile
       profile.blocks.each {|block|
         conditions = block.class.expire_on
-        blocks_to_expire << block unless (conditions[:profile] & causes).empty?
+        blocks_to_expire << block unless (conditions[:profile] & causes).blank?
       }
     end
     environment.blocks.each {|block|
       conditions = block.class.expire_on
-      blocks_to_expire << block unless (conditions[:environment] & causes).empty?
+      blocks_to_expire << block unless (conditions[:environment] & causes).blank?
     }
     blocks_to_expire.uniq!
 require File.dirname(__FILE__) + '/../test_helper'
-class FriendsBlockTest < ActiveSupport::TestCase
+class FriendsBlockTest < ActionView::TestCase
   should 'inherit from Block' do
     assert_kind_of Block, FriendsBlock.new
@@ -8,6 +8,7 @@ class FriendsBlockTest &lt; ActiveSupport::TestCase
   should 'declare its default title' do
+    FriendsBlock.any_instance.expects(:profile_count).returns(0)
     assert_not_equal Block.new.default_title, FriendsBlock.new.default_title
   end
@@ -60,7 +61,7 @@ class FriendsBlockTest &lt; ActiveSupport::TestCase
   should 'prioritize profiles with image by default' do
-    assert FriendsBlock.new.prioritize_people_with_image
+    assert FriendsBlock.new.prioritize_profiles_with_image
   end
@@ -98,10 +99,10 @@ class FriendsBlockTest &lt; ActiveSupport::TestCase
     block = FriendsBlock.new
     block.expects(:owner).returns(person1).at_least_once
-    expects(:_).with('View all').returns('View all')
-    expects(:link_to).with('View all', :profile => 'mytestperson', :controller => 'profile', :action => 'friends').returns('link-to-friends')
-
-    assert_equal 'link-to-friends', instance_eval(&block.footer)
+    instance_eval(&block.footer)
+    assert_select 'a.view-all' do |elements|
+      assert_select '[href=/profile/mytestperson/friends]'
+    end
   end
 require File.dirname(__FILE__) + '/../test_helper'
-class MembersBlockTest < ActiveSupport::TestCase
+class MembersBlockTest < ActionView::TestCase
   should 'inherit from Block' do
     assert_kind_of Block, MembersBlock.new
@@ -60,7 +60,7 @@ class MembersBlockTest &lt; ActiveSupport::TestCase
   should 'prioritize profiles with image by default' do
-    assert MembersBlock.new.prioritize_people_with_image
+    assert MembersBlock.new.prioritize_profiles_with_image
   end
@@ -145,10 +145,10 @@ class MembersBlockTest &lt; ActiveSupport::TestCase
     block.box = profile.boxes.first
     block.save!
-    expects(:_).with('View all').returns('View all')
-    expects(:link_to).with('View all' , :profile => 'mytestuser', :controller => 'people_block_plugin_profile', :action => 'members', :role_key => block.visible_role).returns('link-to-members')
-
-    assert_equal 'link-to-members', instance_eval(&block.footer)
+    instance_eval(&block.footer)
+    assert_select 'a.view-all' do |elements|
+      assert_select '[href=/profile/mytestuser/plugin/people_block/members]'
+    end
   end
   should 'provide link to members page with a selected role' do
@@ -158,10 +158,10 @@ class MembersBlockTest &lt; ActiveSupport::TestCase
     block.visible_role = 'profile_member'
     block.save!
-    expects(:_).with('View all').returns('View all')
-    expects(:link_to).with('View all' , :profile => 'mytestuser', :controller => 'people_block_plugin_profile', :action => 'members', :role_key => block.visible_role).returns('link-to-members')
-
-    assert_equal 'link-to-members', instance_eval(&block.footer)
+    instance_eval(&block.footer)
+    assert_select 'a.view-all' do |elements|
+      assert_select '[href=/profile/mytestuser/plugin/people_block/members?role_key=profile_member]'
+    end
   end
   should 'provide a role to be displayed (and default to nil)' do
 require File.dirname(__FILE__) + '/../test_helper'
-class PeopleBlockTest < ActiveSupport::TestCase
+class PeopleBlockTest < ActionView::TestCase
   should 'inherit from Block' do
     assert_kind_of Block, PeopleBlock.new
@@ -106,14 +106,12 @@ class PeopleBlockTest &lt; ActiveSupport::TestCase
   should 'link to "all people"' do
     env = fast_create(Environment)
-
     block = PeopleBlock.new
-    stubs(:_).with('View all').returns('View all')
-    stubs(:link_to).returns('link-to-people')
-    stubs(:url_for).returns('  ')
-
-    assert_equal 'link-to-people', instance_exec(&block.footer)
+    instance_eval(&block.footer)
+    assert_select 'a.view-all' do |elements|
+      assert_select '[href=/search/people]'
+    end
   end
	@@ -56,12 +56,12 @@ module SweeperHelper		@@ -56,12 +56,12 @@ module SweeperHelper
56	if profile	56	if profile
57	profile.blocks.each {\|block\|	57	profile.blocks.each {\|block\|
58	conditions = block.class.expire_on	58	conditions = block.class.expire_on
59	- blocks_to_expire << block unless (conditions[:profile] & causes).empty?	59	+ blocks_to_expire << block unless (conditions[:profile] & causes).blank?
60	}	60	}
61	end	61	end
62	environment.blocks.each {\|block\|	62	environment.blocks.each {\|block\|
63	conditions = block.class.expire_on	63	conditions = block.class.expire_on
64	- blocks_to_expire << block unless (conditions[:environment] & causes).empty?	64	+ blocks_to_expire << block unless (conditions[:environment] & causes).blank?
65	}	65	}
66		66
67	blocks_to_expire.uniq!	67	blocks_to_expire.uniq!