Merge pull request #2435 from MushroomObserver/njw-welcome-user-tweak

Account signups needing verification redirect to home (or back)
MushroomObserver · Sep 29, 2024 · 74692e1 · 74692e1
2 parents 0974534 + eb1bf8e
commit 74692e1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
@@ -66,11 +66,10 @@ def create
       UserStats.create({ user_id: @new_user.id })
     end
 
-    @user = @new_user
-    redirect_back_or_default(account_welcome_path)
+    redirect_back_or_default("/")
   end
 
-  # This is the welcome page for new users who just created an account.
+  # This is the welcome page for new users who just verified an account.
   def welcome; end
 
   private #################################################

diff --git a/test/integration/capybara/account_integration_test.rb b/test/integration/capybara/account_integration_test.rb
@@ -182,7 +182,7 @@ def test_signup_verify_login_and_logout
     end
 
     # Redirected to the Welcome page, but email not verified.
-    assert_selector("body.account__welcome")
+    assert_selector("body.observations__index")
 
     # At this point there should be an unverified account for Dumbledore.
     wizard = User.find_by(email: "[email protected]")