Skip to content
Snippets Groups Projects

Add support to configure webhook_timeout in gitlab.yaml

Closed gitlab-qa-bot requested to merge github/fork/wesgurn/master into master
1 file
+ 19
0
Compare changes
  • Side-by-side
  • Inline
@@ -52,11 +52,53 @@ describe API::API do
}.to change { User.count }.by(1)
end
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
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
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
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
end
it "should create non-admin users by default" do
post api('/users', admin), attributes_for(:user)
response.status.should == 201
user_id = json_response['id']
new_user = User.find(user_id)
new_user.should_not == nil
new_user.admin.should == false
end
it "should return 201 Created on success" do
post api("/users", admin), attributes_for(:user, projects_limit: 3)
response.status.should == 201
end
it "creating a user should respect default project limit" do
limit = 123456
Gitlab.config.gitlab.stub(:default_projects_limit).and_return(limit)
attr = attributes_for(:user )
expect {
post api("/users", admin), attr
}.to change { User.count }.by(1)
user = User.find_by_username(attr[:username])
user.projects_limit.should == limit
user.theme_id.should == Gitlab::Theme::MARS
Gitlab.config.gitlab.unstub(:default_projects_limit)
end
it "should not create user with invalid email" do
post api("/users", admin), { email: "invalid email", password: 'password' }
response.status.should == 400
@@ -122,6 +164,8 @@ describe API::API do
end
describe "PUT /users/:id" do
let!(:admin_user) { create(:admin) }
before { admin }
it "should update user with new bio" do
@@ -131,6 +175,21 @@ describe API::API do
user.reload.bio.should == 'new test bio'
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
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
end
it "should not allow invalid update" do
put api("/users/#{user.id}", admin), {email: 'invalid email'}
response.status.should == 404
@@ -215,7 +274,6 @@ describe API::API do
response.status.should == 200
json_response['email'].should == user.email
json_response['is_admin'].should == user.is_admin?
json_response['can_create_team'].should == user.can_create_team?
json_response['can_create_project'].should == user.can_create_project?
json_response['can_create_group'].should == user.can_create_group?
end
Loading