ActionItem959: use the session info even if logged in

Antonio Terceiro
1 parent 7afb8e5a
Showing 2 changed files with 20 additions and 4 deletions Show diff stats
app/helpers/application_helper.rb
test/unit/application_helper_test.rb
@@ -777,11 +777,14 @@ module ApplicationHelper
   def ask_to_join?
     return if environment.enabled?(:disable_join_community_popup)
     return unless profile && profile.kind_of?(Community)
-    unless logged_in?
-      return !session[:no_asking].include?(profile.id) if session[:no_asking]
-      return true
+    if (session[:no_asking] && session[:no_asking].include?(profile.id))
+      return false
+    end
+    if logged_in?
+      user.ask_to_join?(profile)
+    else
+      true
     end
-    user.ask_to_join?(profile)
   end
 end
@@ -433,6 +433,19 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
     assert !ask_to_join?
   end
+  should 'not ask_to_join if its recorded in the session even for authenticated users' do
+    e = Environment.default
+    e.stubs(:enabled?).with(:disable_join_community_popup).returns(false)
+    stubs(:environment).returns(e)
+
+    c = Community.create(: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
+
   protected
   def url_for(args = {})
	@@ -433,6 +433,19 @@ class ApplicationHelperTest < Test::Unit::TestCase		@@ -433,6 +433,19 @@ class ApplicationHelperTest < Test::Unit::TestCase
433	assert !ask_to_join?	433	assert !ask_to_join?
434	end	434	end
435		435
		436	+ should 'not ask_to_join if its recorded in the session even for authenticated users' do
		437	+ e = Environment.default
		438	+ e.stubs(:enabled?).with(:disable_join_community_popup).returns(false)
		439	+ stubs(:environment).returns(e)
		440	+
		441	+ c = Community.create(:name => 'test_comm', :identifier => 'test_comm')
		442	+ stubs(:profile).returns(c)
		443	+ stubs(:logged_in?).returns(true)
		444	+ stubs(:session).returns({:no_asking => [c.id]})
		445	+
		446	+ assert !ask_to_join?
		447	+ end
		448	+
436	protected	449	protected
437		450
438	def url_for(args = {})	451	def url_for(args = {})