From c9eb809dad740ded8416add77203b762e17e15f9 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 4 Nov 2014 15:47:32 -0500
Subject: [PATCH] FIX: The text to users who signed up when approval was
required was misleading.
---
app/controllers/users_controller.rb | 3 ++-
app/views/users/account_created.html.erb | 4 +---
spec/controllers/users_controller_spec.rb | 12 ++++++------
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 521f1b617..00b2e6186 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -245,7 +245,7 @@ class UsersController < ApplicationController
activation.finish
# save user email in session, to show on account-created page
- session["user_created_email"] = user.email
+ session["user_created_message"] = activation.message
render json: {
success: true,
@@ -364,6 +364,7 @@ class UsersController < ApplicationController
end
def account_created
+ @message = session['user_created_message']
expires_now
render layout: 'no_js'
end
diff --git a/app/views/users/account_created.html.erb b/app/views/users/account_created.html.erb
index ea8cf7d9e..0bc9c8ccd 100644
--- a/app/views/users/account_created.html.erb
+++ b/app/views/users/account_created.html.erb
@@ -1,5 +1,3 @@
<div id='simple-container'>
- <% if session["user_created_email"] %>
- <span style="font-size: 16px; line-height: 24px;"><%= t('login.activate_email', email: session["user_created_email"]).html_safe %></span>
- <% end %>
+ <span style="font-size: 16px; line-height: 24px;"><%= @message.html_safe %></span>
</div>
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 2d4b23e0a..d5e1db797 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -357,8 +357,8 @@ describe UsersController do
expect(JSON.parse(response.body)['active']).to be_falsey
- # should save user_created_email in session
- session["user_created_email"].should == @user.email
+ # should save user_created_message in session
+ session["user_created_message"].should be_present
end
context "and 'must approve users' site setting is enabled" do
@@ -393,8 +393,8 @@ describe UsersController do
User.any_instance.expects(:enqueue_welcome_message).with('welcome_user')
post_user
- # should save user_created_email in session
- session["user_created_email"].should == @user.email
+ # should save user_created_message in session
+ session["user_created_message"].should be_present
end
it "shows the 'active' message" do
@@ -479,7 +479,7 @@ describe UsersController do
json["success"].should == true
# should not change the session
- session["user_created_email"].should be_blank
+ session["user_created_message"].should be_blank
end
end
@@ -523,7 +523,7 @@ describe UsersController do
json["success"].should_not == true
# should not change the session
- session["user_created_email"].should be_blank
+ session["user_created_message"].should be_blank
end
end