Merge commit 'refs/merge-requests/241' of git://gitorious.org/noosfero/noosfero …

…into merge-requests/241

Merge commit 'refs/merge-requests/241' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/241
Daniela Feitosa
2 parents e23b6d32 3209ff35
Showing 14 changed files with 162 additions and 65 deletions Show diff stats
app/controllers/my_profile/profile_members_controller.rb
app/controllers/public/profile_controller.rb
app/models/profile.rb
app/views/profile/members.rhtml
app/views/profile/send_mail.rhtml
app/views/profile_members/_index_buttons.rhtml
app/views/profile_members/send_mail.rhtml
db/migrate/20120824165019_add_permission_for_send_mail_to_members_to_admin_and_moderator_roles.rb
features/send_email_to_organization_members.feature
features/step_definitions/noosfero_steps.rb
features/support/paths.rb
test/fixtures/roles.yml
test/functional/profile_controller_test.rb
test/functional/profile_members_controller_test.rb
@@ -156,18 +156,4 @@ class ProfileMembersController &lt; MyProfileController
     end
   end
-  def send_mail
-    @mailing = profile.mailings.build(params[:mailing])
-    if request.post?
-      @mailing.locale = locale
-      @mailing.person = user
-      if @mailing.save
-        session[:notice] = _('The e-mails are being sent')
-        redirect_to :action => 'index'
-      else
-        session[:notice] = _('Could not create the e-mail')
-      end
-    end
-  end
-
 end
@@ -2,11 +2,13 @@ class ProfileController &lt; PublicController
   needs_profile
   before_filter :check_access_to_profile, :except => [:join, :join_not_logged, :index, :add]
-  before_filter :store_location, :only => [:join, :join_not_logged, :report_abuse]
-  before_filter :login_required, :only => [:add, :join, :join_not_logged, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity]
+  before_filter :store_location, :only => [:join, :join_not_logged, :report_abuse, :send_mail]
+  before_filter :login_required, :only => [:add, :join, :join_not_logged, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity, :send_mail]
   helper TagsHelper
+  protect 'send_mail_to_members', :profile, :only => [:send_mail]
+
   def index
     @network_activities = !@profile.is_a?(Person) ? @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page]) : []
     if logged_in? && current_person.follows?(@profile)
@@ -327,6 +329,20 @@ class ProfileController &lt; PublicController
     end
   end
+  def send_mail
+    @mailing = profile.mailings.build(params[:mailing])
+    if request.post?
+      @mailing.locale = locale
+      @mailing.person = user
+      if @mailing.save
+        session[:notice] = _('The e-mails are being sent')
+        redirect_to_previous_location
+      else
+        session[:notice] = _('Could not create the e-mail')
+      end
+    end
+  end
+
   protected
   def check_access_to_profile
@@ -57,6 +57,7 @@ class Profile &lt; ActiveRecord::Base
     'view_private_content' => N_('View private content'),
     'publish_content'      => N_('Publish content'),
     'invite_members'       => N_('Invite members'),
+    'send_mail_to_members' => N_('Send e-Mail to members'),
   }
   acts_as_accessible
@@ -16,8 +16,13 @@
 <% button_bar do %>
   <%= button :back, _('Go back'), { :controller => 'profile' } %>
-  <% if profile.community? and user and user.has_permission?(:invite_members, profile) %>
-    <%= button :search, _('Invite your friends to join %s') % profile.name, :controller => 'invite', :action => 'select_address_book' %>
+  <% if profile.community? and user %>
+    <% if user.has_permission?(:invite_members, profile) %>
+      <%= button :search, _('Invite your friends to join %s') % profile.name, :controller => 'invite', :action => 'select_address_book' %>
+    <% end %>
+    <% if user.has_permission?(:send_mail_to_members, profile) %>
+      <%= button :send, _('Send e-mail to members'), :controller => 'profile', :action => 'send_mail' %>
+    <% end %>
   <% end %>
 <% end %>
@@ -0,0 +1,14 @@
+<h1><%= h profile.short_name(50) %></h1>
+
+<h2><%= _('Send e-mail to members') %></h2>
+
+<%= error_messages_for :mailing %>
+
+<%= render :file => 'shared/tiny_mce' %>
+
+<% form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do |f| %>
+  <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
+  <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
+  <%= submit_button(:send, _('Send')) %>
+  <%= button :cancel, _('Cancel e-mail'), :back %>
+<% end %>
@@ -4,7 +4,7 @@
   <% if profile.community? and user.has_permission?(:invite_members, profile) %>
     <%= button :search, _('Invite your friends to join %s') % profile.short_name, :controller => 'invite', :action => 'select_address_book' %>
   <% end %>
-  <%= button :send, _('Send e-mail to members'), :action => 'send_mail' %>
+  <%= button :send, _('Send e-mail to members'), :controller => 'profile', :action => 'send_mail' %>
   <% @plugins.dispatch(:manage_members_extra_buttons).each do |plugin_button| %>
     <%= button plugin_button[:icon], plugin_button[:title], plugin_button[:url] %>
   <% end %>
@@ -1,14 +0,0 @@
-<h1><%= h profile.short_name(50) %></h1>
-
-<h2><%= _('Send e-mail to members') %></h2>
-
-<%= error_messages_for :mailing %>
-
-<%= render :file => 'shared/tiny_mce' %>
-
-<% form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do |f| %>
-  <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
-  <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
-  <%= submit_button(:send, _('Send')) %>
-  <%= button :cancel, _('Cancel e-mail'), :action => 'index' %>
-<% end %>
@@ -0,0 +1,23 @@
+class AddPermissionForSendMailToMembersToAdminAndModeratorRoles < ActiveRecord::Migration
+  def self.up
+    Environment.all.map(&:id).each do |id|
+      role = Profile::Roles.admin(id)
+      role.permissions += ['send_mail_to_members']
+      role.save!
+      role = Profile::Roles.moderator(id)
+      role.permissions += ['send_mail_to_members']
+      role.save!
+    end
+  end
+
+  def self.down
+    Environment.all.map(&:id).each do |id|
+      role = Profile::Roles.admin(id)
+      role.permissions -= ['send_mail_to_members']
+      role.save!
+      role = Profile::Roles.moderator(id)
+      role.permissions -= ['send_mail_to_members']
+      role.save!
+    end
+  end
+end
 Feature: send emails to organization members
-  As a organization administrator
+  As a organization administrator or moderator
   I want to send email to all members
   Background:
     Given the following users
       | login | name |
       | joaosilva | Joao Silva |
+      | jose | Jose Silva |
+      | manoel | Manoel Silva |
     And the following communities
       | identifier | name |
       | sample-community | Sample Community |
     And "Joao Silva" is admin of "Sample Community"
+    And "Jose Silva" is moderator of "Sample Community"
+    And "Manoel Silva" is a member of "Sample Community"
   Scenario: Cant access if not logged in
     Given I am not logged in
-    When I go to /myprofile/sample-community/profile_members/send_mail
+    When I go to /profile/sample-community/send_mail
     Then I should be on login page
   Scenario: Cant access as normal user
@@ -21,7 +25,7 @@ Feature: send emails to organization members
       | login |
       | josesilva |
     And I am logged in as "josesilva"
-    When I go to /myprofile/sample-community/profile_members/send_mail
+    When I go to /profile/sample-community/send_mail
     Then I should see "Access denied"
   Scenario: Send e-mail to members
@@ -39,7 +43,7 @@ Feature: send emails to organization members
     And I follow "Send e-mail to members"
     And I fill in "body" with "We have some news"
     When I press "Send"
-    Then I should be on /myprofile/sample-community/profile_members/send_mail
+    Then I should be on /profile/sample-community/send_mail
   Scenario: Not send e-mail to members if body is blank
     Given I am logged in as "joaosilva"
@@ -47,7 +51,7 @@ Feature: send emails to organization members
     And I follow "Send e-mail to members"
     And I fill in "Subject" with "Hello, user!"
     When I press "Send"
-    Then I should be on /myprofile/sample-community/profile_members/send_mail
+    Then I should be on /profile/sample-community/send_mail
   Scenario: Cancel creation of mailing
     Given I am logged in as "joaosilva"
@@ -55,3 +59,34 @@ Feature: send emails to organization members
     And I follow "Send e-mail to members"
     When I follow "Cancel e-mail"
     Then I should be on Sample Community's members management
+
+  Scenario: Cant access if has no send_mail_to_members permission
+    Given I am logged in as "manoel"
+    When I go to /profile/sample-community/send_mail
+    Then I should see "Access denied"
+
+  Scenario: Show button "Send e-Mail to members" of community to an moderator
+    Given I am logged in as "jose"
+    When I go to Sample Community's members page
+    Then I should see "Send e-mail to members" link
+
+  Scenario: Not show button "Send e-Mail to members" if user has no right permission
+    Given I am logged in as "manoel"
+    When I go to Sample Community's members page
+    Then I should not see "Send e-mail to members" link
+
+  Scenario: Redirect back to profile members page after send mail
+    Given I am logged in as "jose"
+    When I go to Sample Community's members page
+    And I follow "Send e-mail to members"
+    And I fill in "Subject" with "Hello, member!"
+    And I fill in "body" with "We have some news"
+    When I press "Send"
+    Then I should be on Sample Community's members page
+
+  Scenario: Back to profile members page after cancel creation of mailing
+    Given I am logged in as "jose"
+    And I go to Sample Community's members page
+    And I follow "Send e-mail to members"
+    When I follow "Cancel e-mail"
+    Then I should be on Sample Community's members page
@@ -355,6 +355,12 @@ Given /^&quot;(.+)&quot; is admin of &quot;(.+)&quot;$/ do |person, organization|
   org.add_admin(user)
 end
+Given /^"(.+)" is moderator of "(.+)"$/ do |person, organization|
+  org = Profile.find_by_name(organization)
+  user = Profile.find_by_name(person)
+  org.add_moderator(user)
+end
+
 Then /^"(.+)" should be admin of "(.+)"$/ do |person, organization|
   org = Organization.find_by_name(organization)
   user = Person.find_by_name(person)
@@ -108,6 +108,9 @@ module NavigationHelpers
     when /the user data path/
       '/account/user_data'
+    when /^(.+)'s members page/
+      '/profile/%s/members' % Profile.find_by_name($1).identifier
+
     # Add more mappings here.
     # Here is a more fancy example:
     #
@@ -53,6 +53,7 @@ profile_admin:
    - post_content
    - view_private_content
    - manage_products
+   - send_mail_to_members
 profile_member:
   id: 6
   environment_id: 1
@@ -70,6 +71,7 @@ profile_moderator:
   permissions:
    - moderate_comments
    - view_private_content
+   - send_mail_to_members
 environment_administrator:
   id: 8
   environment_id: 1
@@ -1324,4 +1324,51 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'span', :content => '(unauthenticated user)', :attributes => {:class => 'comment-user-status comment-user-status-wall icon-user-unknown'}
   end
+
+  should 'add locale on mailing' do
+    community = fast_create(Community)
+    create_user_with_permission('profile_moderator_user', 'send_mail_to_members', community)
+    login_as('profile_moderator_user')
+    @controller.stubs(:locale).returns('pt')
+    post :send_mail, :profile => community.identifier, :mailing => {:subject => 'Hello', :body => 'We have some news'}
+    assert_equal 'pt', assigns(:mailing).locale
+  end
+
+  should 'queue mailing to process later' do
+    community = fast_create(Community)
+    create_user_with_permission('profile_moderator_user', 'send_mail_to_members', community)
+    login_as('profile_moderator_user')
+    @controller.stubs(:locale).returns('pt')
+    assert_difference Delayed::Job, :count, 1 do
+      post :send_mail, :profile => community.identifier, :mailing => {:subject => 'Hello', :body => 'We have some news'}
+    end
+  end
+
+  should 'save mailing' do
+    community = fast_create(Community)
+    create_user_with_permission('profile_moderator_user', 'send_mail_to_members', community)
+    login_as('profile_moderator_user')
+    @controller.stubs(:locale).returns('pt')
+    post :send_mail, :profile => community.identifier, :mailing => {:subject => 'Hello', :body => 'We have some news'}
+    assert_equal ['Hello', 'We have some news'], [assigns(:mailing).subject, assigns(:mailing).body]
+  end
+
+  should 'add the user logged on mailing' do
+    community = fast_create(Community)
+    create_user_with_permission('profile_moderator_user', 'send_mail_to_members', community)
+    login_as('profile_moderator_user')
+    post :send_mail, :profile => community.identifier, :mailing => {:subject => 'Hello', :body => 'We have some news'}
+    assert_equal Profile['profile_moderator_user'], assigns(:mailing).person
+  end
+
+  should 'redirect back to right place after mail' do
+    community = fast_create(Community)
+    create_user_with_permission('profile_moderator_user', 'send_mail_to_members', community)
+    login_as('profile_moderator_user')
+    @controller.stubs(:locale).returns('pt')
+    @request.expects(:referer).returns("/profile/#{community.identifier}/members")
+    post :send_mail, :profile => community.identifier, :mailing => {:subject => 'Hello', :body => 'We have some news'}
+    assert_redirected_to :action => 'members'
+  end
+
 end
@@ -328,33 +328,6 @@ class ProfileMembersControllerTest &lt; ActionController::TestCase
     assert p_roles, [r]
   end
-  should 'add locale on mailing' do
-    community = fast_create(Community)
-    admin_user = create_user_with_permission('profile_admin_user', 'manage_memberships', community)
-    login_as('profile_admin_user')
-    @controller.stubs(:locale).returns('pt')
-    post :send_mail, :profile => community.identifier, :mailing => {:subject => 'Hello', :body => 'We have some news'}
-    assert_equal 'pt', assigns(:mailing).locale
-  end
-
-  should 'save mailing' do
-    community = fast_create(Community)
-    admin_user = create_user_with_permission('profile_admin_user', 'manage_memberships', community)
-    login_as('profile_admin_user')
-    @controller.stubs(:locale).returns('pt')
-    post :send_mail, :profile => community.identifier, :mailing => {:subject => 'Hello', :body => 'We have some news'}
-    assert_equal ['Hello', 'We have some news'], [assigns(:mailing).subject, assigns(:mailing).body]
-    assert_redirected_to :action => 'index'
-  end
-
-  should 'add the user logged on mailing' do
-    community = fast_create(Community)
-    admin_user = create_user_with_permission('profile_admin_user', 'manage_memberships', community)
-    login_as('profile_admin_user')
-    post :send_mail, :profile => community.identifier, :mailing => {:subject => 'Hello', :body => 'We have some news'}
-    assert_equal Profile['profile_admin_user'], assigns(:mailing).person
-  end
-
   should 'set a community member as admin' do
     community = fast_create(Community)
     admin = create_user_with_permission('admin_user', 'manage_memberships', community)
	@@ -156,18 +156,4 @@ class ProfileMembersController < MyProfileController		@@ -156,18 +156,4 @@ class ProfileMembersController < MyProfileController
156	end	156	end
157	end	157	end
158		158
159	- def send_mail
160	- @mailing = profile.mailings.build(params[:mailing])
161	- if request.post?
162	- @mailing.locale = locale
163	- @mailing.person = user
164	- if @mailing.save
165	- session[:notice] = _('The e-mails are being sent')
166	- redirect_to :action => 'index'
167	- else
168	- session[:notice] = _('Could not create the e-mail')
169	- end
170	- end
171	- end
172	-
173	end	159	end
	@@ -2,11 +2,13 @@ class ProfileController < PublicController		@@ -2,11 +2,13 @@ class ProfileController < PublicController
2		2
3	needs_profile	3	needs_profile
4	before_filter :check_access_to_profile, :except => [:join, :join_not_logged, :index, :add]	4	before_filter :check_access_to_profile, :except => [:join, :join_not_logged, :index, :add]
5	- before_filter :store_location, :only => [:join, :join_not_logged, :report_abuse]
6	- before_filter :login_required, :only => [:add, :join, :join_not_logged, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity]	5	+ before_filter :store_location, :only => [:join, :join_not_logged, :report_abuse, :send_mail]
		6	+ before_filter :login_required, :only => [:add, :join, :join_not_logged, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_activities, :view_more_network_activities, :report_abuse, :register_report, :leave_comment_on_activity, :send_mail]
7		7
8	helper TagsHelper	8	helper TagsHelper
9		9
		10	+ protect 'send_mail_to_members', :profile, :only => [:send_mail]
		11	+
10	def index	12	def index
11	@network_activities = !@profile.is_a?(Person) ? @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page]) : []	13	@network_activities = !@profile.is_a?(Person) ? @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page]) : []
12	if logged_in? && current_person.follows?(@profile)	14	if logged_in? && current_person.follows?(@profile)
	@@ -327,6 +329,20 @@ class ProfileController < PublicController		@@ -327,6 +329,20 @@ class ProfileController < PublicController
327	end	329	end
328	end	330	end
329		331
		332	+ def send_mail
		333	+ @mailing = profile.mailings.build(params[:mailing])
		334	+ if request.post?
		335	+ @mailing.locale = locale
		336	+ @mailing.person = user
		337	+ if @mailing.save
		338	+ session[:notice] = _('The e-mails are being sent')
		339	+ redirect_to_previous_location
		340	+ else
		341	+ session[:notice] = _('Could not create the e-mail')
		342	+ end
		343	+ end
		344	+ end
		345	+
330	protected	346	protected
331		347
332	def check_access_to_profile	348	def check_access_to_profile
	@@ -57,6 +57,7 @@ class Profile < ActiveRecord::Base		@@ -57,6 +57,7 @@ class Profile < ActiveRecord::Base
57	'view_private_content' => N_('View private content'),	57	'view_private_content' => N_('View private content'),
58	'publish_content' => N_('Publish content'),	58	'publish_content' => N_('Publish content'),
59	'invite_members' => N_('Invite members'),	59	'invite_members' => N_('Invite members'),
		60	+ 'send_mail_to_members' => N_('Send e-Mail to members'),
60	}	61	}
61		62
62	acts_as_accessible	63	acts_as_accessible
@@ -0,0 +1,14 @@		@@ -0,0 +1,14 @@
	1	+<h1><%= h profile.short_name(50) %></h1>
	2	+
	3	+<h2><%= _('Send e-mail to members') %></h2>
	4	+
	5	+<%= error_messages_for :mailing %>
	6	+
	7	+<%= render :file => 'shared/tiny_mce' %>
	8	+
	9	+<% form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do \|f\| %>
	10	+ <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
	11	+ <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
	12	+ <%= submit_button(:send, _('Send')) %>
	13	+ <%= button :cancel, _('Cancel e-mail'), :back %>
	14	+<% end %>
	@@ -4,7 +4,7 @@		@@ -4,7 +4,7 @@
4	<% if profile.community? and user.has_permission?(:invite_members, profile) %>	4	<% if profile.community? and user.has_permission?(:invite_members, profile) %>
5	<%= button :search, _('Invite your friends to join %s') % profile.short_name, :controller => 'invite', :action => 'select_address_book' %>	5	<%= button :search, _('Invite your friends to join %s') % profile.short_name, :controller => 'invite', :action => 'select_address_book' %>
6	<% end %>	6	<% end %>
7	- <%= button :send, _('Send e-mail to members'), :action => 'send_mail' %>	7	+ <%= button :send, _('Send e-mail to members'), :controller => 'profile', :action => 'send_mail' %>
8	<% @plugins.dispatch(:manage_members_extra_buttons).each do \|plugin_button\| %>	8	<% @plugins.dispatch(:manage_members_extra_buttons).each do \|plugin_button\| %>
9	<%= button plugin_button[:icon], plugin_button[:title], plugin_button[:url] %>	9	<%= button plugin_button[:icon], plugin_button[:title], plugin_button[:url] %>
10	<% end %>	10	<% end %>
	@@ -1,14 +0,0 @@	@@ -1,14 +0,0 @@
1	-<h1><%= h profile.short_name(50) %></h1>
2	-
3	-<h2><%= _('Send e-mail to members') %></h2>
4	-
5	-<%= error_messages_for :mailing %>
6	-
7	-<%= render :file => 'shared/tiny_mce' %>
8	-
9	-<% form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do \|f\| %>
10	- <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
11	- <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
12	- <%= submit_button(:send, _('Send')) %>
13	- <%= button :cancel, _('Cancel e-mail'), :action => 'index' %>
14	-<% end %>
@@ -0,0 +1,23 @@		@@ -0,0 +1,23 @@
	1	+class AddPermissionForSendMailToMembersToAdminAndModeratorRoles < ActiveRecord::Migration
	2	+ def self.up
	3	+ Environment.all.map(&:id).each do \|id\|
	4	+ role = Profile::Roles.admin(id)
	5	+ role.permissions += ['send_mail_to_members']
	6	+ role.save!
	7	+ role = Profile::Roles.moderator(id)
	8	+ role.permissions += ['send_mail_to_members']
	9	+ role.save!
	10	+ end
	11	+ end
	12	+
	13	+ def self.down
	14	+ Environment.all.map(&:id).each do \|id\|
	15	+ role = Profile::Roles.admin(id)
	16	+ role.permissions -= ['send_mail_to_members']
	17	+ role.save!
	18	+ role = Profile::Roles.moderator(id)
	19	+ role.permissions -= ['send_mail_to_members']
	20	+ role.save!
	21	+ end
	22	+ end
	23	+end
	@@ -355,6 +355,12 @@ Given /^"(.+)" is admin of "(.+)"$/ do \|person, organization\|		@@ -355,6 +355,12 @@ Given /^"(.+)" is admin of "(.+)"$/ do \|person, organization\|
355	org.add_admin(user)	355	org.add_admin(user)
356	end	356	end
357		357
		358	+Given /^"(.+)" is moderator of "(.+)"$/ do \|person, organization\|
		359	+ org = Profile.find_by_name(organization)
		360	+ user = Profile.find_by_name(person)
		361	+ org.add_moderator(user)
		362	+end
		363	+
358	Then /^"(.+)" should be admin of "(.+)"$/ do \|person, organization\|	364	Then /^"(.+)" should be admin of "(.+)"$/ do \|person, organization\|
359	org = Organization.find_by_name(organization)	365	org = Organization.find_by_name(organization)
360	user = Person.find_by_name(person)	366	user = Person.find_by_name(person)
	@@ -1324,4 +1324,51 @@ class ProfileControllerTest < ActionController::TestCase		@@ -1324,4 +1324,51 @@ class ProfileControllerTest < ActionController::TestCase
1324		1324
1325	assert_tag :tag => 'span', :content => '(unauthenticated user)', :attributes => {:class => 'comment-user-status comment-user-status-wall icon-user-unknown'}	1325	assert_tag :tag => 'span', :content => '(unauthenticated user)', :attributes => {:class => 'comment-user-status comment-user-status-wall icon-user-unknown'}
1326	end	1326	end
		1327	+
		1328	+ should 'add locale on mailing' do
		1329	+ community = fast_create(Community)
		1330	+ create_user_with_permission('profile_moderator_user', 'send_mail_to_members', community)
		1331	+ login_as('profile_moderator_user')
		1332	+ @controller.stubs(:locale).returns('pt')
		1333	+ post :send_mail, :profile => community.identifier, :mailing => {:subject => 'Hello', :body => 'We have some news'}
		1334	+ assert_equal 'pt', assigns(:mailing).locale
		1335	+ end
		1336	+
		1337	+ should 'queue mailing to process later' do
		1338	+ community = fast_create(Community)
		1339	+ create_user_with_permission('profile_moderator_user', 'send_mail_to_members', community)
		1340	+ login_as('profile_moderator_user')
		1341	+ @controller.stubs(:locale).returns('pt')
		1342	+ assert_difference Delayed::Job, :count, 1 do
		1343	+ post :send_mail, :profile => community.identifier, :mailing => {:subject => 'Hello', :body => 'We have some news'}
		1344	+ end
		1345	+ end
		1346	+
		1347	+ should 'save mailing' do
		1348	+ community = fast_create(Community)
		1349	+ create_user_with_permission('profile_moderator_user', 'send_mail_to_members', community)
		1350	+ login_as('profile_moderator_user')
		1351	+ @controller.stubs(:locale).returns('pt')
		1352	+ post :send_mail, :profile => community.identifier, :mailing => {:subject => 'Hello', :body => 'We have some news'}
		1353	+ assert_equal ['Hello', 'We have some news'], [assigns(:mailing).subject, assigns(:mailing).body]
		1354	+ end
		1355	+
		1356	+ should 'add the user logged on mailing' do
		1357	+ community = fast_create(Community)
		1358	+ create_user_with_permission('profile_moderator_user', 'send_mail_to_members', community)
		1359	+ login_as('profile_moderator_user')
		1360	+ post :send_mail, :profile => community.identifier, :mailing => {:subject => 'Hello', :body => 'We have some news'}
		1361	+ assert_equal Profile['profile_moderator_user'], assigns(:mailing).person
		1362	+ end
		1363	+
		1364	+ should 'redirect back to right place after mail' do
		1365	+ community = fast_create(Community)
		1366	+ create_user_with_permission('profile_moderator_user', 'send_mail_to_members', community)
		1367	+ login_as('profile_moderator_user')
		1368	+ @controller.stubs(:locale).returns('pt')
		1369	+ @request.expects(:referer).returns("/profile/#{community.identifier}/members")
		1370	+ post :send_mail, :profile => community.identifier, :mailing => {:subject => 'Hello', :body => 'We have some news'}
		1371	+ assert_redirected_to :action => 'members'
		1372	+ end
		1373	+
1327	end	1374	end
	@@ -328,33 +328,6 @@ class ProfileMembersControllerTest < ActionController::TestCase		@@ -328,33 +328,6 @@ class ProfileMembersControllerTest < ActionController::TestCase
328	assert p_roles, [r]	328	assert p_roles, [r]
329	end	329	end
330		330
331	- should 'add locale on mailing' do
332	- community = fast_create(Community)
333	- admin_user = create_user_with_permission('profile_admin_user', 'manage_memberships', community)
334	- login_as('profile_admin_user')
335	- @controller.stubs(:locale).returns('pt')
336	- post :send_mail, :profile => community.identifier, :mailing => {:subject => 'Hello', :body => 'We have some news'}
337	- assert_equal 'pt', assigns(:mailing).locale
338	- end
339	-
340	- should 'save mailing' do
341	- community = fast_create(Community)
342	- admin_user = create_user_with_permission('profile_admin_user', 'manage_memberships', community)
343	- login_as('profile_admin_user')
344	- @controller.stubs(:locale).returns('pt')
345	- post :send_mail, :profile => community.identifier, :mailing => {:subject => 'Hello', :body => 'We have some news'}
346	- assert_equal ['Hello', 'We have some news'], [assigns(:mailing).subject, assigns(:mailing).body]
347	- assert_redirected_to :action => 'index'
348	- end
349	-
350	- should 'add the user logged on mailing' do
351	- community = fast_create(Community)
352	- admin_user = create_user_with_permission('profile_admin_user', 'manage_memberships', community)
353	- login_as('profile_admin_user')
354	- post :send_mail, :profile => community.identifier, :mailing => {:subject => 'Hello', :body => 'We have some news'}
355	- assert_equal Profile['profile_admin_user'], assigns(:mailing).person
356	- end
357	-
358	should 'set a community member as admin' do	331	should 'set a community member as admin' do
359	community = fast_create(Community)	332	community = fast_create(Community)
360	admin = create_user_with_permission('admin_user', 'manage_memberships', community)	333	admin = create_user_with_permission('admin_user', 'manage_memberships', community)