summaryrefslogtreecommitdiff
path: root/spec/requests/api/users_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/requests/api/users_spec.rb')
-rw-r--r--spec/requests/api/users_spec.rb283
1 files changed, 132 insertions, 151 deletions
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index bc1598273be..081400cdedd 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -11,30 +11,30 @@ describe API::API, api: true do
context "when unauthenticated" do
it "should return authentication error" do
get api("/users")
- response.status.should == 401
+ expect(response.status).to eq(401)
end
end
context "when authenticated" do
it "should return an array of users" do
get api("/users", user)
- response.status.should == 200
- json_response.should be_an Array
+ expect(response.status).to eq(200)
+ expect(json_response).to be_an Array
username = user.username
- json_response.detect {
+ expect(json_response.detect {
|user| user['username'] == username
- }['username'].should == username
+ }['username']).to eq(username)
end
end
context "when admin" do
it "should return an array of users" do
get api("/users", admin)
- response.status.should == 200
- json_response.should be_an Array
- json_response.first.keys.should include 'email'
- json_response.first.keys.should include 'extern_uid'
- json_response.first.keys.should include 'can_create_project'
+ expect(response.status).to eq(200)
+ expect(json_response).to be_an Array
+ expect(json_response.first.keys).to include 'email'
+ expect(json_response.first.keys).to include 'identities'
+ expect(json_response.first.keys).to include 'can_create_project'
end
end
end
@@ -42,19 +42,19 @@ describe API::API, api: true do
describe "GET /users/:id" do
it "should return a user by id" do
get api("/users/#{user.id}", user)
- response.status.should == 200
- json_response['username'].should == user.username
+ expect(response.status).to eq(200)
+ expect(json_response['username']).to eq(user.username)
end
it "should return a 401 if unauthenticated" do
get api("/users/9998")
- response.status.should == 401
+ expect(response.status).to eq(401)
end
it "should return a 404 error if user id not found" do
get api("/users/9999", user)
- response.status.should == 404
- json_response['message'].should == '404 Not found'
+ expect(response.status).to eq(404)
+ expect(json_response['message']).to eq('404 Not found')
end
end
@@ -69,36 +69,36 @@ describe API::API, api: true do
it "should create user with correct attributes" do
post api('/users', admin), attributes_for(:user, admin: true, can_create_group: true)
- response.status.should == 201
+ expect(response.status).to eq(201)
user_id = json_response['id']
new_user = User.find(user_id)
- new_user.should_not == nil
- new_user.admin.should == true
- new_user.can_create_group.should == true
+ expect(new_user).not_to eq(nil)
+ expect(new_user.admin).to eq(true)
+ expect(new_user.can_create_group).to eq(true)
end
it "should create non-admin user" do
post api('/users', admin), attributes_for(:user, admin: false, can_create_group: false)
- response.status.should == 201
+ expect(response.status).to eq(201)
user_id = json_response['id']
new_user = User.find(user_id)
- new_user.should_not == nil
- new_user.admin.should == false
- new_user.can_create_group.should == false
+ expect(new_user).not_to eq(nil)
+ expect(new_user.admin).to eq(false)
+ expect(new_user.can_create_group).to eq(false)
end
it "should create non-admin users by default" do
post api('/users', admin), attributes_for(:user)
- response.status.should == 201
+ expect(response.status).to eq(201)
user_id = json_response['id']
new_user = User.find(user_id)
- new_user.should_not == nil
- new_user.admin.should == false
+ expect(new_user).not_to eq(nil)
+ expect(new_user.admin).to eq(false)
end
it "should return 201 Created on success" do
post api("/users", admin), attributes_for(:user, projects_limit: 3)
- response.status.should == 201
+ expect(response.status).to eq(201)
end
it "should not create user with invalid email" do
@@ -106,22 +106,22 @@ describe API::API, api: true do
email: 'invalid email',
password: 'password',
name: 'test'
- response.status.should == 400
+ expect(response.status).to eq(400)
end
it 'should return 400 error if name not given' do
post api('/users', admin), email: 'test@example.com', password: 'pass1234'
- response.status.should == 400
+ expect(response.status).to eq(400)
end
it 'should return 400 error if password not given' do
post api('/users', admin), email: 'test@example.com', name: 'test'
- response.status.should == 400
+ expect(response.status).to eq(400)
end
it "should return 400 error if email not given" do
post api('/users', admin), password: 'pass1234', name: 'test'
- response.status.should == 400
+ expect(response.status).to eq(400)
end
it 'should return 400 error if user does not validate' do
@@ -132,22 +132,20 @@ describe API::API, api: true do
name: 'test',
bio: 'g' * 256,
projects_limit: -1
- response.status.should == 400
- json_response['message']['password'].
- should == ['is too short (minimum is 8 characters)']
- json_response['message']['bio'].
- should == ['is too long (maximum is 255 characters)']
- json_response['message']['projects_limit'].
- should == ['must be greater than or equal to 0']
- json_response['message']['username'].
- should == ['can contain only letters, digits, '\
- '\'_\', \'-\' and \'.\'. It must start with letter, digit or '\
- '\'_\', optionally preceeded by \'.\'. It must not end in \'.git\'.']
+ expect(response.status).to eq(400)
+ expect(json_response['message']['password']).
+ to eq(['is too short (minimum is 8 characters)'])
+ expect(json_response['message']['bio']).
+ to eq(['is too long (maximum is 255 characters)'])
+ expect(json_response['message']['projects_limit']).
+ to eq(['must be greater than or equal to 0'])
+ expect(json_response['message']['username']).
+ to eq([Gitlab::Regex.send(:default_regex_message)])
end
it "shouldn't available for non admin users" do
post api("/users", user), attributes_for(:user)
- response.status.should == 403
+ expect(response.status).to eq(403)
end
context 'with existing user' do
@@ -167,8 +165,8 @@ describe API::API, api: true do
password: 'password',
username: 'foo'
}.to change { User.count }.by(0)
- response.status.should == 409
- json_response['message'].should == 'Email has already been taken'
+ expect(response.status).to eq(409)
+ expect(json_response['message']).to eq('Email has already been taken')
end
it 'should return 409 conflict error if same username exists' do
@@ -179,34 +177,18 @@ describe API::API, api: true do
password: 'password',
username: 'test'
end.to change { User.count }.by(0)
- response.status.should == 409
- json_response['message'].should == 'Username has already been taken'
+ expect(response.status).to eq(409)
+ expect(json_response['message']).to eq('Username has already been taken')
end
end
end
describe "GET /users/sign_up" do
- context 'enabled' do
- before do
- Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
- end
-
- it "should return sign up page if signup is enabled" do
- get "/users/sign_up"
- response.status.should == 200
- end
- end
- context 'disabled' do
- before do
- Gitlab.config.gitlab.stub(:signup_enabled).and_return(false)
- end
-
- it "should redirect to sign in page if signup is disabled" do
- get "/users/sign_up"
- response.status.should == 302
- response.should redirect_to(new_user_session_path)
- end
+ it "should redirect to sign in page" do
+ get "/users/sign_up"
+ expect(response.status).to eq(302)
+ expect(response).to redirect_to(new_user_session_path)
end
end
@@ -217,55 +199,55 @@ describe API::API, api: true do
it "should update user with new bio" do
put api("/users/#{user.id}", admin), {bio: 'new test bio'}
- response.status.should == 200
- json_response['bio'].should == 'new test bio'
- user.reload.bio.should == 'new test bio'
+ expect(response.status).to eq(200)
+ expect(json_response['bio']).to eq('new test bio')
+ expect(user.reload.bio).to eq('new test bio')
end
it 'should update user with his own email' do
put api("/users/#{user.id}", admin), email: user.email
- response.status.should == 200
- json_response['email'].should == user.email
- user.reload.email.should == user.email
+ expect(response.status).to eq(200)
+ expect(json_response['email']).to eq(user.email)
+ expect(user.reload.email).to eq(user.email)
end
it 'should update user with his own username' do
put api("/users/#{user.id}", admin), username: user.username
- response.status.should == 200
- json_response['username'].should == user.username
- user.reload.username.should == user.username
+ expect(response.status).to eq(200)
+ expect(json_response['username']).to eq(user.username)
+ expect(user.reload.username).to eq(user.username)
end
it "should update admin status" do
put api("/users/#{user.id}", admin), {admin: true}
- response.status.should == 200
- json_response['is_admin'].should == true
- user.reload.admin.should == true
+ expect(response.status).to eq(200)
+ expect(json_response['is_admin']).to eq(true)
+ expect(user.reload.admin).to eq(true)
end
it "should not update admin status" do
put api("/users/#{admin_user.id}", admin), {can_create_group: false}
- response.status.should == 200
- json_response['is_admin'].should == true
- admin_user.reload.admin.should == true
- admin_user.can_create_group.should == false
+ expect(response.status).to eq(200)
+ expect(json_response['is_admin']).to eq(true)
+ expect(admin_user.reload.admin).to eq(true)
+ expect(admin_user.can_create_group).to eq(false)
end
it "should not allow invalid update" do
put api("/users/#{user.id}", admin), {email: 'invalid email'}
- response.status.should == 400
- user.reload.email.should_not == 'invalid email'
+ expect(response.status).to eq(400)
+ expect(user.reload.email).not_to eq('invalid email')
end
it "shouldn't available for non admin users" do
put api("/users/#{user.id}", user), attributes_for(:user)
- response.status.should == 403
+ expect(response.status).to eq(403)
end
it "should return 404 for non-existing user" do
put api("/users/999999", admin), {bio: 'update should fail'}
- response.status.should == 404
- json_response['message'].should == '404 Not found'
+ expect(response.status).to eq(404)
+ expect(json_response['message']).to eq('404 Not found')
end
it 'should return 400 error if user does not validate' do
@@ -276,17 +258,15 @@ describe API::API, api: true do
name: 'test',
bio: 'g' * 256,
projects_limit: -1
- response.status.should == 400
- json_response['message']['password'].
- should == ['is too short (minimum is 8 characters)']
- json_response['message']['bio'].
- should == ['is too long (maximum is 255 characters)']
- json_response['message']['projects_limit'].
- should == ['must be greater than or equal to 0']
- json_response['message']['username'].
- should == ['can contain only letters, digits, '\
- '\'_\', \'-\' and \'.\'. It must start with letter, digit or '\
- '\'_\', optionally preceeded by \'.\'. It must not end in \'.git\'.']
+ expect(response.status).to eq(400)
+ expect(json_response['message']['password']).
+ to eq(['is too short (minimum is 8 characters)'])
+ expect(json_response['message']['bio']).
+ to eq(['is too long (maximum is 255 characters)'])
+ expect(json_response['message']['projects_limit']).
+ to eq(['must be greater than or equal to 0'])
+ expect(json_response['message']['username']).
+ to eq([Gitlab::Regex.send(:default_regex_message)])
end
context "with existing user" do
@@ -298,15 +278,15 @@ describe API::API, api: true do
it 'should return 409 conflict error if email address exists' do
put api("/users/#{@user.id}", admin), email: 'test@example.com'
- response.status.should == 409
- @user.reload.email.should == @user.email
+ expect(response.status).to eq(409)
+ expect(@user.reload.email).to eq(@user.email)
end
it 'should return 409 conflict error if username taken' do
@user_id = User.all.last.id
put api("/users/#{@user.id}", admin), username: 'test'
- response.status.should == 409
- @user.reload.username.should == @user.username
+ expect(response.status).to eq(409)
+ expect(@user.reload.username).to eq(@user.username)
end
end
end
@@ -316,14 +296,14 @@ describe API::API, api: true do
it "should not create invalid ssh key" do
post api("/users/#{user.id}/keys", admin), { title: "invalid key" }
- response.status.should == 400
- json_response['message'].should == '400 (Bad request) "key" not given'
+ expect(response.status).to eq(400)
+ expect(json_response['message']).to eq('400 (Bad request) "key" not given')
end
it 'should not create key without title' do
post api("/users/#{user.id}/keys", admin), key: 'some key'
- response.status.should == 400
- json_response['message'].should == '400 (Bad request) "title" not given'
+ expect(response.status).to eq(400)
+ expect(json_response['message']).to eq('400 (Bad request) "title" not given')
end
it "should create ssh key" do
@@ -340,24 +320,24 @@ describe API::API, api: true do
context 'when unauthenticated' do
it 'should return authentication error' do
get api("/users/#{user.id}/keys")
- response.status.should == 401
+ expect(response.status).to eq(401)
end
end
context 'when authenticated' do
it 'should return 404 for non-existing user' do
get api('/users/999999/keys', admin)
- response.status.should == 404
- json_response['message'].should == '404 User Not Found'
+ expect(response.status).to eq(404)
+ expect(json_response['message']).to eq('404 User Not Found')
end
it 'should return array of ssh keys' do
user.keys << key
user.save
get api("/users/#{user.id}/keys", admin)
- response.status.should == 200
- json_response.should be_an Array
- json_response.first['title'].should == key.title
+ expect(response.status).to eq(200)
+ expect(json_response).to be_an Array
+ expect(json_response.first['title']).to eq(key.title)
end
end
end
@@ -368,7 +348,7 @@ describe API::API, api: true do
context 'when unauthenticated' do
it 'should return authentication error' do
delete api("/users/#{user.id}/keys/42")
- response.status.should == 401
+ expect(response.status).to eq(401)
end
end
@@ -379,21 +359,21 @@ describe API::API, api: true do
expect {
delete api("/users/#{user.id}/keys/#{key.id}", admin)
}.to change { user.keys.count }.by(-1)
- response.status.should == 200
+ expect(response.status).to eq(200)
end
it 'should return 404 error if user not found' do
user.keys << key
user.save
delete api("/users/999999/keys/#{key.id}", admin)
- response.status.should == 404
- json_response['message'].should == '404 User Not Found'
+ expect(response.status).to eq(404)
+ expect(json_response['message']).to eq('404 User Not Found')
end
it 'should return 404 error if key not foud' do
delete api("/users/#{user.id}/keys/42", admin)
- response.status.should == 404
- json_response['message'].should == '404 Key Not Found'
+ expect(response.status).to eq(404)
+ expect(json_response['message']).to eq('404 Key Not Found')
end
end
end
@@ -403,41 +383,42 @@ describe API::API, api: true do
it "should delete user" do
delete api("/users/#{user.id}", admin)
- response.status.should == 200
+ expect(response.status).to eq(200)
expect { User.find(user.id) }.to raise_error ActiveRecord::RecordNotFound
- json_response['email'].should == user.email
+ expect(json_response['email']).to eq(user.email)
end
it "should not delete for unauthenticated user" do
delete api("/users/#{user.id}")
- response.status.should == 401
+ expect(response.status).to eq(401)
end
it "shouldn't available for non admin users" do
delete api("/users/#{user.id}", user)
- response.status.should == 403
+ expect(response.status).to eq(403)
end
it "should return 404 for non-existing user" do
delete api("/users/999999", admin)
- response.status.should == 404
- json_response['message'].should == '404 User Not Found'
+ expect(response.status).to eq(404)
+ expect(json_response['message']).to eq('404 User Not Found')
end
end
describe "GET /user" do
it "should return current user" do
get api("/user", user)
- response.status.should == 200
- json_response['email'].should == user.email
- json_response['is_admin'].should == user.is_admin?
- json_response['can_create_project'].should == user.can_create_project?
- json_response['can_create_group'].should == user.can_create_group?
+ expect(response.status).to eq(200)
+ expect(json_response['email']).to eq(user.email)
+ expect(json_response['is_admin']).to eq(user.is_admin?)
+ expect(json_response['can_create_project']).to eq(user.can_create_project?)
+ expect(json_response['can_create_group']).to eq(user.can_create_group?)
+ expect(json_response['projects_limit']).to eq(user.projects_limit)
end
it "should return 401 error if user is unauthenticated" do
get api("/user")
- response.status.should == 401
+ expect(response.status).to eq(401)
end
end
@@ -445,7 +426,7 @@ describe API::API, api: true do
context "when unauthenticated" do
it "should return authentication error" do
get api("/user/keys")
- response.status.should == 401
+ expect(response.status).to eq(401)
end
end
@@ -454,9 +435,9 @@ describe API::API, api: true do
user.keys << key
user.save
get api("/user/keys", user)
- response.status.should == 200
- json_response.should be_an Array
- json_response.first["title"].should == key.title
+ expect(response.status).to eq(200)
+ expect(json_response).to be_an Array
+ expect(json_response.first["title"]).to eq(key.title)
end
end
end
@@ -466,14 +447,14 @@ describe API::API, api: true do
user.keys << key
user.save
get api("/user/keys/#{key.id}", user)
- response.status.should == 200
- json_response["title"].should == key.title
+ expect(response.status).to eq(200)
+ expect(json_response["title"]).to eq(key.title)
end
it "should return 404 Not Found within invalid ID" do
get api("/user/keys/42", user)
- response.status.should == 404
- json_response['message'].should == '404 Not found'
+ expect(response.status).to eq(404)
+ expect(json_response['message']).to eq('404 Not found')
end
it "should return 404 error if admin accesses user's ssh key" do
@@ -481,8 +462,8 @@ describe API::API, api: true do
user.save
admin
get api("/user/keys/#{key.id}", admin)
- response.status.should == 404
- json_response['message'].should == '404 Not found'
+ expect(response.status).to eq(404)
+ expect(json_response['message']).to eq('404 Not found')
end
end
@@ -492,29 +473,29 @@ describe API::API, api: true do
expect {
post api("/user/keys", user), key_attrs
}.to change{ user.keys.count }.by(1)
- response.status.should == 201
+ expect(response.status).to eq(201)
end
it "should return a 401 error if unauthorized" do
post api("/user/keys"), title: 'some title', key: 'some key'
- response.status.should == 401
+ expect(response.status).to eq(401)
end
it "should not create ssh key without key" do
post api("/user/keys", user), title: 'title'
- response.status.should == 400
- json_response['message'].should == '400 (Bad request) "key" not given'
+ expect(response.status).to eq(400)
+ expect(json_response['message']).to eq('400 (Bad request) "key" not given')
end
it 'should not create ssh key without title' do
post api('/user/keys', user), key: 'some key'
- response.status.should == 400
- json_response['message'].should == '400 (Bad request) "title" not given'
+ expect(response.status).to eq(400)
+ expect(json_response['message']).to eq('400 (Bad request) "title" not given')
end
it "should not create ssh key without title" do
post api("/user/keys", user), key: "somekey"
- response.status.should == 400
+ expect(response.status).to eq(400)
end
end
@@ -525,19 +506,19 @@ describe API::API, api: true do
expect {
delete api("/user/keys/#{key.id}", user)
}.to change{user.keys.count}.by(-1)
- response.status.should == 200
+ expect(response.status).to eq(200)
end
it "should return success if key ID not found" do
delete api("/user/keys/42", user)
- response.status.should == 200
+ expect(response.status).to eq(200)
end
it "should return 401 error if unauthorized" do
user.keys << key
user.save
delete api("/user/keys/#{key.id}")
- response.status.should == 401
+ expect(response.status).to eq(401)
end
end
end
View Lorry Controller Status