admin_features: Add support for selecting where to redirect users after

signup. (ActionItem2998) Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com> Signed-off-by: Luiz Matos <luizff.matos@gmail.com>

admin_features: Add support for selecting where to redirect users after
signup. (ActionItem2998) Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com> Signed-off-by: Luiz Matos <luizff.matos@gmail.com>
Daniel
1 parent fd488954
Showing 3 changed files with 121 additions and 2 deletions Show diff stats
app/controllers/public/account_controller.rb
features/signup.feature
features/step_definitions/noosfero_steps.rb
@@ -69,6 +69,8 @@ class AccountController &lt; ApplicationController
       session[:notice] = _("This environment doesn't allow user registration.")
     end
+    store_location(request.referer) unless params[:return_to] or session[:return_to]
+
     @block_bot = !!session[:may_be_a_bot]
     @invitation_code = params[:invitation_code]
     begin
@@ -98,7 +100,7 @@ class AccountController &lt; ApplicationController
           end
           if @user.activated?
             self.current_user = @user
-            redirect_to '/'
+            go_to_signup_initial_page
           else
             @register_pending = true
           end
@@ -369,6 +371,7 @@ class AccountController &lt; ApplicationController
   def go_to_initial_page
     if params[:return_to]
+      #I never get here
       redirect_to params[:return_to]
     elsif environment.enabled?('allow_change_of_redirection_after_login')
       case user.preferred_login_redirection
@@ -394,6 +397,23 @@ class AccountController &lt; ApplicationController
     end
   end
+  def go_to_signup_initial_page
+    case @user.environment.redirection_after_signup
+      when 'keep_on_same_page'
+        redirect_back_or_default(user.admin_url)
+      when 'site_homepage'
+        redirect_to :controller => :home
+      when 'user_profile_page'
+        redirect_to user.public_profile_url
+      when 'user_homepage'
+        redirect_to user.url
+      when 'user_control_panel'
+        redirect_to user.admin_url
+    else
+     redirect_to user.url
+    end
+  end
+
   def redirect_if_logged_in
     if logged_in?
       go_to_initial_page
@@ -3,7 +3,7 @@ Feature: signup
   I want to sign up to the site
   So I can have fun using its features
-@selenium
+  @selenium
   Scenario: successfull registration
     Given I am on the homepage
     When I follow "Login"
@@ -60,3 +60,84 @@ Feature: signup
     And I fill in "Name" with ""
     When I press "Save"
     Then I should see "Name can't be blank"
+
+  @selenium
+  Scenario: user should stay on same page after signup
+    Given the environment is configured to stay on the same page after signup
+    And feature "skip_new_user_email_confirmation" is enabled on environment
+    And I am on /search/people
+    When I follow "Sign up"
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@example.com |
+      | Username              | josesilva             |
+      | Password              | secret                |
+      | Password confirmation | secret                |
+      | Full name             | José da Silva         |
+    And wait for the captcha signup time
+    And I press "Create my account"
+    Then I should be on /search/people
+
+  @selenium
+  Scenario: user should go to his homepage after signup
+    Given the environment is configured to redirect to profile homepage after signup
+    And feature "skip_new_user_email_confirmation" is enabled on environment
+    And I am on /search/people
+    When I follow "Sign up"
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@example.com |
+      | Username              | josesilva             |
+      | Password              | secret                |
+      | Password confirmation | secret                |
+      | Full name             | José da Silva         |
+    And wait for the captcha signup time
+    And I press "Create my account"
+    Then I should be on josesilva's profile
+
+  @selenium
+  Scenario: user should go to his control panel after signup
+    Given the environment is configured to redirect to profile control panel after signup
+    And feature "skip_new_user_email_confirmation" is enabled on environment
+    And I am on /search/people
+    When I follow "Sign up"
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@example.com |
+      | Username              | josesilva             |
+      | Password              | secret                |
+      | Password confirmation | secret                |
+      | Full name             | José da Silva         |
+    And wait for the captcha signup time
+    And I press "Create my account"
+    Then I should be on josesilva's control panel
+
+  @selenium
+  Scenario: user should go to his profile page after signup
+    Given the environment is configured to redirect to profile page after signup
+    And feature "skip_new_user_email_confirmation" is enabled on environment
+    And I am on /search/people
+    When I follow "Sign up"
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@example.com |
+      | Username              | josesilva             |
+      | Password              | secret                |
+      | Password confirmation | secret                |
+      | Full name             | José da Silva         |
+    And wait for the captcha signup time
+    And I press "Create my account"
+    Then I should be on josesilva's profile
+
+  @selenium
+  Scenario: user should go to the environment's homepage after signup
+    Given the environment is configured to redirect to site homepage after signup
+    And feature "skip_new_user_email_confirmation" is enabled on environment
+    And I am on /search/people
+    When I follow "Sign up"
+    And I fill in the following within ".no-boxes":
+      | e-Mail                | josesilva@example.com |
+      | Username              | josesilva             |
+      | Password              | secret                |
+      | Password confirmation | secret                |
+      | Full name             | José da Silva         |
+    And wait for the captcha signup time
+    And I press "Create my account"
+    Then I should be on the homepage
+
@@ -738,6 +738,24 @@ Given /^the profile (.*) is configured to (.*) after login$/ do |profile, option
   profile.save
 end
+Given /^the environment is configured to (.*) after signup$/ do |option|
+  redirection = case option
+    when 'stay on the same page'
+      'keep_on_same_page'
+    when 'redirect to site homepage'
+      'site_homepage'
+    when 'redirect to user profile page'
+      'user_profile_page'
+    when 'redirect to profile homepage'
+      'user_homepage'
+    when 'redirect to profile control panel'
+      'user_control_panel'
+  end
+  environment = Environment.default
+  environment.redirection_after_signup = redirection
+  environment.save
+end
+
 When /^wait for the captcha signup time$/ do
   environment = Environment.default
   sleep environment.min_signup_delay + 1
	@@ -3,7 +3,7 @@ Feature: signup		@@ -3,7 +3,7 @@ Feature: signup
3	I want to sign up to the site	3	I want to sign up to the site
4	So I can have fun using its features	4	So I can have fun using its features
5		5
6	-@selenium	6	+ @selenium
7	Scenario: successfull registration	7	Scenario: successfull registration
8	Given I am on the homepage	8	Given I am on the homepage
9	When I follow "Login"	9	When I follow "Login"
	@@ -60,3 +60,84 @@ Feature: signup		@@ -60,3 +60,84 @@ Feature: signup
60	And I fill in "Name" with ""	60	And I fill in "Name" with ""
61	When I press "Save"	61	When I press "Save"
62	Then I should see "Name can't be blank"	62	Then I should see "Name can't be blank"
		63	+
		64	+ @selenium
		65	+ Scenario: user should stay on same page after signup
		66	+ Given the environment is configured to stay on the same page after signup
		67	+ And feature "skip_new_user_email_confirmation" is enabled on environment
		68	+ And I am on /search/people
		69	+ When I follow "Sign up"
		70	+ And I fill in the following within ".no-boxes":
		71	+ \| e-Mail \| josesilva@example.com \|
		72	+ \| Username \| josesilva \|
		73	+ \| Password \| secret \|
		74	+ \| Password confirmation \| secret \|
		75	+ \| Full name \| José da Silva \|
		76	+ And wait for the captcha signup time
		77	+ And I press "Create my account"
		78	+ Then I should be on /search/people
		79	+
		80	+ @selenium
		81	+ Scenario: user should go to his homepage after signup
		82	+ Given the environment is configured to redirect to profile homepage after signup
		83	+ And feature "skip_new_user_email_confirmation" is enabled on environment
		84	+ And I am on /search/people
		85	+ When I follow "Sign up"
		86	+ And I fill in the following within ".no-boxes":
		87	+ \| e-Mail \| josesilva@example.com \|
		88	+ \| Username \| josesilva \|
		89	+ \| Password \| secret \|
		90	+ \| Password confirmation \| secret \|
		91	+ \| Full name \| José da Silva \|
		92	+ And wait for the captcha signup time
		93	+ And I press "Create my account"
		94	+ Then I should be on josesilva's profile
		95	+
		96	+ @selenium
		97	+ Scenario: user should go to his control panel after signup
		98	+ Given the environment is configured to redirect to profile control panel after signup
		99	+ And feature "skip_new_user_email_confirmation" is enabled on environment
		100	+ And I am on /search/people
		101	+ When I follow "Sign up"
		102	+ And I fill in the following within ".no-boxes":
		103	+ \| e-Mail \| josesilva@example.com \|
		104	+ \| Username \| josesilva \|
		105	+ \| Password \| secret \|
		106	+ \| Password confirmation \| secret \|
		107	+ \| Full name \| José da Silva \|
		108	+ And wait for the captcha signup time
		109	+ And I press "Create my account"
		110	+ Then I should be on josesilva's control panel
		111	+
		112	+ @selenium
		113	+ Scenario: user should go to his profile page after signup
		114	+ Given the environment is configured to redirect to profile page after signup
		115	+ And feature "skip_new_user_email_confirmation" is enabled on environment
		116	+ And I am on /search/people
		117	+ When I follow "Sign up"
		118	+ And I fill in the following within ".no-boxes":
		119	+ \| e-Mail \| josesilva@example.com \|
		120	+ \| Username \| josesilva \|
		121	+ \| Password \| secret \|
		122	+ \| Password confirmation \| secret \|
		123	+ \| Full name \| José da Silva \|
		124	+ And wait for the captcha signup time
		125	+ And I press "Create my account"
		126	+ Then I should be on josesilva's profile
		127	+
		128	+ @selenium
		129	+ Scenario: user should go to the environment's homepage after signup
		130	+ Given the environment is configured to redirect to site homepage after signup
		131	+ And feature "skip_new_user_email_confirmation" is enabled on environment
		132	+ And I am on /search/people
		133	+ When I follow "Sign up"
		134	+ And I fill in the following within ".no-boxes":
		135	+ \| e-Mail \| josesilva@example.com \|
		136	+ \| Username \| josesilva \|
		137	+ \| Password \| secret \|
		138	+ \| Password confirmation \| secret \|
		139	+ \| Full name \| José da Silva \|
		140	+ And wait for the captcha signup time
		141	+ And I press "Create my account"
		142	+ Then I should be on the homepage
		143	+
	@@ -738,6 +738,24 @@ Given /^the profile (.) is configured to (.) after login$/ do \|profile, option		@@ -738,6 +738,24 @@ Given /^the profile (.) is configured to (.) after login$/ do \|profile, option
738	profile.save	738	profile.save
739	end	739	end
740		740
		741	+Given /^the environment is configured to (.*) after signup$/ do \|option\|
		742	+ redirection = case option
		743	+ when 'stay on the same page'
		744	+ 'keep_on_same_page'
		745	+ when 'redirect to site homepage'
		746	+ 'site_homepage'
		747	+ when 'redirect to user profile page'
		748	+ 'user_profile_page'
		749	+ when 'redirect to profile homepage'
		750	+ 'user_homepage'
		751	+ when 'redirect to profile control panel'
		752	+ 'user_control_panel'
		753	+ end
		754	+ environment = Environment.default
		755	+ environment.redirection_after_signup = redirection
		756	+ environment.save
		757	+end
		758	+
741	When /^wait for the captcha signup time$/ do	759	When /^wait for the captcha signup time$/ do
742	environment = Environment.default	760	environment = Environment.default
743	sleep environment.min_signup_delay + 1	761	sleep environment.min_signup_delay + 1