Redirecting logged users if tries to signup/login

(ActionItem1354)

Redirecting logged users if tries to signup/login
(ActionItem1354)
Daniela Feitosa · Antonio Terceiro
1 parent 44c42816
Showing 7 changed files with 28 additions and 1 deletions Show diff stats
app/controllers/public/account_controller.rb
features/login.feature
features/publish_article.feature
features/signup.feature
features/support/paths.rb
test/functional/account_controller_test.rb
test/integration/enterprise_registration_test.rb
@@ -5,6 +5,7 @@ class AccountController &lt; ApplicationController
   require_ssl :except => [ :login_popup, :logout_popup, :wizard, :profile_details ]
   before_filter :login_required, :only => [:activation_question, :accept_terms, :activate_enterprise]
+  before_filter :redirect_if_logged_in, :only => [:login, :signup]
   # say something nice, you goof!  something sweet.
   def index
@@ -291,4 +292,10 @@ class AccountController &lt; ApplicationController
     end
   end
+  def redirect_if_logged_in
+    if logged_in?
+      go_to_initial_page
+    end
+  end
+
 end
@@ -39,3 +39,8 @@ Feature: login
       | Password | 123456 |
     When I press "Log in"
     Then I should be on Joao Silva's control panel
+
+  Scenario: be redirected if user goes to login page and is logged
+    Given I am logged in as "joaosilva"
+    And I go to login page
+    Then I should be on Joao Silva's control panel
@@ -40,6 +40,7 @@ Feature: publish article
     And I follow "Spread"
     And I check "Sample Community"
     And I press "Publish"
+    And I am not logged in
     And I am logged in as "mariasilva"
     And "Maria Silva" is a member of "Sample Community"
     And I am on Maria Silva's control panel
@@ -15,3 +15,10 @@ Feature: signup
     And I press "Sign up"
     Then I should see "Thanks for signing up!"
+  Scenario: be redirected if user goes to signup page and is logged
+    Given the following users
+      | login | name |
+      | joaosilva | Joao Silva |
+    Given I am logged in as "joaosilva"
+    And I go to signup page
+    Then I should be on Joao Silva's control panel
@@ -29,6 +29,9 @@ module NavigationHelpers
     when /^login page$/
       '/account/login'
+    when /^signup page$/
+      '/account/signup'
+
     when /^(.*)'s control panel$/
       '/myprofile/%s' % Profile.find_by_name($1).identifier
@@ -36,6 +36,7 @@ class AccountControllerTest &lt; Test::Unit::TestCase
   should 'redirect to where user was on login' do
     @request.env["HTTP_REFERER"] = '/bli'
     u = new_user
+    @controller.stubs(:logged_in?).returns(false)
     post :login, :user => {:login => 'quire', :password => 'quire'}
     assert_redirected_to '/bli'
@@ -283,6 +284,7 @@ class AccountControllerTest &lt; Test::Unit::TestCase
     assert_difference User, :count do
       new_user(:login => 'user1', :email => 'user@example.com')
       assert assigns(:user).valid?
+      @controller.stubs(:logged_in?).returns(false)
       new_user(:login => 'user2', :email => 'user@example.com')
       assert assigns(:user).errors.on(:email)
     end
@@ -44,10 +44,12 @@ class EnterpriseRegistrationTest &lt; ActionController::IntegrationTest
     code = CreateEnterprise.find(:first, :order => 'id desc').code
+    post '/account/logout'
+
     # steps done by the validator
     validator = create_user_with_permission('validator', 'validate_enterprise', org)
     login 'validator', 'validator'
-    
+
     get "/myprofile/myorg/enterprise_validation"
     assert_response :success
     assert_tag :tag => 'a', :attributes => { :href => "/myprofile/myorg/enterprise_validation/details/#{code}" }
	@@ -39,3 +39,8 @@ Feature: login		@@ -39,3 +39,8 @@ Feature: login
39	\| Password \| 123456 \|	39	\| Password \| 123456 \|
40	When I press "Log in"	40	When I press "Log in"
41	Then I should be on Joao Silva's control panel	41	Then I should be on Joao Silva's control panel
		42	+
		43	+ Scenario: be redirected if user goes to login page and is logged
		44	+ Given I am logged in as "joaosilva"
		45	+ And I go to login page
		46	+ Then I should be on Joao Silva's control panel
	@@ -15,3 +15,10 @@ Feature: signup		@@ -15,3 +15,10 @@ Feature: signup
15	And I press "Sign up"	15	And I press "Sign up"
16	Then I should see "Thanks for signing up!"	16	Then I should see "Thanks for signing up!"
17		17
		18	+ Scenario: be redirected if user goes to signup page and is logged
		19	+ Given the following users
		20	+ \| login \| name \|
		21	+ \| joaosilva \| Joao Silva \|
		22	+ Given I am logged in as "joaosilva"
		23	+ And I go to signup page
		24	+ Then I should be on Joao Silva's control panel