[template-welcome-page] Option to redirect to welcome page after signup

* Move welcome page a separate action under the HomeController instead of cranking it under the signup. * May show welcome page to both signup (with or without confirmation). (ActionItem3075)

[template-welcome-page] Option to redirect to welcome page after signup
* Move welcome page a separate action under the HomeController instead of cranking it under the signup. * May show welcome page to both signup (with or without confirmation). (ActionItem3075)
Rodrigo Souto
1 parent ad1a6b16
Showing 9 changed files with 58 additions and 31 deletions Show diff stats
app/controllers/public/account_controller.rb
app/controllers/public/home_controller.rb
app/models/environment.rb
app/views/account/signup.html.erb
app/views/home/welcome.html.erb
features/signup.feature
features/step_definitions/noosfero_steps.rb
features/support/paths.rb
test/functional/account_controller_test.rb
@@ -110,7 +110,7 @@ class AccountController &lt; ApplicationController
             check_join_in_community(@user)
             go_to_signup_initial_page
           else
-            @register_pending = true
+            redirect_to :controller => :home, :action => :welcome
           end
         end
       end
@@ -441,6 +441,8 @@ class AccountController &lt; ApplicationController
         redirect_to user.url
       when 'user_control_panel'
         redirect_to user.admin_url
+      when 'welcome_page'
+        redirect_to :controller => :home, :action => :welcome
     else
       redirect_back_or_default(default)
     end
@@ -18,4 +18,9 @@ class HomeController &lt; PublicController
     @no_design_blocks = true
   end
+  def welcome
+    self.class.no_design_blocks
+    @display_confirmation_tips = !user.present? && !environment.enabled?(:skip_new_user_email_confirmation)
+  end
+
 end
@@ -153,7 +153,8 @@ class Environment &lt; ActiveRecord::Base
       'site_homepage' => _('Redirects the user to the environment homepage.'),
       'user_profile_page' => _('Redirects the user to his profile page.'),
       'user_homepage' => _('Redirects the user to his homepage.'),
-      'user_control_panel' => _('Redirects the user to his control panel.')
+      'user_control_panel' => _('Redirects the user to his control panel.'),
+      'welcome_page' => _('Redirects the user to the environment welcome page.')
     }
   end
   validates_inclusion_of :redirection_after_signup, :in => Environment.signup_redirection_options.keys, :allow_nil => true
-<% if @register_pending %>
-  <div id='thanks-for-signing'>
-    <% if environment.has_custom_welcome_screen? %>
-      <%= environment.settings[:signup_welcome_screen_body].html_safe %>
-    <% else %>
-        <h1><%= _("Welcome to %s!") % environment.name %></h1>
-        <h3><%= _("Thanks for signing up, we're thrilled to have you on our social network!") %></h3>
-        <p><%= _("Firstly, some tips for getting started:") %></p>
-        <h4><%= _("Confirm your account!") %></h4>
-        <p><%= _("You should receive a welcome email from us shortly. Please take a second to follow the link within to confirm your account.") %></p>
-        <p><%= _("You won't appear as %s until your account is confirmed.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
-        <h4><%= _("What to do next?") %></h4>
-        <p><%= _("%s. Upload an avatar and let your friends find you easily :)") % link_to(_('Customize your profile'), {:controller => 'doc', :section => 'user', :topic => 'editing-person-info'}, :target => '_blank') %></p>
-        <p><%= _("Learn the guidelines. Read the %s for more details on how to use this social network!") % link_to(_('Documentation'), {:controller => 'doc'}, :target => '_blank') %></p>
-        <p><%= _("%s your Gmail, Yahoo and Hotmail contacts!") % link_to(_('Invite and find'), {:controller => 'doc', :section => 'user', :topic => 'invite-contacts'}, :target => '_blank') %></p>
-        <p><%= _("Start exploring and have fun!") %></p>
-    <% end %>
-  </div>
-<% else %>
-  <h1><%= _('Sign up for %s!') % environment.name %></h1>
-  <%= render :partial => 'signup_form' %>
-<% end %>
+<h1><%= _('Sign up for %s!') % environment.name %></h1>
+<%= render :partial => 'signup_form' %>
@@ -0,0 +1,19 @@
+<div id='thanks-for-signing'>
+  <% if environment.has_custom_welcome_screen? %>
+    <%= environment.settings[:signup_welcome_screen_body].html_safe %>
+  <% else %>
+      <h1><%= _("Welcome to %s!") % environment.name %></h1>
+      <h3><%= _("Thanks for signing up, we're thrilled to have you on our social network!") %></h3>
+      <p><%= _("Firstly, some tips for getting started:") %></p>
+      <% if @display_confirmation_tips %>
+        <h4><%= _("Confirm your account!") %></h4>
+        <p><%= _("You should receive a welcome email from us shortly. Please take a second to follow the link within to confirm your account.") %></p>
+        <p><%= _("You won't appear as %s until your account is confirmed.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
+      <% end %>
+      <h4><%= _("What to do next?") %></h4>
+      <p><%= _("%s. Upload an avatar and let your friends find you easily :)") % link_to(_('Customize your profile'), {:controller => 'doc', :section => 'user', :topic => 'editing-person-info'}, :target => '_blank') %></p>
+      <p><%= _("Learn the guidelines. Read the %s for more details on how to use this social network!") % link_to(_('Documentation'), {:controller => 'doc'}, :target => '_blank') %></p>
+      <p><%= _("%s your Gmail, Yahoo and Hotmail contacts!") % link_to(_('Invite and find'), {:controller => 'doc', :section => 'user', :topic => 'invite-contacts'}, :target => '_blank') %></p>
+      <p><%= _("Start exploring and have fun!") %></p>
+  <% end %>
+</div>
@@ -152,6 +152,21 @@ Feature: signup
     Then I should be on the homepage
   @selenium
+  Scenario: user should go to the environment's welcome page after signup
+    Given the environment is configured to redirect to welcome page after signup
+    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 welcome page
+
+  @selenium
   Scenario: user should stay on same page after following confirmation link
     Given the environment is configured to stay on the same page after login
     And feature "skip_new_user_email_confirmation" is disabled on environment
@@ -745,6 +745,8 @@ Given /^the environment is configured to (.*) after signup$/ do |option|
       'user_homepage'
     when 'redirect to profile control panel'
       'user_control_panel'
+    when 'redirect to welcome page'
+      'welcome_page'
   end
   environment = Environment.default
   environment.redirection_after_signup = redirection
@@ -20,8 +20,8 @@ module NavigationHelpers
     when /^\//
       page_name
-    when /^(.*)'s profile/
-      '/profile/' + profile_identifier($1)
+    when /the welcome page/
+      '/site/welcome'
     when /article "([^"]+)"\s*$/
       url_for(Article.find_by_name($1).url.merge({:only_path => true}))
@@ -50,8 +50,6 @@ class AccountControllerTest &lt; ActionController::TestCase
   def test_should_allow_signup
     assert_difference 'User.count' do
       new_user
-      assert_response :success
-      assert_not_nil assigns(:register_pending)
     end
   end
@@ -104,8 +102,6 @@ class AccountControllerTest &lt; ActionController::TestCase
     assert_difference 'User.count' do
       Environment.default.update_attribute(:terms_of_use, 'some terms ...')
       new_user(:terms_accepted => '1')
-      assert_response :success
-      assert_not_nil assigns(:register_pending)
     end
   end
@@ -626,7 +622,6 @@ class AccountControllerTest &lt; ActionController::TestCase
     Person.any_instance.stubs(:required_fields).returns(['organization'])
     assert_difference 'User.count' do
       post :signup, :user => { :login => 'testuser', :password => '123456', :password_confirmation => '123456', :email => 'testuser@example.com' }, :profile_data => { :organization => 'example.com' }
-      assert_response :success
     end
     assert_equal 'example.com', Person['testuser'].organization
   end
@@ -958,6 +953,14 @@ class AccountControllerTest &lt; ActionController::TestCase
     assert_equal label, "Lavras do Sul"
   end
+  should 'redirect to welcome page after successful signup if environment configured as so' do
+    environment = Environment.default
+    environment.redirection_after_signup = 'welcome_page'
+    environment.save!
+    new_user
+    assert_redirected_to :controller => 'home', :action => 'welcome'
+  end
+
   protected
   def new_user(options = {}, extra_options ={})
     data = {:profile_data => person_data}
	@@ -18,4 +18,9 @@ class HomeController < PublicController		@@ -18,4 +18,9 @@ class HomeController < PublicController
18	@no_design_blocks = true	18	@no_design_blocks = true
19	end	19	end
20		20
		21	+ def welcome
		22	+ self.class.no_design_blocks
		23	+ @display_confirmation_tips = !user.present? && !environment.enabled?(:skip_new_user_email_confirmation)
		24	+ end
		25	+
21	end	26	end
1	-<% if @register_pending %>
2	- <div id='thanks-for-signing'>
3	- <% if environment.has_custom_welcome_screen? %>
4	- <%= environment.settings[:signup_welcome_screen_body].html_safe %>
5	- <% else %>
6	- <h1><%= _("Welcome to %s!") % environment.name %></h1>
7	- <h3><%= _("Thanks for signing up, we're thrilled to have you on our social network!") %></h3>
8	- <p><%= _("Firstly, some tips for getting started:") %></p>
9	- <h4><%= _("Confirm your account!") %></h4>
10	- <p><%= _("You should receive a welcome email from us shortly. Please take a second to follow the link within to confirm your account.") %></p>
11	- <p><%= _("You won't appear as %s until your account is confirmed.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
12	- <h4><%= _("What to do next?") %></h4>
13	- <p><%= _("%s. Upload an avatar and let your friends find you easily :)") % link_to(_('Customize your profile'), {:controller => 'doc', :section => 'user', :topic => 'editing-person-info'}, :target => '_blank') %></p>
14	- <p><%= _("Learn the guidelines. Read the %s for more details on how to use this social network!") % link_to(_('Documentation'), {:controller => 'doc'}, :target => '_blank') %></p>
15	- <p><%= _("%s your Gmail, Yahoo and Hotmail contacts!") % link_to(_('Invite and find'), {:controller => 'doc', :section => 'user', :topic => 'invite-contacts'}, :target => '_blank') %></p>
16	- <p><%= _("Start exploring and have fun!") %></p>
17	- <% end %>
18	- </div>
19	-<% else %>
20	- <h1><%= _('Sign up for %s!') % environment.name %></h1>
21	- <%= render :partial => 'signup_form' %>
22	-<% end %>	1	+<h1><%= _('Sign up for %s!') % environment.name %></h1>
		2	+<%= render :partial => 'signup_form' %>
@@ -0,0 +1,19 @@		@@ -0,0 +1,19 @@
	1	+<div id='thanks-for-signing'>
	2	+ <% if environment.has_custom_welcome_screen? %>
	3	+ <%= environment.settings[:signup_welcome_screen_body].html_safe %>
	4	+ <% else %>
	5	+ <h1><%= _("Welcome to %s!") % environment.name %></h1>
	6	+ <h3><%= _("Thanks for signing up, we're thrilled to have you on our social network!") %></h3>
	7	+ <p><%= _("Firstly, some tips for getting started:") %></p>
	8	+ <% if @display_confirmation_tips %>
	9	+ <h4><%= _("Confirm your account!") %></h4>
	10	+ <p><%= _("You should receive a welcome email from us shortly. Please take a second to follow the link within to confirm your account.") %></p>
	11	+ <p><%= _("You won't appear as %s until your account is confirmed.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
	12	+ <% end %>
	13	+ <h4><%= _("What to do next?") %></h4>
	14	+ <p><%= _("%s. Upload an avatar and let your friends find you easily :)") % link_to(_('Customize your profile'), {:controller => 'doc', :section => 'user', :topic => 'editing-person-info'}, :target => '_blank') %></p>
	15	+ <p><%= _("Learn the guidelines. Read the %s for more details on how to use this social network!") % link_to(_('Documentation'), {:controller => 'doc'}, :target => '_blank') %></p>
	16	+ <p><%= _("%s your Gmail, Yahoo and Hotmail contacts!") % link_to(_('Invite and find'), {:controller => 'doc', :section => 'user', :topic => 'invite-contacts'}, :target => '_blank') %></p>
	17	+ <p><%= _("Start exploring and have fun!") %></p>
	18	+ <% end %>
	19	+</div>
	@@ -152,6 +152,21 @@ Feature: signup		@@ -152,6 +152,21 @@ Feature: signup
152	Then I should be on the homepage	152	Then I should be on the homepage
153		153
154	@selenium	154	@selenium
		155	+ Scenario: user should go to the environment's welcome page after signup
		156	+ Given the environment is configured to redirect to welcome page after signup
		157	+ And I am on /search/people
		158	+ When I follow "Sign up"
		159	+ And I fill in the following within ".no-boxes":
		160	+ \| e-Mail \| josesilva@example.com \|
		161	+ \| Username \| josesilva \|
		162	+ \| Password \| secret \|
		163	+ \| Password confirmation \| secret \|
		164	+ \| Full name \| José da Silva \|
		165	+ And wait for the captcha signup time
		166	+ And I press "Create my account"
		167	+ Then I should be on the welcome page
		168	+
		169	+ @selenium
155	Scenario: user should stay on same page after following confirmation link	170	Scenario: user should stay on same page after following confirmation link
156	Given the environment is configured to stay on the same page after login	171	Given the environment is configured to stay on the same page after login
157	And feature "skip_new_user_email_confirmation" is disabled on environment	172	And feature "skip_new_user_email_confirmation" is disabled on environment