Join community and add member through ajax

Also: * Adding links to the profile-image balloon. * Removing add-friend and join-community confirmation steps.

Join community and add member through ajax
Also: * Adding links to the profile-image balloon. * Removing add-friend and join-community confirmation steps.
Rodrigo Souto · Antonio Terceiro
1 parent 5bf571f1
Showing 19 changed files with 222 additions and 318 deletions Show diff stats
app/controllers/my_profile/friends_controller.rb
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
app/models/profile.rb
app/views/blocks/profile_info_actions/community.rhtml
app/views/blocks/profile_info_actions/person.rhtml
app/views/friends/add.rhtml
app/views/layouts/_javascript.rhtml
app/views/profile/_private_profile.rhtml
features/balloon.feature
features/join_community.feature
features/my_network_block.feature
features/private_profile.feature
public/javascripts/add-and-join.js
public/javascripts/application.js
public/stylesheets/application.css
test/functional/friends_controller_test.rb
test/functional/profile_controller_test.rb
test/unit/application_helper_test.rb
@@ -8,18 +8,6 @@ class FriendsController &lt; MyProfileController
     end
   end
-  def add
-    @friend = Person.find(params[:id])
-    if request.post? && params[:confirmation]
-      # FIXME this shouldn't be in Person model?
-      AddFriend.create!(:person => profile, :friend => @friend, :group_for_person => params[:group])
-
-      session[:notice] = _('%s still needs to accept being your friend.') % @friend.name
-      # FIXME shouldn't redirect to the friend's page?
-      redirect_to :action => 'index' 
-    end
-  end
-
   def remove
     @friend = profile.friends.find(params[:id])
     if request.post? && params[:confirmation]
 class ProfileController < PublicController
   needs_profile
-  before_filter :check_access_to_profile, :except => [:join, :index]
-  before_filter :store_before_join, :only => [:join]
-  before_filter :login_required, :only => [:join, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_scraps, :view_more_activities, :view_more_network_activities]
+  before_filter :check_access_to_profile, :except => [:join, :join_not_logged, :index]
+  before_filter :store_before_join, :only => [:join, :join_not_logged]
+  before_filter :login_required, :only => [:join, :join_not_logged, :leave, :unblock, :leave_scrap, :remove_scrap, :remove_activity, :view_more_scraps, :view_more_activities, :view_more_network_activities]
   helper TagsHelper
@@ -82,18 +82,26 @@ class ProfileController &lt; PublicController
   end
   def join
-    @wizard = params[:wizard]
-    if request.post? && params[:confirmation]
-      profile.add_member(current_user.person)
-      session[:notice] = _('%s administrator still needs to accept you as member.') % profile.name if profile.closed?
-      if @wizard
-        redirect_to :controller => 'search', :action => 'assets', :asset => 'communities', :wizard => true
+    if !user.memberships.include?(profile)
+      profile.add_member(user)
+      if profile.closed?
+        render :text => _('%s administrator still needs to accept you as member.') % profile.name
       else
-        redirect_to_before_join
+        render :text => _('You just became a member of %s.') % profile.name
       end
     else
-      if current_user.person.memberships.include?(profile)
-        session[:notice] = _('You are already a member of "%s"') % profile.name
+      render :text => _('You are already a member of %s.') % profile.name
+    end
+  end
+
+  def join_not_logged
+    if request.post?
+      profile.add_member(user)
+      session[:notice] = _('%s administrator still needs to accept you as member.') % profile.name if profile.closed?
+      redirect_to_before_join
+    else
+      if user.memberships.include?(profile)
+        session[:notice] = _('You are already a member of %s') % profile.name
         redirect_to profile.url
         return
       end
@@ -104,20 +112,37 @@ class ProfileController &lt; PublicController
   end
   def leave
-    @wizard = params[:wizard]
-    @back_to = params[:back_to] || request.referer
-    if request.post? && params[:confirmation]
+    if user.memberships.include?(profile)
       profile.remove_member(current_user.person)
-      if @wizard
-        redirect_to :controller => 'search', :action => 'assets', :asset => 'communities', :wizard => true
-      else
-        back = @back_to || profile.url
-        redirect_to back
-      end
+      render :text => _('You just left %s.') % profile.name
     else
-      if request.xhr?
-        render :layout => false
-      end
+      render :text => _('You are already a member of %s.') % profile.name
+    end
+  end
+
+  def check_membership
+    if user.memberships.include?(profile)
+      render :text => 'true'
+    else
+      render :text => 'false'
+    end
+  end
+
+  def add
+    # FIXME this shouldn't be in Person model?
+    if !user.memberships.include?(profile)
+      AddFriend.create!(:person => user, :friend => profile)
+      render :text => _('%s still needs to accept being your friend.') % profile.name
+    else
+      render :text => _('You are already a friend of %s.') % profile.name
+    end
+  end
+
+  def check_friendship
+    if user == profile || user.already_request_friendship?(profile) || user.is_a_friend?(profile)
+      render :text => 'true'
+    else
+      render :text => 'false'
     end
   end
@@ -515,24 +515,27 @@ module ApplicationHelper
     if environment.enabled?(:show_balloon_with_profile_links_when_clicked)
       if profile.kind_of?(Person)
         [
-          {_('Home Page') => url_for(profile.url)},
-          {_('Wall') => url_for(profile.public_profile_url)},
-          {_('Friends') => url_for(:controller => :profile, :action => :friends, :profile => profile.identifier)},
-          {_('Communities') => url_for(:controller => :profile, :action => :communities, :profile => profile.identifier)}
+          {_('Wall') => {:href => url_for(profile.public_profile_url)}},
+          {_('Friends') => {:href => url_for(:controller => :profile, :action => :friends, :profile => profile.identifier)}},
+          {_('Communities') => {:href => url_for(:controller => :profile, :action => :communities, :profile => profile.identifier)}},
+          {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email'}},
+          {_('Add') => {:href => url_for(profile.add_url), :class => 'add-friend'}}
         ]
       elsif profile.kind_of?(Community)
         [
-          {_('Home Page') => url_for(profile.url)},
-          {_('Wall') => url_for(profile.public_profile_url)},
-          {_('Members') => url_for(:controller => :profile, :action => :members, :profile => profile.identifier)},
-          {_('Agenda') => url_for(:controller => :profile, :action => :events, :profile => profile.identifier)}
+          {_('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'}},
+          {_('Leave') => {:href => url_for(profile.leave_url), :class => 'leave-community'}},
+          {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email'}}
         ]
       elsif profile.kind_of?(Enterprise)
         [
-          {_('Home Page') => url_for(profile.url)},
-          {_('Products') => catalog_path(profile.identifier)},
-          {_('Members') => url_for(:controller => :profile, :action => :members, :profile => profile.identifier)},
-          {_('Agenda') => url_for(:controller => :profile, :action => :events, :profile => profile.identifier)}
+          {_('Products') => {:href => catalog_path(profile.identifier)}},
+          {_('Members') => {:href => url_for(:controller => :profile, :action => :members, :profile => profile.identifier)}},
+          {_('Agenda') => {:href => url_for(:controller => :profile, :action => :events, :profile => profile.identifier)}},
+          {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email'}},
         ]
       else
         []
@@ -543,17 +546,24 @@ module ApplicationHelper
   # displays a link to the profile homepage with its image (as generated by
   # #profile_image) and its name below it.
   def profile_image_link( profile, size=:portrait, tag='li', extra_info = nil )
-    if profile.class == Person
-      name = profile.short_name
+    name = profile.short_name
+    if profile.person?
       city = content_tag 'span', content_tag( 'span', profile.city, :class => 'locality' ), :class => 'adr'
+      url = url_for(profile.check_friendship_url)
+      trigger_class = 'person-trigger'
     else
-      name = profile.short_name
       city = ''
+      url = url_for(profile.check_membership_url)
+      if profile.community?
+        trigger_class = 'community-trigger'
+      elsif profile.enterprise?
+        trigger_class = 'enterprise-trigger'
+      end
     end
     extra_info = extra_info.nil? ? '' : content_tag( 'span', extra_info, :class => 'extra_info' )
     links = links_for_balloon(profile)
     content_tag tag,
-        (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ? link_to( content_tag( 'span', _('Profile links')), '#', :onclick => "toggleSubmenu(this, '#{profile.short_name}', #{links.to_json}); return false", :class => 'menu-submenu-trigger' ) : "") +
+        (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ? link_to( content_tag( 'span', _('Profile links')), '#', :onclick => "toggleSubmenu(this, '#{profile.short_name}', #{links.to_json}); return false", :class => "menu-submenu-trigger #{trigger_class}", :url => url) : "") +
         link_to(
             content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
             content_tag( 'span', h(name), :class => ( profile.class == Person ? 'fn' : 'org' ) ) +
@@ -571,8 +581,9 @@ module ApplicationHelper
   def community_image_link( profile, size=:portrait, tag='li' )
     name = h(profile.name)
     links = links_for_balloon(profile)
+    url = url_for(profile.check_membership_url)
     content_tag tag,
-        (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ? link_to( content_tag( 'span', _('Profile links')), '#', :onclick => "toggleSubmenu(this, '#{profile.short_name}', #{links.to_json}); return false", :class => 'menu-submenu-trigger' ) : "") +
+        (environment.enabled?(:show_balloon_with_profile_links_when_clicked) ? link_to( content_tag( 'span', _('Profile links')), '#', :onclick => "toggleSubmenu(this, '#{profile.short_name}', #{links.to_json}); return false", :class => 'menu-submenu-trigger community-trigger', :url => url) : "") +
         link_to(
             content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
             content_tag( 'span', name, :class => 'org' ) +
@@ -426,6 +426,22 @@ class Profile &lt; ActiveRecord::Base
     { :profile => identifier, :controller => 'profile', :action => 'join' }
   end
+  def join_not_logged_url
+    { :profile => identifier, :controller => 'profile', :action => 'join_not_logged' }
+  end
+
+  def check_membership_url
+    { :profile => identifier, :controller => 'profile', :action => 'check_membership' }
+  end
+
+  def add_url
+    { :profile => identifier, :controller => 'profile', :action => 'add' }
+  end
+
+  def check_friendship_url
+    { :profile => identifier, :controller => 'profile', :action => 'check_friendship' }
+  end
+
   def public_profile_url
     generate_url(:profile => identifier, :controller => 'profile', :action => 'index')
   end
@@ -3,12 +3,14 @@
     <% if profile.members.include?(user) %>
       <li>
-        <%= lightbox_link_to content_tag('span', _('Leave')), profile.leave_url, :class => 'button with-text icon-delete', :title => _('Leave this community') %>
+        <%= button(:delete, content_tag('span', __('Leave')), profile.leave_url, :class => 'leave-community', :title => _("Leave community"), :style => 'position: relative;') %>
+        <%= button(:add, content_tag('span', __('Join')), profile.join_url, :class => 'join-community', :title => _("Join community"), :style => 'position: relative; display: none;') %>
       </li>
     <% else %>
       <% unless profile.already_request_membership?(user) %>
         <li>
-        <%= lightbox_link_to content_tag('span', _('Join')), profile.join_url, :class => 'button with-text icon-add', :title => _('Join this community') %>
+          <%= button(:delete, content_tag('span', __('Leave')), profile.leave_url, :class => 'leave-community', :title => _("Leave community"), :style => 'position: relative; display: none;') %>
+          <%= button(:add, content_tag('span', __('Join')), profile.join_url, :class => 'join-community', :title => _("Join community"), :style => 'position: relative;') %>
         </li>
       <% end %>
     <% end %>
@@ -22,7 +24,7 @@
   <% else %>
     <li>
-    <%= link_to content_tag('span', _('Join')), profile.join_url, :class => 'button with-text icon-add', :title => _('Join this community') %>
+      <%= link_to content_tag('span', _('Join')), profile.join_not_logged_url, :class => 'button with-text icon-add', :title => _('Join this community') %>
     </li>
   <% end %>
@@ -2,7 +2,9 @@
   <%if logged_in? && (user != profile) %>
     <% if !user.already_request_friendship?(profile) and !user.is_a_friend?(profile) %>
-      <li><%= link_to content_tag('span', __('Add friend')), user.url.merge(:controller => 'friends', :action => 'add', :id => profile.id), :class => 'button with-text icon-add' %></li>
+      <li>
+      <%= button(:add, content_tag('span', __('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
+      </li>
     <% end %>
     <% if user.is_a_friend?(profile) && profile.enable_contact? %>
@@ -1,26 +0,0 @@
-<h1><%= __('Adding %s as a friend') % @friend.name %></h1>
-
-<p>
-<%= __('Are you sure you want to add %s as your friend?') % @friend.name %>
-</p>
-
-<p>
-<em>
-<%= __('Note that %s will need to accept being added as your friend.') % @friend.name %>
-</em>
-</p>
-
-<% form_tag do %>
-  <%= hidden_field_tag(:confirmation, 1) %>
-
-  <div class="add-friend-tags">
-    <%= __('Classify your new friend %s: ') % @friend.name %>
-    <%= text_field_with_local_autocomplete('group', profile.suggested_friend_groups, :maxlength => 150) %>
-    <p>
-    <%= _('Suggestions: %s') % profile.suggested_friend_groups.join(', ') %>
-    </p>
-  </div>
-
-  <%= submit_button(:ok, __("Yes, I want to add %s as my friend") % @friend.name) %>
-  <%= button(:cancel, _("No, I don't want"), :action => 'index') %>
-<% end %>
-<%= javascript_include_tag :defaults, 'jquery-latest.js', 'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery.cookie', 'reflection', :cache => 'cache-general' %>
+<%= javascript_include_tag :defaults, 'jquery-latest.js', 'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery.cookie', 'reflection', 'add-and-join', :cache => 'cache-general' %>
@@ -7,10 +7,10 @@
 <% button_bar do %>
   <% if @action == :join && logged_in? %>
-    <%= lightbox_link_to content_tag('span', _('Join')), profile.join_url, :class => 'button with-text icon-add', :title => _('Join this community') %>
+    <%= button(:add, content_tag('span', __('Join')), profile.join_url, :class => 'join-community', :title => _("Join community"), :style => 'position: relative;') %>
   <% end %>
   <% if @action == :add_friend && logged_in? && !user.already_request_friendship?(profile) %>
-    <%= link_to content_tag('span', __('Add friend')), user.url.merge(:controller => 'friends', :action => 'add', :id => profile.id), :class => 'button with-text icon-add' %>
+    <%= button(:add, content_tag('span', __('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
   <% end %>
   <%= button :back, _('Go back'), :back %>
   <%= button :home, _("Go to %s home page") % environment.name, :controller => 'home' %>
@@ -38,7 +38,6 @@ Feature: balloon
     When I click ".menu-submenu-trigger"
     Then I should see "Profile"
     And I should see "Friends"
-    And I should see "Home Page"
   @selenium
   Scenario: I should see balloon when clicked on community block trigger
@@ -71,4 +70,3 @@ Feature: balloon
     When I click ".menu-submenu-trigger"
     Then I should see "Members"
     And I should see "Agenda"
-    And I should see "Home Page"
@@ -1,24 +0,0 @@
-Feature: join a community
-  As a user
-  I want to join a community
-  In order to interact with other people
-
-  Background:
-    Given the following users
-      | login | name |
-      | joaosilva | Joao Silva |
-    Given the following communities
-      | identifier | name |
-      | sample-community | Sample Community |
-
-  Scenario: ask confirmation before join community
-    Given I am logged in as "joaosilva"
-    And I am on Sample Community's homepage
-    When I follow "Join"
-    Then I should see "Are you sure you want to join Sample Community"
-
-  Scenario: dont ask confirmation before join community if already member
-    Given joaosilva is member of sample-community
-    And I am logged in as "joaosilva"
-    When I go to /profile/sample-community
-    Then I should not see "Are you sure you want to join Community to join"
@@ -23,7 +23,6 @@ Feature: my_network_block
     Then I should see "2 communities"
     When I go to Public Community's homepage
     And I follow "Join"
-    And I press "Yes, I want to join."
     When I go to Joao Silva's homepage
     Then I should see "3 communities"
@@ -37,7 +36,6 @@ Feature: my_network_block
     Then I should see "One community"
     When I go to Public Community's homepage
     And I follow "Join"
-    And I press "Yes, I want to join."
     When I go to Joao Silva's homepage
     Then I should see "2 communities"
@@ -17,7 +17,6 @@ Feature: private profiles
     When I go to Safernet's homepage
     Then I should see "members only"
     When I follow "Join"
-    And I press "Yes, I want to join"
     And "joao" is accepted on community "Safernet"
     Then "joao" should be a member of "Safernet"
     When I go to Safernet's homepage
@@ -27,5 +26,4 @@ Feature: private profiles
     Given I am logged in as "joao"
     When I go to shygirl's homepage
     Then I should see "friends only"
-    When I follow "Add friend"
-    And I press "Yes, I want"
+    And I follow "Add friend"
@@ -0,0 +1,94 @@
+jQuery(function($) {
+
+  $(".add-friend").live('click', function(){
+    clicked = $(this)
+    url = clicked.attr("href");
+    loading_for_button(this);
+    $.post(url, function(data){
+      clicked.fadeOut();
+      display_notice(data);
+    });
+    return false;
+  })
+
+  $(".join-community").live('click', function(){
+    clicked = $(this)
+    url = clicked.attr("href");
+    loading_for_button(this);
+    $.post(url, function(data){
+      clicked.fadeOut(function(){
+        clicked.css("display","none");
+        clicked.parent().parent().find(".leave-community").fadeIn();
+        clicked.parent().parent().find(".leave-community").css("display", "");
+      });
+      clicked.css("cursor","");
+      $(".small-loading").remove();
+      display_notice(data);
+    });
+    return false;
+  })
+
+  $(".leave-community").live('click', function(){
+    clicked = $(this)
+    url = clicked.attr("href");
+    loading_for_button(this);
+    $.post(url, function(data){
+      clicked.fadeOut(function(){
+        clicked.css("display","none");
+        clicked.parent().parent().find(".join-community").fadeIn();
+        clicked.parent().parent().find(".join-community").css("display", "");
+      });
+      clicked.css("cursor","");
+      $(".small-loading").remove();
+      display_notice(data);
+    });
+    return false;
+  })
+
+  $(".person-trigger").click(function(){
+    clicked = $(this);
+    url = clicked.attr("url");
+    $.get(url, function(data){
+      if(data == "true"){
+        clicked.parent().find(".add-friend").fadeOut(function(){
+          clicked.parent().find(".send-an-email").fadeIn();
+        })
+      }
+      else if(data == "false"){
+        clicked.parent().find(".send-an-email").fadeOut(function(){
+          clicked.parent().find(".add-friend").fadeIn();
+        });
+      }
+    })
+  })
+
+  $(".community-trigger").click(function(){
+    clicked = $(this);
+    url = clicked.attr("url");
+    $.get(url, function(data){
+      if(data == "true"){
+        clicked.parent().find(".join-community").fadeOut(function(){
+          clicked.parent().find(".leave-community").fadeIn();
+          clicked.parent().find(".send-an-email").fadeIn();
+        });
+      }
+      else if(data == "false"){
+        clicked.parent().find(".send-an-email").fadeOut();
+        clicked.parent().find(".leave-community").fadeOut(function(){
+          clicked.parent().find(".join-community").fadeIn();
+        });
+      }
+    })
+  })
+
+  $(".enterprise-trigger").click(function(){
+    clicked = $(this);
+    url = clicked.attr("url");
+    $.get(url, function(data){
+      if(data == "true")
+        clicked.parent().find(".send-an-email").fadeIn();
+      else if(data == "false")
+        clicked.parent().find(".send-an-email").fadeOut();
+    })
+  })
+});
@@ -263,7 +263,11 @@ function toggleSubmenu(trigger, title, link_list) {
   content.append('<h4>' + title + '</h4>');
   jQuery.each(link_list, function(index, link_hash) {
     for (label in link_hash) {
-      list.append('<li><a href="' + link_hash[label] + '">' + label + '</a></li>');
+      options = "";
+      jQuery.each(link_hash[label], function(option, value){
+        options += option +'="'+ value + '" ';
+      })
+      list.append('<li><a '+ options +'">' + label + '</a></li>');
     }
   });
   content.append(list);
@@ -2036,7 +2036,7 @@ div#activation_enterprise div {
 .profile-info-options {
   padding-top: 20px;
   text-align: right;
-  padding-right: 5px;
+  padding-right: 20px;
 }
 .profile-info-block {
@@ -34,23 +34,6 @@ class FriendsControllerTest &lt; Test::Unit::TestCase
     assert_kind_of Array, assigns(:friends)
   end
-  should 'confirm addition of new friend' do
-    get :add, :id => friend.id
-
-    assert_response :success
-    assert_template 'add'
-
-    ok("must load the friend being added to display") { friend == assigns(:friend) } 
-
-  end
-
-  should 'actually add friend' do
-    assert_difference AddFriend, :count do
-      post :add, :id => friend.id, :confirmation => '1'
-      assert_response :redirect
-    end
-  end
-
   should 'confirm removal of friend' do
     profile.add_friend(friend)
@@ -76,49 +76,22 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
     assert_kind_of Array, assigns(:favorite_enterprises)
   end
-  should 'render join template without layout when called with AJAX' do
+  should 'not render any template when joining community due to Ajax request' do
     community = Community.create!(:name => 'my test community')
     login_as(@profile.identifier)
-    @request.expects(:xhr?).returns(true).at_least_once
     get :join, :profile => community.identifier
     assert_response :success
-    assert_template 'join'
+    assert_template nil
     assert_no_tag :tag => 'html'
   end
-  should 'render join template with layout in general' do
-    community = Community.create!(:name => 'my test community')
-    login_as(@profile.identifier)
-    @request.expects(:xhr?).returns(false).at_least_once
-
-    get :join, :profile => community.identifier
-    assert_response :success
-    assert_template 'join'
-    assert_tag :tag => 'html'
-  end
-
-  should 'show Join This Community button for non-member users' do
-    login_as(@profile.identifier)
-    community = Community.create!(:name => 'my test community')
-    get :index, :profile => community.identifier
-    assert_tag :tag => 'a', :attributes => { :href => "/profile/#{community.identifier}/join" }
-  end
-
-  should 'not show Join This Community button for member users' do
+  should 'actually add friend' do
     login_as(@profile.identifier)
-    community = Community.create!(:name => 'my test community')
-    community.add_member(@profile)
-    get :index, :profile => community.identifier
-    assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/#{@profile.identifier}/memberships/join/#{community.id}" }
-
-  end
-
-  should 'not show Join This Community button for non-registered users' do
-    community = Community.create!(:name => 'my test community')
-    get :index, :profile => community.identifier
-    assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/#{@profile.identifier}/memberships/leave/#{community.id}" }
-
+    person = fast_create(Person)
+    assert_difference AddFriend, :count do
+      post :add, :profile => person.identifier
+    end
   end
   should 'not show enterprises link to enterprise' do
@@ -199,26 +172,10 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
     assert_no_tag :tag => 'a', :child => { :tag => 'span', :content => 'Create a new community' }
   end
-  should 'not show Leave This Community button for non-member users' do
-    login_as(@profile.identifier)
-    community = Community.create!(:name => 'my test community')
-    get :index, :profile => community.identifier
-    assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/#{@profile.identifier}/memberships/leave/#{community.id}" }
-  end
-
-  should 'show Leave This Community button for member users' do
-    login_as(@profile.identifier)
-    community = Community.create!(:name => 'my test community')
-    community.add_member(@profile)
-    get :index, :profile => community.identifier
-    assert_tag :tag => 'a',
-      :attributes => { :href => "/profile/#{community.identifier}/leave" }
-  end
-
   should 'not show Leave This Community button for non-registered users' do
     community = Community.create!(:name => 'my test community')
     get :index, :profile => community.identifier
-    assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/#{@profile.identifier}/memberships/leave/#{community.id}" }
+    assert_no_tag :tag => 'a', :attributes => { :href => "/profile/#{@profile.identifier}/leave" }
   end
   should 'check access before displaying profile' do
@@ -414,34 +371,13 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
     assert_no_tag :tag => 'a', :attributes => { :href => "/contact/#{community.identifier}/new" }
   end
-  should 'present confirmation before joining a profile' do
-    community = Community.create!(:name => 'my test community')
-    login_as @profile.identifier
-    get :join, :profile => community.identifier
-
-    assert_response :success
-    assert_template 'join'
-  end
-
   should 'actually join profile' do
     community = Community.create!(:name => 'my test community')
     login_as @profile.identifier
-    post :join, :profile => community.identifier, :confirmation => '1'
-
-    assert_response :redirect
-    assert_redirected_to community.url
-
-    profile = Profile.find(@profile.id)
-    assert profile.memberships.include?(community), 'profile should be actually added to the community'
-  end
+    post :join, :profile => community.identifier
-  should 'join profile from wizard' do
-    community = Community.create!(:name => 'my test community')
-    login_as @profile.identifier
-    post :join, :profile => community.identifier, :confirmation => '1', :wizard => true
-
-    assert_response :redirect
-    assert_redirected_to :controller => 'search', :action => 'assets', :asset => 'communities', :wizard => true
+    assert_response :success
+    assert_template nil
     profile = Profile.find(@profile.id)
     assert profile.memberships.include?(community), 'profile should be actually added to the community'
@@ -451,7 +387,7 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
     community = Community.create!(:name => 'my test community', :closed => true)
     login_as @profile.identifier
     assert_difference AddMember, :count do
-      post :join, :profile => community.identifier, :confirmation => '1'
+      post :join, :profile => community.identifier
     end
   end
@@ -462,74 +398,18 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
     assert_redirected_to :controller => 'account', :action => 'login'
   end
-  should 'present confirmation before leaving a profile' do
-    community = Community.create!(:name => 'my test community')
-    community.add_member(profile)
-
-    login_as(profile.identifier)
-    get :leave, :profile => community.identifier
-
-    assert_template 'leave'
-    assert_tag :tag => 'input', :attributes => {:value => 'Yes, I want to leave.', :type => 'submit'}
-  end
-
   should 'actually leave profile' do
     community = Community.create!(:name => 'my test community')
     community.add_member(profile)
     assert_includes profile.memberships, community
     login_as(profile.identifier)
-    post :leave, :profile => community.identifier, :confirmation => '1'
-
-    profile = Profile.find(@profile.id)
-    assert_not_includes profile.memberships, community
-  end
-
-  should 'leave profile when on wizard' do
-    community = Community.create!(:name => 'my test community')
-    community.add_member(profile)
-
-    login_as(profile.identifier)
-    post :leave, :profile => community.identifier, :confirmation => '1', :wizard => true
-
-    assert_response :redirect
-    assert_redirected_to :controller => 'search', :action => 'assets', :asset => 'communities', :wizard => true
+    post :leave, :profile => community.identifier
     profile = Profile.find(@profile.id)
     assert_not_includes profile.memberships, community
   end
-  should "offer button to close 'leave community' lightbox" do
-    community = Community.create!(:name => 'my test community')
-    community.add_member(profile)
-
-    login_as(profile.identifier)
-    get :index, :profile => community.identifier
-
-    assert_tag :tag => 'a', :content => 'Leave', :attributes => { :href => "/profile/#{community.identifier}/leave", :class => /^lbOn/ }
-  end
-
-  should 'offer button to cancel leaving community' do
-    community = Community.create!(:name => 'my test community')
-    community.add_member(profile)
-
-    login_as(profile.identifier)
-    get :leave, :profile => community.identifier
-
-    assert_tag :tag => 'a', :content => "No, I don't want."
-  end
-
-  should 'render without layout when use lightbox to leave community' do
-    community = Community.create!(:name => 'my test community')
-    community.add_member(profile)
-
-    @request.stubs(:xhr?).returns(true)
-    login_as(profile.identifier)
-    get :leave, :profile => community.identifier
-
-    assert_no_tag :tag => 'body' # e.g. no layout
-  end
-
   should 'require login to leave community' do
     community = Community.create!(:name => 'my test community')
     get :leave, :profile => community.identifier
@@ -537,51 +417,6 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
     assert_redirected_to :controller => 'account', :action => 'login'
   end
-  should 'redirect to stored location after leave community' do
-    community = Community.create!(:name => 'my test community')
-    community.add_member(profile)
-
-    @request.expects(:referer).returns("/profile/#{community.identifier}/to_go").at_least_once
-    login_as(profile.identifier)
-
-    post :leave, :profile => community.identifier, :confirmation => '1', :back_to => @request.referer
-
-    assert_redirected_to "/profile/#{community.identifier}/to_go"
-  end
-
-  should 'store referer location when request leave via get' do
-    community = Community.create!(:name => 'my test community')
-    login_as(profile.identifier)
-
-    @request.expects(:referer).returns("/profile/redirect_to").at_least_once
-
-    get :leave, :profile => community.identifier
-
-    assert_tag :tag => 'input', :attributes => { :type => 'hidden', :name => 'back_to', :value => @request.referer }
-  end
-
-  should 'store referer location when request join via get' do
-    community = Community.create!(:name => 'my test community')
-    login_as(profile.identifier)
-
-    @request.session[:before_join] = "/profile/redirect_to"
-
-    get :join, :profile => community.identifier
-
-    assert_equal '/profile/redirect_to', @request.session[:before_join]
-  end
-
-  should 'redirect to stored location after join community' do
-    community = Community.create!(:name => 'my test community')
-
-    @request.expects(:referer).returns("/profile/#{community.identifier}/to_go")
-    login_as(profile.identifier)
-
-    post :join, :profile => community.identifier, :confirmation => '1'
-
-    assert_redirected_to "/profile/#{community.identifier}/to_go"
-  end
-
   should 'store location before login when request join via get not logged' do
     community = Community.create!(:name => 'my test community')
@@ -598,7 +433,7 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
     @request.expects(:referer).returns("/profile/#{community.identifier}/to_go")
     login_as(profile.identifier)
-    post :join, :profile => community.identifier, :confirmation => '1'
+    post :join_not_logged, :profile => community.identifier
     assert_redirected_to "/profile/#{community.identifier}/to_go"
@@ -484,7 +484,7 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
     person.stubs(:url).returns('url for person')
     person.stubs(:public_profile_url).returns('url for person')
     links = links_for_balloon(person)
-    assert_equal ['Home Page', 'Wall', 'Friends', 'Communities'], links.map{|i| i.keys.first}
+    assert_equal ['Wall', 'Friends', 'Communities', 'Send an e-mail', 'Add'], links.map{|i| i.keys.first}
   end
   should 'return ordered list of links to balloon to Community' do
@@ -495,7 +495,7 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
     community.stubs(:url).returns('url for community')
     community.stubs(:public_profile_url).returns('url for community')
     links = links_for_balloon(community)
-    assert_equal ['Home Page', 'Wall', 'Members', 'Agenda'], links.map{|i| i.keys.first}
+    assert_equal ['Wall', 'Members', 'Agenda', 'Join', 'Leave', 'Send an e-mail'], links.map{|i| i.keys.first}
   end
   should 'return ordered list of links to balloon to Enterprise' do
@@ -507,7 +507,7 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
     enterprise.stubs(:public_profile_url).returns('url for enterprise')
     stubs(:catalog_path)
     links = links_for_balloon(enterprise)
-    assert_equal ['Home Page', 'Products', 'Members', 'Agenda'], links.map{|i| i.keys.first}
+    assert_equal ['Products', 'Members', 'Agenda', 'Send an e-mail'], links.map{|i| i.keys.first}
   end
   should 'use favicon from environment theme if does not have profile' do
	@@ -8,18 +8,6 @@ class FriendsController < MyProfileController		@@ -8,18 +8,6 @@ class FriendsController < MyProfileController
8	end	8	end
9	end	9	end
10		10
11	- def add
12	- @friend = Person.find(params[:id])
13	- if request.post? && params[:confirmation]
14	- # FIXME this shouldn't be in Person model?
15	- AddFriend.create!(:person => profile, :friend => @friend, :group_for_person => params[:group])
16	-
17	- session[:notice] = _('%s still needs to accept being your friend.') % @friend.name
18	- # FIXME shouldn't redirect to the friend's page?
19	- redirect_to :action => 'index'
20	- end
21	- end
22	-
23	def remove	11	def remove
24	@friend = profile.friends.find(params[:id])	12	@friend = profile.friends.find(params[:id])
25	if request.post? && params[:confirmation]	13	if request.post? && params[:confirmation]
	@@ -426,6 +426,22 @@ class Profile < ActiveRecord::Base		@@ -426,6 +426,22 @@ class Profile < ActiveRecord::Base
426	{ :profile => identifier, :controller => 'profile', :action => 'join' }	426	{ :profile => identifier, :controller => 'profile', :action => 'join' }
427	end	427	end
428		428
		429	+ def join_not_logged_url
		430	+ { :profile => identifier, :controller => 'profile', :action => 'join_not_logged' }
		431	+ end
		432	+
		433	+ def check_membership_url
		434	+ { :profile => identifier, :controller => 'profile', :action => 'check_membership' }
		435	+ end
		436	+
		437	+ def add_url
		438	+ { :profile => identifier, :controller => 'profile', :action => 'add' }
		439	+ end
		440	+
		441	+ def check_friendship_url
		442	+ { :profile => identifier, :controller => 'profile', :action => 'check_friendship' }
		443	+ end
		444	+
429	def public_profile_url	445	def public_profile_url
430	generate_url(:profile => identifier, :controller => 'profile', :action => 'index')	446	generate_url(:profile => identifier, :controller => 'profile', :action => 'index')
431	end	447	end
	@@ -1,26 +0,0 @@	@@ -1,26 +0,0 @@
1	-<h1><%= __('Adding %s as a friend') % @friend.name %></h1>
2	-
3	-<p>
4	-<%= __('Are you sure you want to add %s as your friend?') % @friend.name %>
5	-</p>
6	-
7	-<p>
8	-<em>
9	-<%= __('Note that %s will need to accept being added as your friend.') % @friend.name %>
10	-</em>
11	-</p>
12	-
13	-<% form_tag do %>
14	- <%= hidden_field_tag(:confirmation, 1) %>
15	-
16	- <div class="add-friend-tags">
17	- <%= __('Classify your new friend %s: ') % @friend.name %>
18	- <%= text_field_with_local_autocomplete('group', profile.suggested_friend_groups, :maxlength => 150) %>
19	- <p>
20	- <%= _('Suggestions: %s') % profile.suggested_friend_groups.join(', ') %>
21	- </p>
22	- </div>
23	-
24	- <%= submit_button(:ok, __("Yes, I want to add %s as my friend") % @friend.name) %>
25	- <%= button(:cancel, _("No, I don't want"), :action => 'index') %>
26	-<% end %>
	@@ -7,10 +7,10 @@		@@ -7,10 +7,10 @@
7		7
8	<% button_bar do %>	8	<% button_bar do %>
9	<% if @action == :join && logged_in? %>	9	<% if @action == :join && logged_in? %>
10	- <%= lightbox_link_to content_tag('span', _('Join')), profile.join_url, :class => 'button with-text icon-add', :title => _('Join this community') %>	10	+ <%= button(:add, content_tag('span', __('Join')), profile.join_url, :class => 'join-community', :title => _("Join community"), :style => 'position: relative;') %>
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	- <%= link_to content_tag('span', __('Add friend')), user.url.merge(:controller => 'friends', :action => 'add', :id => profile.id), :class => 'button with-text icon-add' %>	13	+ <%= button(:add, content_tag('span', __('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
14	<% end %>	14	<% end %>
15	<%= button :back, _('Go back'), :back %>	15	<%= button :back, _('Go back'), :back %>
16	<%= button :home, _("Go to %s home page") % environment.name, :controller => 'home' %>	16	<%= button :home, _("Go to %s home page") % environment.name, :controller => 'home' %>
	@@ -1,24 +0,0 @@	@@ -1,24 +0,0 @@
1	-Feature: join a community
2	- As a user
3	- I want to join a community
4	- In order to interact with other people
5	-
6	- Background:
7	- Given the following users
8	- \| login \| name \|
9	- \| joaosilva \| Joao Silva \|
10	- Given the following communities
11	- \| identifier \| name \|
12	- \| sample-community \| Sample Community \|
13	-
14	- Scenario: ask confirmation before join community
15	- Given I am logged in as "joaosilva"
16	- And I am on Sample Community's homepage
17	- When I follow "Join"
18	- Then I should see "Are you sure you want to join Sample Community"
19	-
20	- Scenario: dont ask confirmation before join community if already member
21	- Given joaosilva is member of sample-community
22	- And I am logged in as "joaosilva"
23	- When I go to /profile/sample-community
24	- Then I should not see "Are you sure you want to join Community to join"
@@ -0,0 +1,94 @@		@@ -0,0 +1,94 @@
	1	+jQuery(function($) {
	2	+
	3	+ $(".add-friend").live('click', function(){
	4	+ clicked = $(this)
	5	+ url = clicked.attr("href");
	6	+ loading_for_button(this);
	7	+ $.post(url, function(data){
	8	+ clicked.fadeOut();
	9	+ display_notice(data);
	10	+ });
	11	+ return false;
	12	+ })
	13	+
	14	+ $(".join-community").live('click', function(){
	15	+ clicked = $(this)
	16	+ url = clicked.attr("href");
	17	+ loading_for_button(this);
	18	+ $.post(url, function(data){
	19	+ clicked.fadeOut(function(){
	20	+ clicked.css("display","none");
	21	+ clicked.parent().parent().find(".leave-community").fadeIn();
	22	+ clicked.parent().parent().find(".leave-community").css("display", "");
	23	+ });
	24	+ clicked.css("cursor","");
	25	+ $(".small-loading").remove();
	26	+ display_notice(data);
	27	+ });
	28	+ return false;
	29	+ })
	30	+
	31	+ $(".leave-community").live('click', function(){
	32	+ clicked = $(this)
	33	+ url = clicked.attr("href");
	34	+ loading_for_button(this);
	35	+ $.post(url, function(data){
	36	+ clicked.fadeOut(function(){
	37	+ clicked.css("display","none");
	38	+ clicked.parent().parent().find(".join-community").fadeIn();
	39	+ clicked.parent().parent().find(".join-community").css("display", "");
	40	+ });
	41	+ clicked.css("cursor","");
	42	+ $(".small-loading").remove();
	43	+ display_notice(data);
	44	+ });
	45	+ return false;
	46	+ })
	47	+
	48	+ $(".person-trigger").click(function(){
	49	+ clicked = $(this);
	50	+ url = clicked.attr("url");
	51	+ $.get(url, function(data){
	52	+ if(data == "true"){
	53	+ clicked.parent().find(".add-friend").fadeOut(function(){
	54	+ clicked.parent().find(".send-an-email").fadeIn();
	55	+ })
	56	+ }
	57	+ else if(data == "false"){
	58	+ clicked.parent().find(".send-an-email").fadeOut(function(){
	59	+ clicked.parent().find(".add-friend").fadeIn();
	60	+ });
	61	+ }
	62	+ })
	63	+ })
	64	+
	65	+ $(".community-trigger").click(function(){
	66	+ clicked = $(this);
	67	+ url = clicked.attr("url");
	68	+ $.get(url, function(data){
	69	+ if(data == "true"){
	70	+ clicked.parent().find(".join-community").fadeOut(function(){
	71	+ clicked.parent().find(".leave-community").fadeIn();
	72	+ clicked.parent().find(".send-an-email").fadeIn();
	73	+ });
	74	+ }
	75	+ else if(data == "false"){
	76	+ clicked.parent().find(".send-an-email").fadeOut();
	77	+ clicked.parent().find(".leave-community").fadeOut(function(){
	78	+ clicked.parent().find(".join-community").fadeIn();
	79	+ });
	80	+ }
	81	+ })
	82	+ })
	83	+
	84	+ $(".enterprise-trigger").click(function(){
	85	+ clicked = $(this);
	86	+ url = clicked.attr("url");
	87	+ $.get(url, function(data){
	88	+ if(data == "true")
	89	+ clicked.parent().find(".send-an-email").fadeIn();
	90	+ else if(data == "false")
	91	+ clicked.parent().find(".send-an-email").fadeOut();
	92	+ })
	93	+ })
	94	+});
	@@ -2036,7 +2036,7 @@ div#activation_enterprise div {		@@ -2036,7 +2036,7 @@ div#activation_enterprise div {
2036	.profile-info-options {	2036	.profile-info-options {
2037	padding-top: 20px;	2037	padding-top: 20px;
2038	text-align: right;	2038	text-align: right;
2039	- padding-right: 5px;	2039	+ padding-right: 20px;
2040	}	2040	}
2041		2041
2042	.profile-info-block {	2042	.profile-info-block {
	@@ -34,23 +34,6 @@ class FriendsControllerTest < Test::Unit::TestCase		@@ -34,23 +34,6 @@ class FriendsControllerTest < Test::Unit::TestCase
34	assert_kind_of Array, assigns(:friends)	34	assert_kind_of Array, assigns(:friends)
35	end	35	end
36		36
37	- should 'confirm addition of new friend' do
38	- get :add, :id => friend.id
39	-
40	- assert_response :success
41	- assert_template 'add'
42	-
43	- ok("must load the friend being added to display") { friend == assigns(:friend) }
44	-
45	- end
46	-
47	- should 'actually add friend' do
48	- assert_difference AddFriend, :count do
49	- post :add, :id => friend.id, :confirmation => '1'
50	- assert_response :redirect
51	- end
52	- end
53	-
54	should 'confirm removal of friend' do	37	should 'confirm removal of friend' do
55	profile.add_friend(friend)	38	profile.add_friend(friend)
56		39
	@@ -76,49 +76,22 @@ class ProfileControllerTest < Test::Unit::TestCase		@@ -76,49 +76,22 @@ class ProfileControllerTest < Test::Unit::TestCase
76	assert_kind_of Array, assigns(:favorite_enterprises)	76	assert_kind_of Array, assigns(:favorite_enterprises)
77	end	77	end
78		78
79	- should 'render join template without layout when called with AJAX' do	79	+ should 'not render any template when joining community due to Ajax request' do
80	community = Community.create!(:name => 'my test community')	80	community = Community.create!(:name => 'my test community')
81	login_as(@profile.identifier)	81	login_as(@profile.identifier)
82	- @request.expects(:xhr?).returns(true).at_least_once
83		82
84	get :join, :profile => community.identifier	83	get :join, :profile => community.identifier
85	assert_response :success	84	assert_response :success
86	- assert_template 'join'	85	+ assert_template nil
87	assert_no_tag :tag => 'html'	86	assert_no_tag :tag => 'html'
88	end	87	end
89		88
90	- should 'render join template with layout in general' do
91	- community = Community.create!(:name => 'my test community')
92	- login_as(@profile.identifier)
93	- @request.expects(:xhr?).returns(false).at_least_once
94	-
95	- get :join, :profile => community.identifier
96	- assert_response :success
97	- assert_template 'join'
98	- assert_tag :tag => 'html'
99	- end
100	-
101	- should 'show Join This Community button for non-member users' do
102	- login_as(@profile.identifier)
103	- community = Community.create!(:name => 'my test community')
104	- get :index, :profile => community.identifier
105	- assert_tag :tag => 'a', :attributes => { :href => "/profile/#{community.identifier}/join" }
106	- end
107	-
108	- should 'not show Join This Community button for member users' do	89	+ should 'actually add friend' do
109	login_as(@profile.identifier)	90	login_as(@profile.identifier)
110	- community = Community.create!(:name => 'my test community')
111	- community.add_member(@profile)
112	- get :index, :profile => community.identifier
113	- assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/#{@profile.identifier}/memberships/join/#{community.id}" }
114	-
115	- end
116	-
117	- should 'not show Join This Community button for non-registered users' do
118	- community = Community.create!(:name => 'my test community')
119	- get :index, :profile => community.identifier
120	- assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/#{@profile.identifier}/memberships/leave/#{community.id}" }
121	-	91	+ person = fast_create(Person)
		92	+ assert_difference AddFriend, :count do
		93	+ post :add, :profile => person.identifier
		94	+ end
122	end	95	end
123		96
124	should 'not show enterprises link to enterprise' do	97	should 'not show enterprises link to enterprise' do
	@@ -199,26 +172,10 @@ class ProfileControllerTest < Test::Unit::TestCase		@@ -199,26 +172,10 @@ class ProfileControllerTest < Test::Unit::TestCase
199	assert_no_tag :tag => 'a', :child => { :tag => 'span', :content => 'Create a new community' }	172	assert_no_tag :tag => 'a', :child => { :tag => 'span', :content => 'Create a new community' }
200	end	173	end
201		174
202	- should 'not show Leave This Community button for non-member users' do
203	- login_as(@profile.identifier)
204	- community = Community.create!(:name => 'my test community')
205	- get :index, :profile => community.identifier
206	- assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/#{@profile.identifier}/memberships/leave/#{community.id}" }
207	- end
208	-
209	- should 'show Leave This Community button for member users' do
210	- login_as(@profile.identifier)
211	- community = Community.create!(:name => 'my test community')
212	- community.add_member(@profile)
213	- get :index, :profile => community.identifier
214	- assert_tag :tag => 'a',
215	- :attributes => { :href => "/profile/#{community.identifier}/leave" }
216	- end
217	-
218	should 'not show Leave This Community button for non-registered users' do	175	should 'not show Leave This Community button for non-registered users' do
219	community = Community.create!(:name => 'my test community')	176	community = Community.create!(:name => 'my test community')
220	get :index, :profile => community.identifier	177	get :index, :profile => community.identifier
221	- assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/#{@profile.identifier}/memberships/leave/#{community.id}" }	178	+ assert_no_tag :tag => 'a', :attributes => { :href => "/profile/#{@profile.identifier}/leave" }
222	end	179	end
223		180
224	should 'check access before displaying profile' do	181	should 'check access before displaying profile' do
	@@ -414,34 +371,13 @@ class ProfileControllerTest < Test::Unit::TestCase		@@ -414,34 +371,13 @@ class ProfileControllerTest < Test::Unit::TestCase
414	assert_no_tag :tag => 'a', :attributes => { :href => "/contact/#{community.identifier}/new" }	371	assert_no_tag :tag => 'a', :attributes => { :href => "/contact/#{community.identifier}/new" }
415	end	372	end
416		373
417	- should 'present confirmation before joining a profile' do
418	- community = Community.create!(:name => 'my test community')
419	- login_as @profile.identifier
420	- get :join, :profile => community.identifier
421	-
422	- assert_response :success
423	- assert_template 'join'
424	- end
425	-
426	should 'actually join profile' do	374	should 'actually join profile' do
427	community = Community.create!(:name => 'my test community')	375	community = Community.create!(:name => 'my test community')
428	login_as @profile.identifier	376	login_as @profile.identifier
429	- post :join, :profile => community.identifier, :confirmation => '1'
430	-
431	- assert_response :redirect
432	- assert_redirected_to community.url
433	-
434	- profile = Profile.find(@profile.id)
435	- assert profile.memberships.include?(community), 'profile should be actually added to the community'
436	- end	377	+ post :join, :profile => community.identifier
437		378
438	- should 'join profile from wizard' do
439	- community = Community.create!(:name => 'my test community')
440	- login_as @profile.identifier
441	- post :join, :profile => community.identifier, :confirmation => '1', :wizard => true
442	-
443	- assert_response :redirect
444	- assert_redirected_to :controller => 'search', :action => 'assets', :asset => 'communities', :wizard => true	379	+ assert_response :success
		380	+ assert_template nil
445		381
446	profile = Profile.find(@profile.id)	382	profile = Profile.find(@profile.id)
447	assert profile.memberships.include?(community), 'profile should be actually added to the community'	383	assert profile.memberships.include?(community), 'profile should be actually added to the community'
	@@ -451,7 +387,7 @@ class ProfileControllerTest < Test::Unit::TestCase		@@ -451,7 +387,7 @@ class ProfileControllerTest < Test::Unit::TestCase
451	community = Community.create!(:name => 'my test community', :closed => true)	387	community = Community.create!(:name => 'my test community', :closed => true)
452	login_as @profile.identifier	388	login_as @profile.identifier
453	assert_difference AddMember, :count do	389	assert_difference AddMember, :count do
454	- post :join, :profile => community.identifier, :confirmation => '1'	390	+ post :join, :profile => community.identifier
455	end	391	end
456	end	392	end
457		393
	@@ -462,74 +398,18 @@ class ProfileControllerTest < Test::Unit::TestCase		@@ -462,74 +398,18 @@ class ProfileControllerTest < Test::Unit::TestCase
462	assert_redirected_to :controller => 'account', :action => 'login'	398	assert_redirected_to :controller => 'account', :action => 'login'
463	end	399	end
464		400
465	- should 'present confirmation before leaving a profile' do
466	- community = Community.create!(:name => 'my test community')
467	- community.add_member(profile)
468	-
469	- login_as(profile.identifier)
470	- get :leave, :profile => community.identifier
471	-
472	- assert_template 'leave'
473	- assert_tag :tag => 'input', :attributes => {:value => 'Yes, I want to leave.', :type => 'submit'}
474	- end
475	-
476	should 'actually leave profile' do	401	should 'actually leave profile' do
477	community = Community.create!(:name => 'my test community')	402	community = Community.create!(:name => 'my test community')
478	community.add_member(profile)	403	community.add_member(profile)
479	assert_includes profile.memberships, community	404	assert_includes profile.memberships, community
480		405
481	login_as(profile.identifier)	406	login_as(profile.identifier)
482	- post :leave, :profile => community.identifier, :confirmation => '1'
483	-
484	- profile = Profile.find(@profile.id)
485	- assert_not_includes profile.memberships, community
486	- end
487	-
488	- should 'leave profile when on wizard' do
489	- community = Community.create!(:name => 'my test community')
490	- community.add_member(profile)
491	-
492	- login_as(profile.identifier)
493	- post :leave, :profile => community.identifier, :confirmation => '1', :wizard => true
494	-
495	- assert_response :redirect
496	- assert_redirected_to :controller => 'search', :action => 'assets', :asset => 'communities', :wizard => true	407	+ post :leave, :profile => community.identifier
497		408
498	profile = Profile.find(@profile.id)	409	profile = Profile.find(@profile.id)
499	assert_not_includes profile.memberships, community	410	assert_not_includes profile.memberships, community
500	end	411	end
501		412
502	- should "offer button to close 'leave community' lightbox" do
503	- community = Community.create!(:name => 'my test community')
504	- community.add_member(profile)
505	-
506	- login_as(profile.identifier)
507	- get :index, :profile => community.identifier
508	-
509	- assert_tag :tag => 'a', :content => 'Leave', :attributes => { :href => "/profile/#{community.identifier}/leave", :class => /^lbOn/ }
510	- end
511	-
512	- should 'offer button to cancel leaving community' do
513	- community = Community.create!(:name => 'my test community')
514	- community.add_member(profile)
515	-
516	- login_as(profile.identifier)
517	- get :leave, :profile => community.identifier
518	-
519	- assert_tag :tag => 'a', :content => "No, I don't want."
520	- end
521	-
522	- should 'render without layout when use lightbox to leave community' do
523	- community = Community.create!(:name => 'my test community')
524	- community.add_member(profile)
525	-
526	- @request.stubs(:xhr?).returns(true)
527	- login_as(profile.identifier)
528	- get :leave, :profile => community.identifier
529	-
530	- assert_no_tag :tag => 'body' # e.g. no layout
531	- end
532	-
533	should 'require login to leave community' do	413	should 'require login to leave community' do
534	community = Community.create!(:name => 'my test community')	414	community = Community.create!(:name => 'my test community')
535	get :leave, :profile => community.identifier	415	get :leave, :profile => community.identifier
	@@ -537,51 +417,6 @@ class ProfileControllerTest < Test::Unit::TestCase		@@ -537,51 +417,6 @@ class ProfileControllerTest < Test::Unit::TestCase
537	assert_redirected_to :controller => 'account', :action => 'login'	417	assert_redirected_to :controller => 'account', :action => 'login'
538	end	418	end
539		419
540	- should 'redirect to stored location after leave community' do
541	- community = Community.create!(:name => 'my test community')
542	- community.add_member(profile)
543	-
544	- @request.expects(:referer).returns("/profile/#{community.identifier}/to_go").at_least_once
545	- login_as(profile.identifier)
546	-
547	- post :leave, :profile => community.identifier, :confirmation => '1', :back_to => @request.referer
548	-
549	- assert_redirected_to "/profile/#{community.identifier}/to_go"
550	- end
551	-
552	- should 'store referer location when request leave via get' do
553	- community = Community.create!(:name => 'my test community')
554	- login_as(profile.identifier)
555	-
556	- @request.expects(:referer).returns("/profile/redirect_to").at_least_once
557	-
558	- get :leave, :profile => community.identifier
559	-
560	- assert_tag :tag => 'input', :attributes => { :type => 'hidden', :name => 'back_to', :value => @request.referer }
561	- end
562	-
563	- should 'store referer location when request join via get' do
564	- community = Community.create!(:name => 'my test community')
565	- login_as(profile.identifier)
566	-
567	- @request.session[:before_join] = "/profile/redirect_to"
568	-
569	- get :join, :profile => community.identifier
570	-
571	- assert_equal '/profile/redirect_to', @request.session[:before_join]
572	- end
573	-
574	- should 'redirect to stored location after join community' do
575	- community = Community.create!(:name => 'my test community')
576	-
577	- @request.expects(:referer).returns("/profile/#{community.identifier}/to_go")
578	- login_as(profile.identifier)
579	-
580	- post :join, :profile => community.identifier, :confirmation => '1'
581	-
582	- assert_redirected_to "/profile/#{community.identifier}/to_go"
583	- end
584	-
585	should 'store location before login when request join via get not logged' do	420	should 'store location before login when request join via get not logged' do
586	community = Community.create!(:name => 'my test community')	421	community = Community.create!(:name => 'my test community')
587		422
	@@ -598,7 +433,7 @@ class ProfileControllerTest < Test::Unit::TestCase		@@ -598,7 +433,7 @@ class ProfileControllerTest < Test::Unit::TestCase
598	@request.expects(:referer).returns("/profile/#{community.identifier}/to_go")	433	@request.expects(:referer).returns("/profile/#{community.identifier}/to_go")
599	login_as(profile.identifier)	434	login_as(profile.identifier)
600		435
601	- post :join, :profile => community.identifier, :confirmation => '1'	436	+ post :join_not_logged, :profile => community.identifier
602		437
603	assert_redirected_to "/profile/#{community.identifier}/to_go"	438	assert_redirected_to "/profile/#{community.identifier}/to_go"
604		439
	@@ -484,7 +484,7 @@ class ApplicationHelperTest < Test::Unit::TestCase		@@ -484,7 +484,7 @@ class ApplicationHelperTest < Test::Unit::TestCase
484	person.stubs(:url).returns('url for person')	484	person.stubs(:url).returns('url for person')
485	person.stubs(:public_profile_url).returns('url for person')	485	person.stubs(:public_profile_url).returns('url for person')
486	links = links_for_balloon(person)	486	links = links_for_balloon(person)
487	- assert_equal ['Home Page', 'Wall', 'Friends', 'Communities'], links.map{\|i\| i.keys.first}	487	+ assert_equal ['Wall', 'Friends', 'Communities', 'Send an e-mail', 'Add'], links.map{\|i\| i.keys.first}
488	end	488	end
489		489
490	should 'return ordered list of links to balloon to Community' do	490	should 'return ordered list of links to balloon to Community' do
	@@ -495,7 +495,7 @@ class ApplicationHelperTest < Test::Unit::TestCase		@@ -495,7 +495,7 @@ class ApplicationHelperTest < Test::Unit::TestCase
495	community.stubs(:url).returns('url for community')	495	community.stubs(:url).returns('url for community')
496	community.stubs(:public_profile_url).returns('url for community')	496	community.stubs(:public_profile_url).returns('url for community')
497	links = links_for_balloon(community)	497	links = links_for_balloon(community)
498	- assert_equal ['Home Page', 'Wall', 'Members', 'Agenda'], links.map{\|i\| i.keys.first}	498	+ assert_equal ['Wall', 'Members', 'Agenda', 'Join', 'Leave', 'Send an e-mail'], links.map{\|i\| i.keys.first}
499	end	499	end
500		500
501	should 'return ordered list of links to balloon to Enterprise' do	501	should 'return ordered list of links to balloon to Enterprise' do
	@@ -507,7 +507,7 @@ class ApplicationHelperTest < Test::Unit::TestCase		@@ -507,7 +507,7 @@ class ApplicationHelperTest < Test::Unit::TestCase
507	enterprise.stubs(:public_profile_url).returns('url for enterprise')	507	enterprise.stubs(:public_profile_url).returns('url for enterprise')
508	stubs(:catalog_path)	508	stubs(:catalog_path)
509	links = links_for_balloon(enterprise)	509	links = links_for_balloon(enterprise)
510	- assert_equal ['Home Page', 'Products', 'Members', 'Agenda'], links.map{\|i\| i.keys.first}	510	+ assert_equal ['Products', 'Members', 'Agenda', 'Send an e-mail'], links.map{\|i\| i.keys.first}
511	end	511	end
512		512
513	should 'use favicon from environment theme if does not have profile' do	513	should 'use favicon from environment theme if does not have profile' do