mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
Move duplicated request to helper method
This commit is contained in:
parent
4a182f8bba
commit
e7b38fb188
@ -278,17 +278,25 @@ describe UsersController do
|
|||||||
DiscourseHub.stubs(:register_nickname).returns([true, nil])
|
DiscourseHub.stubs(:register_nickname).returns([true, nil])
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def post_user
|
||||||
|
xhr :post, :create,
|
||||||
|
name: @user.name,
|
||||||
|
username: @user.username,
|
||||||
|
password: "strongpassword",
|
||||||
|
email: @user.email
|
||||||
|
end
|
||||||
|
|
||||||
context 'when creating a non active user (unconfirmed email)' do
|
context 'when creating a non active user (unconfirmed email)' do
|
||||||
it 'should enqueue a signup email' do
|
it 'should enqueue a signup email' do
|
||||||
Jobs.expects(:enqueue).with(:user_email, has_entries(type: :signup))
|
Jobs.expects(:enqueue).with(:user_email, has_entries(type: :signup))
|
||||||
xhr :post, :create, name: @user.name, username: @user.username,
|
post_user
|
||||||
password: "strongpassword", email: @user.email
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it "doesn't send a welcome email" do
|
it "doesn't send a welcome email" do
|
||||||
User.any_instance.expects(:enqueue_welcome_message).with('welcome_user').never
|
User.any_instance.expects(:enqueue_welcome_message).with('welcome_user').never
|
||||||
xhr :post, :create, name: @user.name, username: @user.username,
|
post_user
|
||||||
password: "strongpassword", email: @user.email
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -300,19 +308,24 @@ describe UsersController do
|
|||||||
|
|
||||||
it 'enqueues a welcome email' do
|
it 'enqueues a welcome email' do
|
||||||
User.any_instance.expects(:enqueue_welcome_message).with('welcome_user')
|
User.any_instance.expects(:enqueue_welcome_message).with('welcome_user')
|
||||||
xhr :post, :create, name: @user.name, username: @user.username,
|
|
||||||
password: "strongpassword", email: @user.email
|
post_user
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
it "should be logged in" do
|
it "should be logged in" do
|
||||||
User.any_instance.expects(:enqueue_welcome_message)
|
User.any_instance.expects(:enqueue_welcome_message)
|
||||||
xhr :post, :create, name: @user.name, username: @user.username, password: "strongpassword", email: @user.email
|
|
||||||
|
post_user
|
||||||
|
|
||||||
session[:current_user_id].should be_present
|
session[:current_user_id].should be_present
|
||||||
end
|
end
|
||||||
|
|
||||||
it "returns true in the active part of the JSON" do
|
it "returns true in the active part of the JSON" do
|
||||||
User.any_instance.expects(:enqueue_welcome_message)
|
User.any_instance.expects(:enqueue_welcome_message)
|
||||||
xhr :post, :create, name: @user.name, username: @user.username, password: "strongpassword", email: @user.email
|
|
||||||
|
post_user
|
||||||
|
|
||||||
::JSON.parse(response.body)['active'].should == true
|
::JSON.parse(response.body)['active'].should == true
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -320,7 +333,7 @@ describe UsersController do
|
|||||||
context 'when approving of users is required' do
|
context 'when approving of users is required' do
|
||||||
before do
|
before do
|
||||||
SiteSetting.expects(:must_approve_users).returns(true)
|
SiteSetting.expects(:must_approve_users).returns(true)
|
||||||
xhr :post, :create, name: @user.name, username: @user.username, password: "strongpassword", email: @user.email
|
post_user
|
||||||
end
|
end
|
||||||
|
|
||||||
it "doesn't log in the user" do
|
it "doesn't log in the user" do
|
||||||
@ -344,8 +357,7 @@ describe UsersController do
|
|||||||
TwitterUserInfo.expects(:find_by_twitter_user_id).returns(nil)
|
TwitterUserInfo.expects(:find_by_twitter_user_id).returns(nil)
|
||||||
TwitterUserInfo.expects(:create)
|
TwitterUserInfo.expects(:create)
|
||||||
|
|
||||||
xhr :post, :create, name: @user.name, username: @user.username,
|
post_user
|
||||||
password: "strongpassword", email: @user.email
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'should create facebook user info if none exists' do
|
it 'should create facebook user info if none exists' do
|
||||||
@ -354,8 +366,7 @@ describe UsersController do
|
|||||||
FacebookUserInfo.expects(:find_by_facebook_user_id).returns(nil)
|
FacebookUserInfo.expects(:find_by_facebook_user_id).returns(nil)
|
||||||
FacebookUserInfo.expects(:create!)
|
FacebookUserInfo.expects(:create!)
|
||||||
|
|
||||||
xhr :post, :create, name: @user.name, username: @user.username,
|
post_user
|
||||||
password: "strongpassword", email: @user.email
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'should create github user info if none exists' do
|
it 'should create github user info if none exists' do
|
||||||
@ -364,18 +375,13 @@ describe UsersController do
|
|||||||
GithubUserInfo.expects(:find_by_github_user_id).returns(nil)
|
GithubUserInfo.expects(:find_by_github_user_id).returns(nil)
|
||||||
GithubUserInfo.expects(:create)
|
GithubUserInfo.expects(:create)
|
||||||
|
|
||||||
xhr :post, :create, name: @user.name, username: @user.username,
|
post_user
|
||||||
password: "strongpassword", email: @user.email
|
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'after success' do
|
context 'after success' do
|
||||||
before do
|
before { post_user }
|
||||||
xhr :post, :create, name: @user.name, username: @user.username,
|
|
||||||
password: "strongpassword", email: @user.email
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'should succeed' do
|
it 'should succeed' do
|
||||||
should respond_with(:success)
|
should respond_with(:success)
|
||||||
|
Loading…
Reference in New Issue
Block a user