Merge branch 'master' into rails3

Victor Costa
2 parents 63fa33ce 32f88e65
Showing 14 changed files with 93 additions and 34 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/friends_controller.rb
app/models/friendship.rb
app/models/slideshow_block.rb
app/views/cms/view.html.erb
lib/tasks/plugins_tests.rake
test/functional/cms_controller_test.rb
test/functional/friends_controller_test.rb
test/integration/manage_friendships_test.rb
test/test_helper.rb
test/unit/application_helper_test.rb
test/unit/friendship_test.rb
test/unit/google_maps_test.rb
test/unit/mail_conf_test.rb
@@ -248,12 +248,15 @@ class CmsController &lt; MyProfileController
     end.compact unless params[:marked_groups].nil?
     if request.post?
       @failed = {}
+      if @marked_groups.empty?
+        return session[:notice] = _("Select some group to publish your article")
+      end
       @marked_groups.each do |item|
         task = ApproveArticle.create!(:article => @article, :name => item[:name], :target => item[:group], :requestor => profile)
         begin
           task.finish unless item[:group].moderated_articles?
         rescue Exception => ex
-           @failed[ex.message] ? @failed[ex.message] << item[:group].name : @failed[ex.message] = [item[:group].name]
+          @failed[ex.message] ? @failed[ex.message] << item[:group].name : @failed[ex.message] = [item[:group].name]
         end
       end
       if @failed.blank?
@@ -11,7 +11,7 @@ class FriendsController &lt; MyProfileController
   def remove
     @friend = profile.friends.find(params[:id])
     if request.post? && params[:confirmation]
-      profile.remove_friend(@friend)
+      Friendship.remove_friendship(profile, @friend)
       redirect_to :action => 'index'
     end
   end
@@ -15,4 +15,9 @@ class Friendship &lt; ActiveRecord::Base
     Friendship.update_cache_counter(:friends_count, friendship.person, -1)
     Friendship.update_cache_counter(:friends_count, friendship.friend, -1)
   end
+
+  def self.remove_friendship(person1, person2)
+    person1.remove_friend(person2)
+    person2.remove_friend(person1)
+  end
 end
@@ -6,6 +6,8 @@ class SlideshowBlock &lt; Block
   settings_items :navigation, :type => 'boolean', :default => false
   settings_items :image_size, :type => 'string', :default => 'thumb'
+  attr_accessible :gallery_id, :image_size, :interval, :shuffle, :navigation
+
   def self.description
     _('Slideshow')
   end
@@ -25,7 +25,9 @@
   <div id='article-full-path'>
     <strong><%= _('Current folder: ') %></strong>
     <%= link_to profile.identifier, :action => 'index' %>
-    <%= @article.hierarchy.map {|item| " / " + ((item == @article) ? item.name : link_to(item.slug, :id => item.id)) } %>
+    <% @article.hierarchy.each do |item| %>
+      <%= " / " + ((item == @article) ? item.name.html_safe : link_to(item.slug, :id => item.id).html_safe) %>
+    <% end %>
   </div>
 <% end %>
 @all_plugins = Dir.glob('plugins/*').map { |f| File.basename(f) } - ['template']
+@all_plugins.sort!
 @all_tasks = [:units, :functionals, :integration, :cucumber, :selenium]
 def enabled_plugins
@@ -110,7 +111,7 @@ def run_cucumber(profile, files)
   sh 'xvfb-run', 'ruby', '-S', 'cucumber', '--profile', profile.to_s, '--format', ENV['CUCUMBER_FORMAT'] || 'progress' , *files
 end
-def custom_run(name, files, run=:individually)
+def custom_run(name, files, run=:all)
   case run
   when :all
     run_test name, files
@@ -122,7 +123,7 @@ def custom_run(name, files, run=:individually)
   end
 end
-def run_tests(name, plugins, run=:individually)
+def run_tests(name, plugins, run=:all)
   plugins = Array(plugins)
   glob =  "plugins/{#{plugins.join(',')}}/test/#{task2folder(name)}/**/*.#{task2ext(name)}"
   files = Dir.glob(glob)
@@ -169,7 +170,7 @@ def test_sequence(plugins, tasks)
   fail 'There are broken tests to be fixed!' if fail_flag
 end
-def plugin_test_task(plugin, task, run=:individually)
+def plugin_test_task(plugin, task, run=:all)
   desc "Run #{task} tests for #{plugin_name(plugin)}"
   task task do
     test_sequence(plugin, task)
@@ -1791,6 +1791,14 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_equal other_person, a.created_by
   end
+  should 'continue on the same page, when no group is selected' do
+    c = Community.create!(:name => 'test comm', :identifier => 'test_comm')
+    c.affiliate(profile, Profile::Roles.all_roles(c.environment.id))
+    article = profile.articles.create!(:name => 'something intresting', :body => 'ruby on rails')
+    post :publish, :profile => profile.identifier, :id => article.id, :marked_groups => {c.id.to_s => {}}
+    assert_template 'cms/publish'
+  end
+
   protected
   # FIXME this is to avoid adding an extra dependency for a proper JSON parser.
@@ -36,12 +36,12 @@ class FriendsControllerTest &lt; ActionController::TestCase
   should 'actually remove friend' do
     profile.add_friend(friend)
+    friend.add_friend(profile)
-    assert_difference 'Friendship.count', -1 do
+    assert_difference 'Friendship.count', -2 do
       post :remove, :id => friend.id, :confirmation => '1'
       assert_redirected_to :action => 'index'
     end
-    assert_equal friend, Profile.find(friend.id)
   end
   should 'display find people button' do
@@ -0,0 +1,37 @@
+require "#{File.dirname(__FILE__)}/../test_helper"
+
+class ManageFriendshipsTest < ActionController::IntegrationTest
+
+  def setup
+    FriendsController.any_instance.stubs(:get_layout).returns('application')
+    ProfileController.any_instance.stubs(:get_layout).returns('application')
+
+    Friendship.delete_all
+    Person.delete_all
+    @person = create_user("albert", :password => 'test',
+      :password_confirmation => 'test').person
+    @person.user.activate
+
+    @friend = fast_create(Person, :identifier => "isaac")
+
+    login(@person.identifier, 'test')
+  end
+
+  should 'remove friendships' do
+    @person.add_friend(@friend)
+    @friend.add_friend(@person)
+
+    get "/myprofile/#{@person.identifier}/friends/remove/#{@friend.id}"
+    assert_response :success
+
+    post "/myprofile/#{@person.identifier}/friends/remove/#{@friend.id}",
+      :confirmation => '1'
+    assert_response :redirect
+
+    follow_redirect!
+
+    assert assigns(:friends).empty?
+    assert !@person.is_a_friend?(@friend)
+    assert !@friend.is_a_friend?(@person)
+  end
+end
@@ -277,16 +277,4 @@ class ActionController::IntegrationTest
 end
-def with_constants(constants, &block)
-  old_constants = Hash.new
-  constants.each do |constant, val|
-    old_constants[constant] = Object.const_get(constant)
-    silence_stderr{ Object.const_set(constant, val) }
-  end
-  block.call
-  old_constants.each do |constant, val|
-    silence_stderr{ Object.const_set(constant, val) }
-  end
-end
-
 Profile
@@ -472,13 +472,13 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     profile = mock
     profile.stubs(:theme).returns('some-theme')
     stubs(:profile).returns(profile)
-    with_constants :NOOSFERO_CONF => {'gravatar' => 'crazyvatar'} do
-      assert_equal gravatar_default, 'crazyvatar'
-    end
+
+    NOOSFERO_CONF.stubs(:[]).with('gravatar').returns('crazyvatar')
+    assert_equal gravatar_default, 'crazyvatar'
+
     stubs(:theme_option).returns('gravatar' => 'nicevatar')
-    with_constants :NOOSFERO_CONF => {'gravatar' => 'crazyvatar'} do
-      assert_equal gravatar_default, 'nicevatar'
-    end
+    NOOSFERO_CONF.stubs(:[]).with('gravatar').returns('nicevatar')
+    assert_equal gravatar_default, 'nicevatar'
   end
   should 'use theme passed via param when in development mode' do
@@ -58,4 +58,18 @@ class FriendshipTest &lt; ActiveSupport::TestCase
     assert_equal ['a'], ta.get_friend_name
   end
+  should 'remove friendships when a friend removal occurs' do
+    p1 = create_user('testuser1').person
+    p2 = create_user('testuser2').person
+    p1.add_friend(p2, 'friends')
+    p2.add_friend(p1, 'friends')
+
+    assert_difference 'Friendship.count', -2 do
+      Friendship.remove_friendship(p1, p2)
+    end
+
+    assert_not_includes p1.friends(true), p2
+    assert_not_includes p2.friends(true), p1
+  end
+
 end
@@ -3,13 +3,12 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class GoogleMapsTest < ActiveSupport::TestCase
   should 'provide initial_zoom setting' do
-    with_constants :NOOSFERO_CONF => {'googlemaps_initial_zoom' => 2} do
-      assert_equal 2, GoogleMaps.initial_zoom
-    end
+    NOOSFERO_CONF.stubs(:[]).with('googlemaps_initial_zoom').returns(2)
+    assert_equal 2, GoogleMaps.initial_zoom
   end
   should 'use 4 as default initial_zoom' do
-    GoogleMaps.stubs(:config).returns({})
+    NOOSFERO_CONF.stubs(:[]).with('googlemaps_initial_zoom').returns(nil)
     assert_equal 4, GoogleMaps.initial_zoom
   end
@@ -3,22 +3,22 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class MailConfTest < ActiveSupport::TestCase
   should 'enable if told to' do
-    NOOSFERO_CONF['mail_enabled'] = true
+    NOOSFERO_CONF.stubs(:[]).with('mail_enabled').returns(true)
     assert_equal true, MailConf.enabled?
   end
   should 'disable if told to' do
-    NOOSFERO_CONF['mail_enabled'] = false
+    NOOSFERO_CONF.stubs(:[]).with('mail_enabled').returns(false)
     assert_equal false, MailConf.enabled?
   end
   should 'disable by default' do
-    NOOSFERO_CONF['mail_enabled'] = nil
+    NOOSFERO_CONF.stubs(:[]).with('mail_enabled').returns(nil)
     assert_equal false, MailConf.enabled?
   end
   should 'provide webmail url preference' do
-    NOOSFERO_CONF['webmail_url'] = 'http://some.url/webmail/%s/%s'
+    NOOSFERO_CONF.stubs(:[]).with('webmail_url').returns('http://some.url/webmail/%s/%s')
     assert_equal 'http://some.url/webmail/login/example.com', MailConf.webmail_url('login', 'example.com')
   end
	@@ -11,7 +11,7 @@ class FriendsController < MyProfileController		@@ -11,7 +11,7 @@ class FriendsController < MyProfileController
11	def remove	11	def remove
12	@friend = profile.friends.find(params[:id])	12	@friend = profile.friends.find(params[:id])
13	if request.post? && params[:confirmation]	13	if request.post? && params[:confirmation]
14	- profile.remove_friend(@friend)	14	+ Friendship.remove_friendship(profile, @friend)
15	redirect_to :action => 'index'	15	redirect_to :action => 'index'
16	end	16	end
17	end	17	end
	@@ -15,4 +15,9 @@ class Friendship < ActiveRecord::Base		@@ -15,4 +15,9 @@ class Friendship < ActiveRecord::Base
15	Friendship.update_cache_counter(:friends_count, friendship.person, -1)	15	Friendship.update_cache_counter(:friends_count, friendship.person, -1)
16	Friendship.update_cache_counter(:friends_count, friendship.friend, -1)	16	Friendship.update_cache_counter(:friends_count, friendship.friend, -1)
17	end	17	end
		18	+
		19	+ def self.remove_friendship(person1, person2)
		20	+ person1.remove_friend(person2)
		21	+ person2.remove_friend(person1)
		22	+ end
18	end	23	end
	@@ -1791,6 +1791,14 @@ class CmsControllerTest < ActionController::TestCase		@@ -1791,6 +1791,14 @@ class CmsControllerTest < ActionController::TestCase
1791	assert_equal other_person, a.created_by	1791	assert_equal other_person, a.created_by
1792	end	1792	end
1793		1793
		1794	+ should 'continue on the same page, when no group is selected' do
		1795	+ c = Community.create!(:name => 'test comm', :identifier => 'test_comm')
		1796	+ c.affiliate(profile, Profile::Roles.all_roles(c.environment.id))
		1797	+ article = profile.articles.create!(:name => 'something intresting', :body => 'ruby on rails')
		1798	+ post :publish, :profile => profile.identifier, :id => article.id, :marked_groups => {c.id.to_s => {}}
		1799	+ assert_template 'cms/publish'
		1800	+ end
		1801	+
1794	protected	1802	protected
1795		1803
1796	# FIXME this is to avoid adding an extra dependency for a proper JSON parser.	1804	# FIXME this is to avoid adding an extra dependency for a proper JSON parser.
@@ -0,0 +1,37 @@		@@ -0,0 +1,37 @@
	1	+require "#{File.dirname(__FILE__)}/../test_helper"
	2	+
	3	+class ManageFriendshipsTest < ActionController::IntegrationTest
	4	+
	5	+ def setup
	6	+ FriendsController.any_instance.stubs(:get_layout).returns('application')
	7	+ ProfileController.any_instance.stubs(:get_layout).returns('application')
	8	+
	9	+ Friendship.delete_all
	10	+ Person.delete_all
	11	+ @person = create_user("albert", :password => 'test',
	12	+ :password_confirmation => 'test').person
	13	+ @person.user.activate
	14	+
	15	+ @friend = fast_create(Person, :identifier => "isaac")
	16	+
	17	+ login(@person.identifier, 'test')
	18	+ end
	19	+
	20	+ should 'remove friendships' do
	21	+ @person.add_friend(@friend)
	22	+ @friend.add_friend(@person)
	23	+
	24	+ get "/myprofile/#{@person.identifier}/friends/remove/#{@friend.id}"
	25	+ assert_response :success
	26	+
	27	+ post "/myprofile/#{@person.identifier}/friends/remove/#{@friend.id}",
	28	+ :confirmation => '1'
	29	+ assert_response :redirect
	30	+
	31	+ follow_redirect!
	32	+
	33	+ assert assigns(:friends).empty?
	34	+ assert !@person.is_a_friend?(@friend)
	35	+ assert !@friend.is_a_friend?(@person)
	36	+ end
	37	+end
	@@ -277,16 +277,4 @@ class ActionController::IntegrationTest		@@ -277,16 +277,4 @@ class ActionController::IntegrationTest
277		277
278	end	278	end
279		279
280	-def with_constants(constants, &block)
281	- old_constants = Hash.new
282	- constants.each do \|constant, val\|
283	- old_constants[constant] = Object.const_get(constant)
284	- silence_stderr{ Object.const_set(constant, val) }
285	- end
286	- block.call
287	- old_constants.each do \|constant, val\|
288	- silence_stderr{ Object.const_set(constant, val) }
289	- end
290	-end
291	-
292	Profile	280	Profile
	@@ -58,4 +58,18 @@ class FriendshipTest < ActiveSupport::TestCase		@@ -58,4 +58,18 @@ class FriendshipTest < ActiveSupport::TestCase
58	assert_equal ['a'], ta.get_friend_name	58	assert_equal ['a'], ta.get_friend_name
59	end	59	end
60		60
		61	+ should 'remove friendships when a friend removal occurs' do
		62	+ p1 = create_user('testuser1').person
		63	+ p2 = create_user('testuser2').person
		64	+ p1.add_friend(p2, 'friends')
		65	+ p2.add_friend(p1, 'friends')
		66	+
		67	+ assert_difference 'Friendship.count', -2 do
		68	+ Friendship.remove_friendship(p1, p2)
		69	+ end
		70	+
		71	+ assert_not_includes p1.friends(true), p2
		72	+ assert_not_includes p2.friends(true), p1
		73	+ end
		74	+
61	end	75	end
	@@ -3,22 +3,22 @@ require File.dirname(__FILE__) + '/../test_helper'		@@ -3,22 +3,22 @@ require File.dirname(__FILE__) + '/../test_helper'
3	class MailConfTest < ActiveSupport::TestCase	3	class MailConfTest < ActiveSupport::TestCase
4		4
5	should 'enable if told to' do	5	should 'enable if told to' do
6	- NOOSFERO_CONF['mail_enabled'] = true	6	+ NOOSFERO_CONF.stubs(:[]).with('mail_enabled').returns(true)
7	assert_equal true, MailConf.enabled?	7	assert_equal true, MailConf.enabled?
8	end	8	end
9		9
10	should 'disable if told to' do	10	should 'disable if told to' do
11	- NOOSFERO_CONF['mail_enabled'] = false	11	+ NOOSFERO_CONF.stubs(:[]).with('mail_enabled').returns(false)
12	assert_equal false, MailConf.enabled?	12	assert_equal false, MailConf.enabled?
13	end	13	end
14		14
15	should 'disable by default' do	15	should 'disable by default' do
16	- NOOSFERO_CONF['mail_enabled'] = nil	16	+ NOOSFERO_CONF.stubs(:[]).with('mail_enabled').returns(nil)
17	assert_equal false, MailConf.enabled?	17	assert_equal false, MailConf.enabled?
18	end	18	end
19		19
20	should 'provide webmail url preference' do	20	should 'provide webmail url preference' do
21	- NOOSFERO_CONF['webmail_url'] = 'http://some.url/webmail/%s/%s'	21	+ NOOSFERO_CONF.stubs(:[]).with('webmail_url').returns('http://some.url/webmail/%s/%s')
22	assert_equal 'http://some.url/webmail/login/example.com', MailConf.webmail_url('login', 'example.com')	22	assert_equal 'http://some.url/webmail/login/example.com', MailConf.webmail_url('login', 'example.com')
23	end	23	end
24		24