github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 20:01:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: Require Javascript to activate an account via email link

Browse Source
This commit is contained in:
Robin Ward
2014-07-14 12:25:42 -04:00
parent c12780eb2b
commit cce7cf8c85
8 changed files with 54 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spec/controllers/users_controller_spec.rb
View File

@ -65,7 +65,6 @@ describe UsersController do
end
context 'valid token' do
it 'authorizes with a correct token' do
user = Fabricate(:user)
email_token = user.email_tokens.create(email: user.email)
@ -82,7 +81,7 @@ describe UsersController do
context 'invalid token' do
before do
EmailToken.expects(:confirm).with('asdfasdf').returns(nil)
get :activate_account, token: 'asdfasdf'
put :perform_account_activation, token: 'asdfasdf'
end
it 'return success' do
@ -105,13 +104,13 @@ describe UsersController do
it 'enqueues a welcome message if the user object indicates so' do
user.send_welcome_message = true
user.expects(:enqueue_welcome_message).with('welcome_user')
get :activate_account, token: 'asdfasdf'
put :perform_account_activation, token: 'asdfasdf'
end
it "doesn't enqueue the welcome message if the object returns false" do
user.send_welcome_message = false
user.expects(:enqueue_welcome_message).with('welcome_user').never
get :activate_account, token: 'asdfasdf'
put :perform_account_activation, token: 'asdfasdf'
end
end
@ -120,7 +119,7 @@ describe UsersController do
before do
Guardian.any_instance.expects(:can_access_forum?).returns(true)
EmailToken.expects(:confirm).with('asdfasdf').returns(user)
get :activate_account, token: 'asdfasdf'
put :perform_account_activation, token: 'asdfasdf'
end
it 'returns success' do
@ -145,7 +144,7 @@ describe UsersController do
before do
Guardian.any_instance.expects(:can_access_forum?).returns(false)
EmailToken.expects(:confirm).with('asdfasdf').returns(user)
get :activate_account, token: 'asdfasdf'
put :perform_account_activation, token: 'asdfasdf'
end
it 'returns success' do