ActionItem1247: enhancements on join popup

* when a not logged user asks to join a community, should redirect to page where the user was after login * should not show join_community_popup when in action join

ActionItem1247: enhancements on join popup
* when a not logged user asks to join a community, should redirect to page where the user was after login * should not show join_community_popup when in action join
Daniela Feitosa · Antonio Terceiro
1 parent 76ed1894
Showing 4 changed files with 70 additions and 1 deletions Show diff stats
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
test/functional/profile_controller_test.rb
test/unit/application_helper_test.rb
@@ -2,6 +2,7 @@ class ProfileController &lt; PublicController
   needs_profile
   before_filter :check_access_to_profile
+  before_filter :store_before_join, :only => [:join]
   before_filter :login_required, :only => [:join, :refuse_join, :leave]
   helper TagsHelper
@@ -55,7 +56,7 @@ class ProfileController &lt; PublicController
       if @wizard
         redirect_to :controller => 'search', :action => 'assets', :asset => 'communities', :wizard => true
       else
-        redirect_back_or_default profile.url
+        redirect_to_before_join
       end
     else
       store_location(request.referer)
@@ -104,6 +105,20 @@ class ProfileController &lt; PublicController
     end
   end
+  def store_before_join
+    session[:before_join] = request.referer unless logged_in?
+  end
+
+  def redirect_to_before_join
+    back = session[:before_join]
+    if back
+      session[:before_join] = nil
+      redirect_to back
+    else
+      redirect_back_or_default profile.url
+    end
+  end
+
   def per_page
     Noosfero::Constants::PROFILE_PER_PAGE
   end
@@ -852,6 +852,7 @@ module ApplicationHelper
   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
@@ -634,4 +634,27 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
     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')
+
+    @request.expects(:referer).returns("/profile/#{community.identifier}")
+
+    get :join, :profile => community.identifier
+
+    assert_equal "/profile/#{community.identifier}", @request.session[:before_join]
+  end
+
+  should 'redirect to location before login after join community' do
+    community = Community.create!(:name => 'my test community')
+
+    @request.session[:before_join] = "/profile/#{community.identifier}/to_go"
+    login_as(profile.identifier)
+
+    post :join, :profile => community.identifier, :confirmation => '1'
+
+    assert_redirected_to "/profile/#{community.identifier}/to_go"
+
+    assert_nil @request.session[:before_join]
+  end
+
 end
@@ -350,6 +350,8 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
   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)
@@ -359,6 +361,7 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
   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)
@@ -368,7 +371,22 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
     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 = Community.create(: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)
@@ -380,6 +398,8 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
   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)
@@ -395,6 +415,8 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
   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)
@@ -409,6 +431,8 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
   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)
@@ -419,6 +443,8 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
   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)
@@ -433,6 +459,8 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
   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)
@@ -446,6 +474,8 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
   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)
	@@ -852,6 +852,7 @@ module ApplicationHelper		@@ -852,6 +852,7 @@ module ApplicationHelper
852		852
853	def ask_to_join?	853	def ask_to_join?
854	return if !environment.enabled?(:join_community_popup)	854	return if !environment.enabled?(:join_community_popup)
		855	+ return if params[:action] == 'join'
855	return unless profile && profile.kind_of?(Community)	856	return unless profile && profile.kind_of?(Community)
856	if (session[:no_asking] && session[:no_asking].include?(profile.id))	857	if (session[:no_asking] && session[:no_asking].include?(profile.id))
857	return false	858	return false
	@@ -634,4 +634,27 @@ class ProfileControllerTest < Test::Unit::TestCase		@@ -634,4 +634,27 @@ class ProfileControllerTest < Test::Unit::TestCase
634	assert_redirected_to "/profile/#{community.identifier}/to_go"	634	assert_redirected_to "/profile/#{community.identifier}/to_go"
635	end	635	end
636		636
		637	+ should 'store location before login when request join via get not logged' do
		638	+ community = Community.create!(:name => 'my test community')
		639	+
		640	+ @request.expects(:referer).returns("/profile/#{community.identifier}")
		641	+
		642	+ get :join, :profile => community.identifier
		643	+
		644	+ assert_equal "/profile/#{community.identifier}", @request.session[:before_join]
		645	+ end
		646	+
		647	+ should 'redirect to location before login after join community' do
		648	+ community = Community.create!(:name => 'my test community')
		649	+
		650	+ @request.session[:before_join] = "/profile/#{community.identifier}/to_go"
		651	+ login_as(profile.identifier)
		652	+
		653	+ post :join, :profile => community.identifier, :confirmation => '1'
		654	+
		655	+ assert_redirected_to "/profile/#{community.identifier}/to_go"
		656	+
		657	+ assert_nil @request.session[:before_join]
		658	+ end
		659	+
637	end	660	end