Merge branch 'force_show_email' into 'master'

Adds required email moderation option - Confirmation modal when joining community where user's email is required. - Moderation option to require email in community control panel. - Adds task footer support. - Implemented for add_member task. - Changes the e-mail of the requestor to appear on the task footer. See merge request !882

Merge branch 'force_show_email' into 'master'
Adds required email moderation option - Confirmation modal when joining community where user's email is required. - Moderation option to require email in community control panel. - Adds task footer support. - Implemented for add_member task. - Changes the e-mail of the requestor to appear on the task footer. See merge request !882
Joenio Costa
2 parents 1ec026e9 26e5b3d6
Showing 18 changed files with 190 additions and 29 deletions Show diff stats
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
app/helpers/memberships_helper.rb
app/helpers/profile_image_helper.rb
app/models/add_member.rb
app/models/community.rb
app/models/task.rb
app/views/blocks/profile_info_actions/_join_leave_community.html.erb
app/views/profile/_private_profile.html.erb
app/views/profile/join.html.erb
app/views/profile_editor/_moderation.html.erb
app/views/tasks/_add_member_footer.html.erb
app/views/tasks/_task.html.erb
public/designs/themes/base/style.scss
public/javascripts/add-and-join.js
public/javascripts/profile_editor.js
test/functional/profile_controller_test.rb
test/unit/add_member_test.rb
@@ -86,8 +86,16 @@ class ProfileController &lt; PublicController
     @articles = profile.top_level_articles.includes([:profile, :parent])
   end
+  def join_modal
+      profile.add_member(user)
+      session[:notice] = _('%s administrator still needs to accept you as member.') % profile.name
+      redirect_to :action => :index
+  end
+
   def join
     if !user.memberships.include?(profile)
+      return if profile.community? && show_confirmation_modal?(profile)
+
       profile.add_member(user)
       if !profile.members.include?(user)
         render :text => {:message => _('%s administrator still needs to accept you as member.') % profile.name}.to_json
@@ -54,6 +54,8 @@ module ApplicationHelper
   include TaskHelper
+  include MembershipsHelper
+
   def locale
     (@page && !@page.language.blank?) ? @page.language : FastGettext.locale
   end
@@ -984,11 +986,11 @@ module ApplicationHelper
   def task_information(task)
     values = {}
+    values.merge!(task.information[:variables]) if task.information[:variables]
     values.merge!({:requestor => link_to(task.requestor.name, task.requestor.url)}) if task.requestor
     values.merge!({:subject => content_tag('span', task.subject, :class=>'task_target')}) if task.subject
     values.merge!({:linked_subject => link_to(content_tag('span', task.linked_subject[:text], :class => 'task_target'), task.linked_subject[:url])}) if task.linked_subject
-    values.merge!(task.information[:variables]) if task.information[:variables]
-    task.information[:message] % values
+    (task.information[:message] % values).html_safe
   end
   def add_zoom_to_article_images
 module MembershipsHelper
+
+  def join_community_button options={:logged => false}
+    url = options[:logged] ? profile.join_url : profile.join_not_logged_url
+
+    if show_confirmation_modal? profile
+      modal_button :add, _('Join this community'), url, class: 'join-community'
+    else
+      button :add, _('Join this community'), url, class: 'join-community'
+    end
+  end
+
+  def show_confirmation_modal? profile
+    profile.requires_email? && current_person && !current_person.public_fields.include?("email")
+  end
+
 end
@@ -61,6 +61,8 @@ module ProfileImageHelper
     image_tag(profile_icon(profile, size), opt )
   end
+  include MembershipsHelper
+
   def links_for_balloon(profile)
     if environment.enabled?(:show_balloon_with_profile_links_when_clicked)
       if profile.kind_of?(Person)
@@ -76,7 +78,7 @@ module ProfileImageHelper
           {_('Wall') => {:href => url_for(profile.public_profile_url)}},
           {_('Members') => {:href => url_for(:controller => :profile, :action => :members, :profile => profile.identifier)}},
           {_('Agenda') => {:href => url_for(:controller => :profile, :action => :events, :profile => profile.identifier)}},
-          {_('Join') => {:href => url_for(profile.join_url), :class => 'join-community', :style => 'display: none'}},
+          {_('Join') => {:href => url_for(profile.join_url), :class => 'join-community'+ (show_confirmation_modal?(profile) ? ' modal-toggle' : '') , :style => 'display: none'}},
           {_('Leave community') => {:href => url_for(profile.leave_url), :class => 'leave-community', :style => 'display:  none'}},
           {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}}
         ]
@@ -29,16 +29,18 @@ class AddMember &lt; Task
   end
   def information
-    requestor_email = " (#{requestor.email})" if requestor.may_display_field_to?("email")
-
-    {:message => _("%{requestor}%{requestor_email} wants to be a member of '%{organization}'."),
-     variables: {requestor: requestor.name, requestor_email: requestor_email, organization: organization.name}}
+    {:message => _("%{requestor} wants to be a member of '%{target}'."),
+     variables: {requestor: requestor.name, target: target.name}}
   end
   def accept_details
     true
   end
+  def footer
+    true
+  end
+
   def icon
     {:type => :profile_image, :profile => requestor, :url => requestor.url}
   end
@@ -63,4 +65,15 @@ class AddMember &lt; Task
     suggestion.disable if suggestion
   end
+  def task_finished_message
+    _("You have been accepted at \"%{target}\" with the profile \"%{requestor}\"") %
+      {:target => self.target.name,
+       :requestor => self.requestor.name}
+  end
+
+  def task_cancelled_message
+    _("Your request to enter community \"%{target} with the profile \"%{requestor}\" was not accepted. Please contact any profile admin from %{url} for more information.") %
+    {:target => self.target.name, :url => self.target.url,
+     :requestor => self.requestor.name}
+  end
 end
@@ -2,6 +2,7 @@ class Community &lt; Organization
   attr_accessible :accessor_id, :accessor_type, :role_id, :resource_id, :resource_type
   attr_accessible :address_reference, :district, :tag_list, :language, :description
+  attr_accessible :requires_email
   after_destroy :check_invite_member_for_destroy
   def self.type_name
@@ -12,6 +13,9 @@ class Community &lt; Organization
   N_('Language')
   settings_items :language
+  settings_items :requires_email, :type => :boolean
+
+  alias_method :requires_email?, :requires_email
   extend SetProfileRegionFromCityState::ClassMethods
   set_profile_region_from_city_state
@@ -190,6 +190,10 @@ class Task &lt; ApplicationRecord
     false
   end
+  def footer
+    false
+  end
+
   def icon
     {:type => :defined_image, :src => "/images/icons-app/user-minor.png", :name => requestor.name, :url => requestor.url}
   end
@@ -7,15 +7,12 @@
         <%= button :delete, content_tag('span', _('Leave community')), profile.leave_url,
           class: 'leave-community',
           style: 'position: relative;' %>
-        <%= button :add, content_tag('span', _('Join this community')), profile.join_url,
-          class: 'join-community',
-          style: 'position: relative; display: none;' %>
       <% else %>
-        <%= button :add, _('Join this community'), profile.join_url, class: 'join-community' %>
+        <%= join_community_button({:logged => true}) %>
       <% end %>
     <% end %>
   <% else %>
-    <%= button :add, _('Join this community'), profile.join_not_logged_url %>
+    <%= join_community_button %>
   <% end %>
 </div>
@@ -7,7 +7,7 @@
 <% button_bar do %>
   <% if @action == :join && logged_in? %>
-    <%= button(:add, content_tag('span', _('Join')), profile.join_url, :class => 'join-community', :title => _("Join community"), :style => 'position: relative;') %>
+    <%= join_community_button({:logged => true}) %>
   <% end %>
   <% if @action == :add_friend && logged_in? && !user.already_request_friendship?(profile) %>
     <%= button(:add, content_tag('span', _('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
-<h1><%= _('Joining %s') % profile.name %></h1>
+<div class="join-community-confirmation">
-<p>
-<%= _('Are you sure you want to join %s?') % profile.name %>
-</p>
+  <h1><%= _('To join %s, you must:') % profile.name %></h1>
-<%= form_tag do %>
-  <%= hidden_field_tag('back_to', @back_to) %>
-  <%= hidden_field_tag(:confirmation, 1) %>
-  <%= submit_button(:ok, _("Yes, I want to join.") % profile.name) %>
-  <% if logged_in? && request.xhr? %>
-    <%= modal_close_button _("No, I don't want") %>
-  <% else %>
-    <%= button(:cancel, _("No, I don't want."), profile.url) %>
+  <p>
+  <%= _("Authorize the visibility of your email address to the community administrator.") %>
+  </p>
+
+  <%= form_tag url_for({:action => :join_modal, :controller => :profile}) do %>
+    <%= hidden_field_tag('back_to', @back_to) %>
+    <%= submit_button(:ok, _("Authorize")) %>
+    <%= modal_close_button _("Cancel") %>
   <% end %>
-<% end %>
+
+</div>
+
@@ -9,7 +9,6 @@
       <%= _('Send administrator Email for every task') %>
     </div>
   </div>
-
   <div style='margin-bottom: 1em'>
     <h4><%= _('Invitation moderation:')%></h4>
   </div>
@@ -36,6 +35,12 @@
     <div style='margin-left: 30px'>
       <%= _('<strong>Before</strong> joining this group (a moderator has to accept the member in pending request before member can access the intranet and/or the website).').html_safe %>
     </div>
+    <div id = "requires_email_option" style="margin-left: 30px; margin-top: 10px; margin-bottom: 15px;<%=" display: none;" unless profile.closed?  %>">
+      <%= check_box(:profile_data, :requires_email, :style => 'float: left') %>
+      <div style='margin-left: 30px'>
+        <%= _('New members must allow email visibility to the profile admin') %>
+      </div>
+    </div>
   </div>
   <div>
     <%= radio_button 'profile_data', 'closed', 'false', :style => 'float: left' %>
@@ -0,0 +1,7 @@
+<% if (task.organization.requires_email || task.requestor.may_display_field_to?("email")) %>
+  <div>
+    Email:
+    <span id="task_email"> <%=task.requestor.email %> </span>
+  </div>
+<% end %>
+
@@ -70,4 +70,10 @@
     <% end %>
   <% end %>
+  <% if task.footer %>
+    <div id="task-footer-<%=task.id%>">
+      <%= render :partial => partial_for_class(task.class, nil, :footer), :locals => {:task => task} %>
+    </div>
+  <% end %>
+
 </div><!-- class="task_box" -->
@@ -1555,3 +1555,21 @@ table#recaptcha_table tr:hover td {
   clear: both;
 }
+
+/*************************** join community confirmation ********************************/
+
+.join-community-confirmation h1 {
+	font-variant: small-caps;
+	font-size: 20px;
+	color: #555753;
+	text-align: left;
+}
+
+.join-community-confirmation {
+	padding: 5px 20px 0px 20px;
+}
+
+.join-community-confirmation input.button.with-text {
+	padding-right: 4px;
+}
+
@@ -18,9 +18,11 @@ jQuery(function($) {
   })
   $(".join-community").live('click', function(){
+    $('#cboxClose').remove();
     clicked = $(this);
     url = clicked.attr("href");
-    loading_for_button(this);
+    if (!clicked.hasClass('modal-toggle'))
+      loading_for_button(this);
     $.post(url, function(data){
       clicked.fadeOut(function(){
         clicked.css("display","none");
@@ -23,4 +23,14 @@
     });
   });
+
+ $("#profile_data_closed_false").click(function(){
+  $("#requires_email_option").prop("checked",false);
+  $("#requires_email_option").hide();
+ });
+
+ $("#profile_data_closed_true").click(function(){
+  $("#requires_email_option").show();
+ });
+
 })(jQuery);
@@ -3,6 +3,8 @@ require &#39;profile_controller&#39;
 class ProfileControllerTest < ActionController::TestCase
+  include MembershipsHelper
+
   self.default_params = {profile: 'testuser'}
   def setup
     @profile = create_user('testuser').person
@@ -384,6 +386,61 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_redirected_to :controller => 'account', :action => 'login'
   end
+  should 'show regular join button for person with public email' do
+    community = Community.create!(:name => 'my test community', :closed => true, :requires_email => true)
+    Person.any_instance.stubs(:public_fields).returns(["email"])
+    login_as(@profile.identifier)
+
+    get :index, :profile => community.identifier
+    assert_no_tag :tag => 'a', :attributes => { :class => /modal-toggle join-community/ }
+  end
+
+  should 'show join modal for person with private email' do
+    community = Community.create!(:name => 'my test community', :closed => true, :requires_email => true)
+    Person.any_instance.stubs(:public_fields).returns([])
+    login_as(@profile.identifier)
+
+    get :index, :profile => community.identifier
+    assert_tag :tag => 'a', :attributes => { :class => /modal-toggle join-community/ }
+  end
+
+  should 'show regular join button for community without email visibility requirement' do
+    community = Community.create!(:name => 'my test community', :closed => true, :requires_email => false)
+    Person.any_instance.stubs(:public_fields).returns([])
+    login_as(@profile.identifier)
+
+    get :index, :profile => community.identifier
+    assert_no_tag :tag => 'a', :attributes => { :class => /modal-toggle join-community/ }
+  end
+
+  should 'show regular join button for community without email visibility requirement and person with public email' do
+    community = Community.create!(:name => 'my test community', :closed => true, :requires_email => false)
+    Person.any_instance.stubs(:public_fields).returns(['email'])
+    login_as(@profile.identifier)
+
+    get :index, :profile => community.identifier
+    assert_no_tag :tag => 'a', :attributes => { :class => /modal-toggle join-community/ }
+  end
+
+  should 'render join modal for community with email visibility requirement and person with private email' do
+    community = Community.create!(:name => 'my test community', :closed => true, :requires_email => true)
+    login_as @profile.identifier
+    post :join, :profile => community.identifier
+    assert_template "join"
+  end
+
+  should 'create add member task from join-community modal' do
+    community = Community.create!(:name => 'my test community', :closed => true, :requires_email => true)
+    admin = create_user('community-admin').person
+    community.add_admin(admin)
+
+    login_as @profile.identifier
+    assert_difference 'AddMember.count' do
+      post :join_modal, :profile => community.identifier
+    end
+    assert_redirected_to :action => 'index'
+  end
+
   should 'actually leave profile' do
     community = fast_create(Community)
     admin = fast_create(Person)
@@ -3,7 +3,8 @@ require_relative &quot;../test_helper&quot;
 class AddMemberTest < ActiveSupport::TestCase
   def setup
-    @person = fast_create(Person)
+    @user = fast_create(User)
+    @person = fast_create(Person,:user_id => @user.id)
     @community = fast_create(Community)
   end
   attr_reader :person, :community
@@ -63,6 +64,16 @@ class AddMemberTest &lt; ActiveSupport::TestCase
     task = AddMember.create!(:person => person, :organization => community)
   end
+  should 'send e-mails to requestor' do
+    community.update_attribute(:closed, true)
+    community.stubs(:notification_emails).returns(["adm@example.com"])
+
+    task = AddMember.create!(:person => person, :organization => community)
+    assert_difference "ActionMailer::Base.deliveries.size" do
+      task.finish
+    end
+  end
+
   should 'has permission to manage members' do
     t = AddMember.new
     assert_equal :manage_memberships, t.permission
	@@ -86,8 +86,16 @@ class ProfileController < PublicController		@@ -86,8 +86,16 @@ class ProfileController < PublicController
86	@articles = profile.top_level_articles.includes([:profile, :parent])	86	@articles = profile.top_level_articles.includes([:profile, :parent])
87	end	87	end
88		88
		89	+ def join_modal
		90	+ profile.add_member(user)
		91	+ session[:notice] = _('%s administrator still needs to accept you as member.') % profile.name
		92	+ redirect_to :action => :index
		93	+ end
		94	+
89	def join	95	def join
90	if !user.memberships.include?(profile)	96	if !user.memberships.include?(profile)
		97	+ return if profile.community? && show_confirmation_modal?(profile)
		98	+
91	profile.add_member(user)	99	profile.add_member(user)
92	if !profile.members.include?(user)	100	if !profile.members.include?(user)
93	render :text => {:message => _('%s administrator still needs to accept you as member.') % profile.name}.to_json	101	render :text => {:message => _('%s administrator still needs to accept you as member.') % profile.name}.to_json
1	module MembershipsHelper	1	module MembershipsHelper
		2	+
		3	+ def join_community_button options={:logged => false}
		4	+ url = options[:logged] ? profile.join_url : profile.join_not_logged_url
		5	+
		6	+ if show_confirmation_modal? profile
		7	+ modal_button :add, _('Join this community'), url, class: 'join-community'
		8	+ else
		9	+ button :add, _('Join this community'), url, class: 'join-community'
		10	+ end
		11	+ end
		12	+
		13	+ def show_confirmation_modal? profile
		14	+ profile.requires_email? && current_person && !current_person.public_fields.include?("email")
		15	+ end
		16	+
2	end	17	end
	@@ -7,7 +7,7 @@		@@ -7,7 +7,7 @@
7		7
8	<% button_bar do %>	8	<% button_bar do %>
9	<% if @action == :join && logged_in? %>	9	<% if @action == :join && logged_in? %>
10	- <%= button(:add, content_tag('span', _('Join')), profile.join_url, :class => 'join-community', :title => _("Join community"), :style => 'position: relative;') %>	10	+ <%= join_community_button({:logged => true}) %>
11	<% end %>	11	<% end %>
12	<% if @action == :add_friend && logged_in? && !user.already_request_friendship?(profile) %>	12	<% if @action == :add_friend && logged_in? && !user.already_request_friendship?(profile) %>
13	<%= button(:add, content_tag('span', _('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>	13	<%= button(:add, content_tag('span', _('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
1	-<h1><%= _('Joining %s') % profile.name %></h1>	1	+<div class="join-community-confirmation">
2		2
3	-<p>
4	-<%= _('Are you sure you want to join %s?') % profile.name %>
5	-</p>	3	+ <h1><%= _('To join %s, you must:') % profile.name %></h1>
6		4
7	-<%= form_tag do %>
8	- <%= hidden_field_tag('back_to', @back_to) %>
9	- <%= hidden_field_tag(:confirmation, 1) %>
10	- <%= submit_button(:ok, _("Yes, I want to join.") % profile.name) %>
11	- <% if logged_in? && request.xhr? %>
12	- <%= modal_close_button _("No, I don't want") %>
13	- <% else %>
14	- <%= button(:cancel, _("No, I don't want."), profile.url) %>	5	+ <p>
		6	+ <%= _("Authorize the visibility of your email address to the community administrator.") %>
		7	+ </p>
		8	+
		9	+ <%= form_tag url_for({:action => :join_modal, :controller => :profile}) do %>
		10	+ <%= hidden_field_tag('back_to', @back_to) %>
		11	+ <%= submit_button(:ok, _("Authorize")) %>
		12	+ <%= modal_close_button _("Cancel") %>
15	<% end %>	13	<% end %>
16	-<% end %>	14	+
		15	+</div>
		16	+
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+<% if (task.organization.requires_email \|\| task.requestor.may_display_field_to?("email")) %>
	2	+ <div>
	3	+ Email:
	4	+ <span id="task_email"> <%=task.requestor.email %> </span>
	5	+ </div>
	6	+<% end %>
	7	+
	@@ -70,4 +70,10 @@		@@ -70,4 +70,10 @@
70	<% end %>	70	<% end %>
71	<% end %>	71	<% end %>
72		72
		73	+ <% if task.footer %>
		74	+ <div id="task-footer-<%=task.id%>">
		75	+ <%= render :partial => partial_for_class(task.class, nil, :footer), :locals => {:task => task} %>
		76	+ </div>
		77	+ <% end %>
		78	+
73	</div><!-- class="task_box" -->	79	</div><!-- class="task_box" -->
	@@ -1555,3 +1555,21 @@ table#recaptcha_table tr:hover td {		@@ -1555,3 +1555,21 @@ table#recaptcha_table tr:hover td {
1555	clear: both;	1555	clear: both;
1556	}	1556	}
1557		1557
		1558	+
		1559	+/************************* join community confirmation ******************************/
		1560	+
		1561	+.join-community-confirmation h1 {
		1562	+ font-variant: small-caps;
		1563	+ font-size: 20px;
		1564	+ color: #555753;
		1565	+ text-align: left;
		1566	+}
		1567	+
		1568	+.join-community-confirmation {
		1569	+ padding: 5px 20px 0px 20px;
		1570	+}
		1571	+
		1572	+.join-community-confirmation input.button.with-text {
		1573	+ padding-right: 4px;
		1574	+}
		1575	+
	@@ -23,4 +23,14 @@		@@ -23,4 +23,14 @@
23	});	23	});
24		24
25	});	25	});
		26	+
		27	+ $("#profile_data_closed_false").click(function(){
		28	+ $("#requires_email_option").prop("checked",false);
		29	+ $("#requires_email_option").hide();
		30	+ });
		31	+
		32	+ $("#profile_data_closed_true").click(function(){
		33	+ $("#requires_email_option").show();
		34	+ });
		35	+
26	})(jQuery);	36	})(jQuery);
	@@ -3,6 +3,8 @@ require 'profile_controller'		@@ -3,6 +3,8 @@ require 'profile_controller'
3		3
4	class ProfileControllerTest < ActionController::TestCase	4	class ProfileControllerTest < ActionController::TestCase
5		5
		6	+ include MembershipsHelper
		7	+
6	self.default_params = {profile: 'testuser'}	8	self.default_params = {profile: 'testuser'}
7	def setup	9	def setup
8	@profile = create_user('testuser').person	10	@profile = create_user('testuser').person
	@@ -384,6 +386,61 @@ class ProfileControllerTest < ActionController::TestCase		@@ -384,6 +386,61 @@ class ProfileControllerTest < ActionController::TestCase
384	assert_redirected_to :controller => 'account', :action => 'login'	386	assert_redirected_to :controller => 'account', :action => 'login'
385	end	387	end
386		388
		389	+ should 'show regular join button for person with public email' do
		390	+ community = Community.create!(:name => 'my test community', :closed => true, :requires_email => true)
		391	+ Person.any_instance.stubs(:public_fields).returns(["email"])
		392	+ login_as(@profile.identifier)
		393	+
		394	+ get :index, :profile => community.identifier
		395	+ assert_no_tag :tag => 'a', :attributes => { :class => /modal-toggle join-community/ }
		396	+ end
		397	+
		398	+ should 'show join modal for person with private email' do
		399	+ community = Community.create!(:name => 'my test community', :closed => true, :requires_email => true)
		400	+ Person.any_instance.stubs(:public_fields).returns([])
		401	+ login_as(@profile.identifier)
		402	+
		403	+ get :index, :profile => community.identifier
		404	+ assert_tag :tag => 'a', :attributes => { :class => /modal-toggle join-community/ }
		405	+ end
		406	+
		407	+ should 'show regular join button for community without email visibility requirement' do
		408	+ community = Community.create!(:name => 'my test community', :closed => true, :requires_email => false)
		409	+ Person.any_instance.stubs(:public_fields).returns([])
		410	+ login_as(@profile.identifier)
		411	+
		412	+ get :index, :profile => community.identifier
		413	+ assert_no_tag :tag => 'a', :attributes => { :class => /modal-toggle join-community/ }
		414	+ end
		415	+
		416	+ should 'show regular join button for community without email visibility requirement and person with public email' do
		417	+ community = Community.create!(:name => 'my test community', :closed => true, :requires_email => false)
		418	+ Person.any_instance.stubs(:public_fields).returns(['email'])
		419	+ login_as(@profile.identifier)
		420	+
		421	+ get :index, :profile => community.identifier
		422	+ assert_no_tag :tag => 'a', :attributes => { :class => /modal-toggle join-community/ }
		423	+ end
		424	+
		425	+ should 'render join modal for community with email visibility requirement and person with private email' do
		426	+ community = Community.create!(:name => 'my test community', :closed => true, :requires_email => true)
		427	+ login_as @profile.identifier
		428	+ post :join, :profile => community.identifier
		429	+ assert_template "join"
		430	+ end
		431	+
		432	+ should 'create add member task from join-community modal' do
		433	+ community = Community.create!(:name => 'my test community', :closed => true, :requires_email => true)
		434	+ admin = create_user('community-admin').person
		435	+ community.add_admin(admin)
		436	+
		437	+ login_as @profile.identifier
		438	+ assert_difference 'AddMember.count' do
		439	+ post :join_modal, :profile => community.identifier
		440	+ end
		441	+ assert_redirected_to :action => 'index'
		442	+ end
		443	+
387	should 'actually leave profile' do	444	should 'actually leave profile' do
388	community = fast_create(Community)	445	community = fast_create(Community)
389	admin = fast_create(Person)	446	admin = fast_create(Person)