From 8d3b55fa2ef0906b3b40570b82b77063f88f598c Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@colivre.coop.br>
Date: Thu, 2 Sep 2010 17:44:31 -0300
Subject: [PATCH] Remove the "Join community popup" feature

---
 app/controllers/public/profile_controller.rb          |  18 ++----------------
 app/helpers/application_helper.rb                     |  14 --------------
 app/models/environment.rb                             |   1 -
 app/views/blocks/profile_info_actions/community.rhtml |   6 ++++++
 app/views/shared/join_community_popup.rhtml           |  13 -------------
 app/views/shared/noosfero_layout_features.rhtml       |   4 ----
 features/join_community.feature                       |  68 ++++++--------------------------------------------------------------
 test/functional/profile_controller_test.rb            |  33 ---------------------------------
 test/unit/application_helper_test.rb                  | 139 -------------------------------------------------------------------------------------------------------------------------------------------
 9 files changed, 14 insertions(+), 282 deletions(-)
 delete mode 100644 app/views/shared/join_community_popup.rhtml

diff --git a/app/controllers/public/profile_controller.rb b/app/controllers/public/profile_controller.rb
index 740eb49..5914680 100644
--- a/app/controllers/public/profile_controller.rb
+++ b/app/controllers/public/profile_controller.rb
@@ -1,9 +1,9 @@
 class ProfileController < PublicController
 
   needs_profile
-  before_filter :check_access_to_profile, :except => [:join, :refuse_join, :refuse_for_now, :index]
+  before_filter :check_access_to_profile, :except => [:join, :index]
   before_filter :store_before_join, :only => [:join]
-  before_filter :login_required, :only => [:join, :refuse_join, :leave, :unblock]
+  before_filter :login_required, :only => [:join, :leave, :unblock]
 
   helper TagsHelper
 
@@ -112,20 +112,6 @@ class ProfileController < PublicController
     end
   end
 
-  def refuse_join
-    p = current_user.person
-    p.refused_communities << profile
-    p.save
-    redirect_to profile.url
-  end
-
-  def refuse_for_now
-    session[:no_asking] ||= []
-    session[:no_asking].shift if session[:no_asking].size >= 10
-    session[:no_asking] << profile.id
-    render :text => '', :layout => false
-  end
-
   def unblock
     if current_user.person.is_admin?(profile.environment)
       profile.unblock
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ab927dc..d7437f8 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -939,20 +939,6 @@ module ApplicationHelper
     end
   end
 
-  def ask_to_join?
-    return if !environment.enabled?(:join_community_popup)
-    return if params[:action] == 'join'
-    return unless profile && profile.kind_of?(Community)
-    if (session[:no_asking] && session[:no_asking].include?(profile.id))
-      return false
-    end
-    if logged_in?
-      user.ask_to_join?(profile)
-    else
-      true
-    end
-  end
-
   def icon_theme_stylesheet_path
     theme_path = "/designs/icons/#{environment.icon_theme}/style.css"
     if File.exists?(File.join(RAILS_ROOT, 'public', theme_path))
diff --git a/app/models/environment.rb b/app/models/environment.rb
index 1ae4c7d..0d49f3e 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -93,7 +93,6 @@ class Environment < ActiveRecord::Base
       'disable_contact_person' => _('Disable contact for people'),
       'disable_contact_community' => _('Disable contact for groups/communities'),
       'enterprise_registration' => __('Enterprise registration'),
-      'join_community_popup' => _('Ask users to join a group/community with a popup'),
 
       'enterprise_activation' => __('Enable activation of enterprises'),
       'wysiwyg_editor_for_environment_home' => _('Use WYSIWYG editor to edit environment home page'),
diff --git a/app/views/blocks/profile_info_actions/community.rhtml b/app/views/blocks/profile_info_actions/community.rhtml
index ae2e44e..9782f6b 100644
--- a/app/views/blocks/profile_info_actions/community.rhtml
+++ b/app/views/blocks/profile_info_actions/community.rhtml
@@ -19,5 +19,11 @@
       </li>
     <% end %>
 
+  <% else %>
+
+    <li>
+    <%= link_to content_tag('span', _('Join')), profile.join_url, :class => 'button with-text icon-add', :title => _('Join this community') %>
+    </li>
+
   <% end %>
 </ul>
diff --git a/app/views/shared/join_community_popup.rhtml b/app/views/shared/join_community_popup.rhtml
deleted file mode 100644
index bce60ae..0000000
--- a/app/views/shared/join_community_popup.rhtml
+++ /dev/null
@@ -1,13 +0,0 @@
-<div id='join-community-popup'>
-  <h3> <%= __('Do you want to join this community?') %> </h3>
-
-  <% form_tag(profile.join_url) do %>
-    <%= hidden_field(:confirmation, 1) if logged_in? %>
-    <% button_bar do %>
-      <%= submit_button(:ok,"Yes") %>
-      <%= button_to_remote(:cancel, _('Not now'), :url => profile.join_url.merge({:controller => 'profile', :action => 'refuse_for_now', :profile => profile.identifier}), :loaded => '$("join-community-popup").hide()') %>
-      <%= button(:cancel, _('No and don\'t ask again'), :controller => 'profile', :action => 'refuse_join', :profile => profile.identifier) if logged_in? %>
-    <% end %>
-  <% end %>
-</div>
-<%= draggable_element('join-community-popup') %>
diff --git a/app/views/shared/noosfero_layout_features.rhtml b/app/views/shared/noosfero_layout_features.rhtml
index 151177f..2cb7ccd 100644
--- a/app/views/shared/noosfero_layout_features.rhtml
+++ b/app/views/shared/noosfero_layout_features.rhtml
@@ -2,10 +2,6 @@
       <%= render :file => 'shared/theme_test_panel' %>
     <% end %>
 
-    <% if ask_to_join? %>
-      <%= render :file => 'shared/join_community_popup' %>
-    <% end %>
-
     <script type="text/javascript">
       $$("a").each(function(a){
         if ( a.href == document.location.href ) {
diff --git a/features/join_community.feature b/features/join_community.feature
index a55b4d8..78d44aa 100644
--- a/features/join_community.feature
+++ b/features/join_community.feature
@@ -11,70 +11,14 @@ Feature: join a community
       | identifier | name |
       | sample-community | Sample Community |
 
-  Scenario: a logged user asks to join a community with "join_community_popup"
-    Given feature "join_community_popup" is enabled on environment
-    And I am logged in as "joaosilva"
-    And I go to Sample Community's homepage
-    And I press "Yes"
-    Then I should be on Sample Community's homepage
-    And "Joao Silva" should be a member of "Sample Community"
-
-  Scenario: a logged user asks to join a community without "join_community_popup"
-    Given feature "join_community_popup" is disabled on environment
-    And I am logged in as "joaosilva"
-    And I am on Sample Community's homepage
-    And I follow "Join"
-    And I should see "Are you sure you want to join Sample Community?"
-    When I press "Yes, I want to join."
-    Then "Joao Silva" should be a member of "Sample Community"
-
-  Scenario: a not logged user asks join a community
-    Given feature "join_community_popup" is enabled on environment
-    And I am not logged in
-    And I go to Sample Community's homepage
-    And I press "Yes"
-    And I fill in the following:
-      | Username | joaosilva |
-      | Password | 123456 |
-    And I press "Log in"
-    And I should see "Are you sure you want to join Sample Community?"
-    When I press "Yes, I want to join"
-    Then I should be on Sample Community's homepage
-    And "Joao Silva" should be a member of "Sample Community"
-
-  Scenario: a non-user ask to join a community
-    Given feature "join_community_popup" is enabled on environment
-    And I am not logged in
-    And I go to Sample Community's homepage
-    And I press "Yes"
-    And I follow "New user"
-    And I fill in the following within ".no-boxes":
-      | e-mail | jose@domain.br |
-      | Username | joseoliveira |
-      | Password | 123456 |
-      | Password confirmation | 123456 |
-      | Name | Jose Oliveira |
-   And I press "Sign up"
-   And I should see "Are you sure you want to join Sample Community?"
-   When I press "Yes, I want to join"
-   Then I should be on Sample Community's homepage
-   And "Jose Oliveira" should be a member of "Sample Community"
-
   Scenario: ask confirmation before join community
-    Given I am on the homepage
-    And the following communities
-      | name |
-      | Community to join |
-    And I am logged in as "joaosilva"
-    When I am on /profile/community-to-join/join
-    Then I should see "Are you sure you want to join Community to join"
+    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 I am on the homepage
-    And the following communities
-      | name |
-      | Community to join |
-    And joaosilva is member of community-to-join
+    Given joaosilva is member of sample-community
     And I am logged in as "joaosilva"
-    When I am on /profile/community-to-join/join
+    When I go to /profile/sample-community
     Then I should not see "Are you sure you want to join Community to join"
diff --git a/test/functional/profile_controller_test.rb b/test/functional/profile_controller_test.rb
index eff4d9b..23e0a45 100644
--- a/test/functional/profile_controller_test.rb
+++ b/test/functional/profile_controller_test.rb
@@ -462,39 +462,6 @@ class ProfileControllerTest < Test::Unit::TestCase
     assert_redirected_to :controller => 'account', :action => 'login'
   end
 
-  should 'require login to refuse join community' do
-    community = Community.create!(:name => 'my test community', :closed => true)
-    get :refuse_join, :profile => community.identifier
-
-    assert_redirected_to :controller => 'account', :action => 'login'
-  end
-
-  should 'register join refusal' do
-    community = Community.create!(:name => 'my test community', :closed => true)
-    login_as @profile.identifier
-
-    get :refuse_join, :profile => community.identifier
-
-    p = Person.find(@profile.id)
-    assert_includes p.refused_communities, community
-  end
-
-  should 'register in session join refusal' do
-    community = Community.create!(:name => 'my test community')
-    get :refuse_for_now, :profile => community.identifier
-
-    assert_not_nil session[:no_asking]
-    assert_includes session[:no_asking], community.id
-  end
-
-  should 'record only 10 communities in session' do
-    @request.session[:no_asking] = (1..10).to_a
-    community = Community.create!(:name => 'my test community')
-    get :refuse_for_now, :profile => community.identifier
-
-    assert_equal ((2..10).to_a + [community.id]), @request.session[:no_asking]
-  end
-
   should 'present confirmation before leaving a profile' do
     community = Community.create!(:name => 'my test community')
     community.add_member(profile)
diff --git a/test/unit/application_helper_test.rb b/test/unit/application_helper_test.rb
index 475016a..2d28525 100644
--- a/test/unit/application_helper_test.rb
+++ b/test/unit/application_helper_test.rb
@@ -390,145 +390,6 @@ class ApplicationHelperTest < Test::Unit::TestCase
     assert_equal '<span>SIGNUP_FIELD</span>', optional_field(profile, 'field', 'SIGNUP_FIELD')
   end
 
-  should 'not ask_to_join unless profile defined' do
-    stubs(:params).returns({})
-
-    e = Environment.default
-    e.stubs(:enabled?).with(:join_community_popup).returns(true)
-    stubs(:environment).returns(e)
-
-    stubs(:profile).returns(nil)
-    assert ! ask_to_join?
-  end
-
-  should 'not ask_to_join unless profile is community' do
-    stubs(:params).returns({})
-    e = Environment.default
-    e.stubs(:enabled?).with(:join_community_popup).returns(true)
-    stubs(:environment).returns(e)
-
-    p = create_user('test_user').person
-    stubs(:profile).returns(p)
-    assert ! ask_to_join?
-  end
-
-  should 'not ask_to_join if action join' do
-    expects(:params).returns({:action => 'join'})
-
-    e = Environment.default
-    e.stubs(:enabled?).with(:join_community_popup).returns(true)
-    stubs(:environment).returns(e)
-
-    c = fast_create(Community, :name => 'test_comm', :identifier => 'test_comm')
-    stubs(:profile).returns(c)
-    stubs(:logged_in?).returns(false)
-    assert ! ask_to_join?
-  end
-
-  should 'ask_to_join if its not logged and in a community' do
-    stubs(:params).returns({})
-
-    e = Environment.default
-    e.stubs(:enabled?).with(:join_community_popup).returns(true)
-    stubs(:environment).returns(e)
-
-    c = fast_create(Community, :name => 'test_comm', :identifier => 'test_comm')
-    stubs(:profile).returns(c)
-    stubs(:logged_in?).returns(false)
-    assert ask_to_join?
-  end
-
-  should 'ask_to_join if user say so' do
-    stubs(:params).returns({})
-
-    e = Environment.default
-    e.stubs(:enabled?).with(:join_community_popup).returns(true)
-    stubs(:environment).returns(e)
-
-    c = fast_create(Community, :name => 'test_comm', :identifier => 'test_comm')
-    stubs(:profile).returns(c)
-    stubs(:logged_in?).returns(true)
-    p = create_user('test_user').person
-    p.stubs(:ask_to_join?).with(c).returns(true)
-    stubs(:user).returns(p)
-
-    assert ask_to_join?
-  end
-
-  should 'not ask_to_join if user say no' do
-    stubs(:params).returns({})
-
-    e = Environment.default
-    e.stubs(:enabled?).with(:join_community_popup).returns(true)
-    stubs(:environment).returns(e)
-    c = fast_create(Community, :name => 'test_comm', :identifier => 'test_comm')
-    stubs(:profile).returns(c)
-    stubs(:logged_in?).returns(true)
-    p = create_user('test_user').person
-    p.stubs(:ask_to_join?).with(c).returns(false)
-    stubs(:user).returns(p)
-
-    assert !ask_to_join?
-  end
-
-  should 'not ask_to_join if environment say no even if its not logged and in a community' do
-    stubs(:params).returns({})
-
-    e = Environment.default
-    e.stubs(:enabled?).with(:join_community_popup).returns(false)
-    stubs(:environment).returns(e)
-    c = fast_create(Community, :name => 'test_comm', :identifier => 'test_comm')
-    stubs(:profile).returns(c)
-    stubs(:logged_in?).returns(false)
-    assert !ask_to_join?
-  end
-
-  should 'not ask_to_join if environment say no even if user say so' do
-    stubs(:params).returns({})
-
-    e = Environment.default
-    e.stubs(:enabled?).with(:join_community_popup).returns(false)
-    stubs(:environment).returns(e)
-    c = fast_create(Community, :name => 'test_comm', :identifier => 'test_comm')
-    stubs(:profile).returns(c)
-    stubs(:logged_in?).returns(true)
-    p = create_user('test_user').person
-    p.stubs(:ask_to_join?).with(c).returns(true)
-    stubs(:user).returns(p)
-
-    assert !ask_to_join?
-  end
-
-  should 'not ask_to_join if its recorded in the session' do
-    stubs(:params).returns({})
-
-    e = Environment.default
-    e.stubs(:enabled?).with(:join_community_popup).returns(true)
-    stubs(:environment).returns(e)
-
-    c = fast_create(Community, :name => 'test_comm', :identifier => 'test_comm')
-    stubs(:profile).returns(c)
-    stubs(:logged_in?).returns(false)
-    stubs(:session).returns({:no_asking => [c.id]})
-
-    assert !ask_to_join?
-  end
-
-  should 'not ask_to_join if its recorded in the session even for authenticated users' do
-    stubs(:params).returns({})
-
-    e = Environment.default
-    e.stubs(:enabled?).with(:join_community_popup).returns(true)
-    stubs(:environment).returns(e)
-
-    c = fast_create(Community, :name => 'test_comm', :identifier => 'test_comm')
-    stubs(:profile).returns(c)
-    stubs(:logged_in?).returns(true)
-    stubs(:session).returns({:no_asking => [c.id]})
-
-    assert !ask_to_join?
-  end
-
   should 'use default icon theme when there is no stylesheet file for the current icon theme' do
     e = Environment.default
     e.icon_theme = 'something-very-unlikely'
--
libgit2 0.21.2