summaryrefslogtreecommitdiff
path: root/spec/requests
diff options
context:
space:
mode:
Diffstat (limited to 'spec/requests')
-rw-r--r--spec/requests/api/branches_spec.rb4
-rw-r--r--spec/requests/api/commits_spec.rb4
-rw-r--r--spec/requests/api/groups_spec.rb36
-rw-r--r--spec/requests/api/merge_requests_spec.rb56
-rw-r--r--spec/requests/api/project_members_spec.rb46
-rw-r--r--spec/requests/api/projects_spec.rb13
-rw-r--r--spec/requests/api/repositories_spec.rb4
7 files changed, 111 insertions, 52 deletions
diff --git a/spec/requests/api/branches_spec.rb b/spec/requests/api/branches_spec.rb
index e7f91c5e46e..caded2c9289 100644
--- a/spec/requests/api/branches_spec.rb
+++ b/spec/requests/api/branches_spec.rb
@@ -7,8 +7,8 @@ describe API::API, api: true do
let(:user) { create(:user) }
let(:user2) { create(:user) }
let!(:project) { create(:project, creator_id: user.id) }
- let!(:master) { create(:users_project, user: user, project: project, project_access: UsersProject::MASTER) }
- let!(:guest) { create(:users_project, user: user2, project: project, project_access: UsersProject::GUEST) }
+ let!(:master) { create(:project_member, user: user, project: project, access_level: ProjectMember::MASTER) }
+ let!(:guest) { create(:project_member, user: user2, project: project, access_level: ProjectMember::GUEST) }
let!(:branch_name) { 'feature' }
let!(:branch_sha) { '0b4bc9a49b562e85de7cc9e834518ea6828729b9' }
diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb
index b56269d275d..38e0a284c36 100644
--- a/spec/requests/api/commits_spec.rb
+++ b/spec/requests/api/commits_spec.rb
@@ -6,8 +6,8 @@ describe API::API, api: true do
let(:user) { create(:user) }
let(:user2) { create(:user) }
let!(:project) { create(:project, creator_id: user.id) }
- let!(:master) { create(:users_project, user: user, project: project, project_access: UsersProject::MASTER) }
- let!(:guest) { create(:users_project, user: user2, project: project, project_access: UsersProject::GUEST) }
+ let!(:master) { create(:project_member, user: user, project: project, access_level: ProjectMember::MASTER) }
+ let!(:guest) { create(:project_member, user: user2, project: project, access_level: ProjectMember::GUEST) }
before { project.team << [user, :reporter] }
diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb
index f27a60e4bc0..42ccad71aaf 100644
--- a/spec/requests/api/groups_spec.rb
+++ b/spec/requests/api/groups_spec.rb
@@ -174,10 +174,10 @@ describe API::API, api: true do
let(:guest) { create(:user) }
let!(:group_with_members) do
group = create(:group)
- group.add_users([reporter.id], UsersGroup::REPORTER)
- group.add_users([developer.id], UsersGroup::DEVELOPER)
- group.add_users([master.id], UsersGroup::MASTER)
- group.add_users([guest.id], UsersGroup::GUEST)
+ group.add_users([reporter.id], GroupMember::REPORTER)
+ group.add_users([developer.id], GroupMember::DEVELOPER)
+ group.add_users([master.id], GroupMember::MASTER)
+ group.add_users([guest.id], GroupMember::GUEST)
group
end
let!(:group_no_members) { create(:group) }
@@ -195,11 +195,11 @@ describe API::API, api: true do
response.status.should == 200
json_response.should be_an Array
json_response.size.should == 5
- json_response.find { |e| e['id']==owner.id }['access_level'].should == UsersGroup::OWNER
- json_response.find { |e| e['id']==reporter.id }['access_level'].should == UsersGroup::REPORTER
- json_response.find { |e| e['id']==developer.id }['access_level'].should == UsersGroup::DEVELOPER
- json_response.find { |e| e['id']==master.id }['access_level'].should == UsersGroup::MASTER
- json_response.find { |e| e['id']==guest.id }['access_level'].should == UsersGroup::GUEST
+ json_response.find { |e| e['id']==owner.id }['access_level'].should == GroupMember::OWNER
+ json_response.find { |e| e['id']==reporter.id }['access_level'].should == GroupMember::REPORTER
+ json_response.find { |e| e['id']==developer.id }['access_level'].should == GroupMember::DEVELOPER
+ json_response.find { |e| e['id']==master.id }['access_level'].should == GroupMember::MASTER
+ json_response.find { |e| e['id']==guest.id }['access_level'].should == GroupMember::GUEST
end
end
@@ -213,29 +213,29 @@ describe API::API, api: true do
describe "POST /groups/:id/members" do
context "when not a member of the group" do
it "should not add guest as member of group_no_members when adding being done by person outside the group" do
- post api("/groups/#{group_no_members.id}/members", reporter), user_id: guest.id, access_level: UsersGroup::MASTER
+ post api("/groups/#{group_no_members.id}/members", reporter), user_id: guest.id, access_level: GroupMember::MASTER
response.status.should == 403
end
end
context "when a member of the group" do
it "should return ok and add new member" do
- count_before=group_no_members.users_groups.count
+ count_before=group_no_members.group_members.count
new_user = create(:user)
- post api("/groups/#{group_no_members.id}/members", owner), user_id: new_user.id, access_level: UsersGroup::MASTER
+ post api("/groups/#{group_no_members.id}/members", owner), user_id: new_user.id, access_level: GroupMember::MASTER
response.status.should == 201
json_response['name'].should == new_user.name
- json_response['access_level'].should == UsersGroup::MASTER
- group_no_members.users_groups.count.should == count_before + 1
+ json_response['access_level'].should == GroupMember::MASTER
+ group_no_members.group_members.count.should == count_before + 1
end
it "should return error if member already exists" do
- post api("/groups/#{group_with_members.id}/members", owner), user_id: master.id, access_level: UsersGroup::MASTER
+ post api("/groups/#{group_with_members.id}/members", owner), user_id: master.id, access_level: GroupMember::MASTER
response.status.should == 409
end
it "should return a 400 error when user id is not given" do
- post api("/groups/#{group_no_members.id}/members", owner), access_level: UsersGroup::MASTER
+ post api("/groups/#{group_no_members.id}/members", owner), access_level: GroupMember::MASTER
response.status.should == 400
end
@@ -262,10 +262,10 @@ describe API::API, api: true do
context "when a member of the group" do
it "should delete guest's membership of group" do
- count_before=group_with_members.users_groups.count
+ count_before=group_with_members.group_members.count
delete api("/groups/#{group_with_members.id}/members/#{guest.id}", owner)
response.status.should == 200
- group_with_members.users_groups.count.should == count_before - 1
+ group_with_members.group_members.count.should == count_before - 1
end
it "should return a 404 error when user id is not known" do
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 2684c1f9e5a..5ba3a330991 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -57,6 +57,46 @@ describe API::API, api: true do
json_response.length.should == 1
json_response.first['title'].should == merge_request_merged.title
end
+
+ context "with ordering" do
+ before do
+ @mr_later = mr_with_later_created_and_updated_at_time
+ @mr_earlier = mr_with_earlier_created_and_updated_at_time
+ end
+
+ it "should return an array of merge_requests in ascending order" do
+ get api("/projects/#{project.id}/merge_requests?sort=asc", user)
+ response.status.should == 200
+ json_response.should be_an Array
+ json_response.length.should == 3
+ json_response.first['id'].should == @mr_earlier.id
+ json_response.last['id'].should == @mr_later.id
+ end
+ it "should return an array of merge_requests in descending order" do
+ get api("/projects/#{project.id}/merge_requests?sort=desc", user)
+ response.status.should == 200
+ json_response.should be_an Array
+ json_response.length.should == 3
+ json_response.first['id'].should == @mr_later.id
+ json_response.last['id'].should == @mr_earlier.id
+ end
+ it "should return an array of merge_requests ordered by updated_at" do
+ get api("/projects/#{project.id}/merge_requests?order_by=updated_at", user)
+ response.status.should == 200
+ json_response.should be_an Array
+ json_response.length.should == 3
+ json_response.first['id'].should == @mr_earlier.id
+ json_response.last['id'].should == @mr_later.id
+ end
+ it "should return an array of merge_requests ordered by created_at" do
+ get api("/projects/#{project.id}/merge_requests?sort=created_at", user)
+ response.status.should == 200
+ json_response.should be_an Array
+ json_response.length.should == 3
+ json_response.first['id'].should == @mr_earlier.id
+ json_response.last['id'].should == @mr_later.id
+ end
+ end
end
end
@@ -329,4 +369,20 @@ describe API::API, api: true do
response.status.should == 404
end
end
+
+ def mr_with_later_created_and_updated_at_time
+ merge_request
+ merge_request.created_at += 1.hour
+ merge_request.updated_at += 30.minutes
+ merge_request.save
+ merge_request
+ end
+
+ def mr_with_earlier_created_and_updated_at_time
+ merge_request_closed
+ merge_request_closed.created_at -= 1.hour
+ merge_request_closed.updated_at -= 30.minutes
+ merge_request_closed.save
+ merge_request_closed
+ end
end
diff --git a/spec/requests/api/project_members_spec.rb b/spec/requests/api/project_members_spec.rb
index 3c480c2ac4b..836f21f3e0b 100644
--- a/spec/requests/api/project_members_spec.rb
+++ b/spec/requests/api/project_members_spec.rb
@@ -6,12 +6,12 @@ describe API::API, api: true do
let(:user2) { create(:user) }
let(:user3) { create(:user) }
let(:project) { create(:project, creator_id: user.id, namespace: user.namespace) }
- let(:users_project) { create(:users_project, user: user, project: project, project_access: UsersProject::MASTER) }
- let(:users_project2) { create(:users_project, user: user3, project: project, project_access: UsersProject::DEVELOPER) }
+ let(:project_member) { create(:project_member, user: user, project: project, access_level: ProjectMember::MASTER) }
+ let(:project_member2) { create(:project_member, user: user3, project: project, access_level: ProjectMember::DEVELOPER) }
describe "GET /projects/:id/members" do
- before { users_project }
- before { users_project2 }
+ before { project_member }
+ before { project_member2 }
it "should return project team members" do
get api("/projects/#{project.id}/members", user)
@@ -36,13 +36,13 @@ describe API::API, api: true do
end
describe "GET /projects/:id/members/:user_id" do
- before { users_project }
+ before { project_member }
it "should return project team member" do
get api("/projects/#{project.id}/members/#{user.id}", user)
response.status.should == 200
json_response['username'].should == user.username
- json_response['access_level'].should == UsersProject::MASTER
+ json_response['access_level'].should == ProjectMember::MASTER
end
it "should return a 404 error if user id not found" do
@@ -55,29 +55,29 @@ describe API::API, api: true do
it "should add user to project team" do
expect {
post api("/projects/#{project.id}/members", user), user_id: user2.id,
- access_level: UsersProject::DEVELOPER
- }.to change { UsersProject.count }.by(1)
+ access_level: ProjectMember::DEVELOPER
+ }.to change { ProjectMember.count }.by(1)
response.status.should == 201
json_response['username'].should == user2.username
- json_response['access_level'].should == UsersProject::DEVELOPER
+ json_response['access_level'].should == ProjectMember::DEVELOPER
end
it "should return a 201 status if user is already project member" do
post api("/projects/#{project.id}/members", user), user_id: user2.id,
- access_level: UsersProject::DEVELOPER
+ access_level: ProjectMember::DEVELOPER
expect {
post api("/projects/#{project.id}/members", user), user_id: user2.id,
- access_level: UsersProject::DEVELOPER
- }.not_to change { UsersProject.count }.by(1)
+ access_level: ProjectMember::DEVELOPER
+ }.not_to change { ProjectMember.count }.by(1)
response.status.should == 201
json_response['username'].should == user2.username
- json_response['access_level'].should == UsersProject::DEVELOPER
+ json_response['access_level'].should == ProjectMember::DEVELOPER
end
it "should return a 400 error when user id is not given" do
- post api("/projects/#{project.id}/members", user), access_level: UsersProject::MASTER
+ post api("/projects/#{project.id}/members", user), access_level: ProjectMember::MASTER
response.status.should == 400
end
@@ -93,17 +93,17 @@ describe API::API, api: true do
end
describe "PUT /projects/:id/members/:user_id" do
- before { users_project2 }
+ before { project_member2 }
it "should update project team member" do
- put api("/projects/#{project.id}/members/#{user3.id}", user), access_level: UsersProject::MASTER
+ put api("/projects/#{project.id}/members/#{user3.id}", user), access_level: ProjectMember::MASTER
response.status.should == 200
json_response['username'].should == user3.username
- json_response['access_level'].should == UsersProject::MASTER
+ json_response['access_level'].should == ProjectMember::MASTER
end
it "should return a 404 error if user_id is not found" do
- put api("/projects/#{project.id}/members/1234", user), access_level: UsersProject::MASTER
+ put api("/projects/#{project.id}/members/1234", user), access_level: ProjectMember::MASTER
response.status.should == 404
end
@@ -119,20 +119,20 @@ describe API::API, api: true do
end
describe "DELETE /projects/:id/members/:user_id" do
- before { users_project }
- before { users_project2 }
+ before { project_member }
+ before { project_member2 }
it "should remove user from project team" do
expect {
delete api("/projects/#{project.id}/members/#{user3.id}", user)
- }.to change { UsersProject.count }.by(-1)
+ }.to change { ProjectMember.count }.by(-1)
end
it "should return 200 if team member is not part of a project" do
delete api("/projects/#{project.id}/members/#{user3.id}", user)
expect {
delete api("/projects/#{project.id}/members/#{user3.id}", user)
- }.to_not change { UsersProject.count }.by(1)
+ }.to_not change { ProjectMember.count }.by(1)
end
it "should return 200 if team member already removed" do
@@ -144,7 +144,7 @@ describe API::API, api: true do
it "should return 200 OK when the user was not member" do
expect {
delete api("/projects/#{project.id}/members/1000000", user)
- }.to change { UsersProject.count }.by(0)
+ }.to change { ProjectMember.count }.by(0)
response.status.should == 200
json_response['message'].should == "Access revoked"
json_response['id'].should == 1000000
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 31c07a12eda..571d8506277 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -8,8 +8,8 @@ describe API::API, api: true do
let(:admin) { create(:admin) }
let(:project) { create(:project, creator_id: user.id, namespace: user.namespace) }
let(:snippet) { create(:project_snippet, author: user, project: project, title: 'example') }
- let(:users_project) { create(:users_project, user: user, project: project, project_access: UsersProject::MASTER) }
- let(:users_project2) { create(:users_project, user: user3, project: project, project_access: UsersProject::DEVELOPER) }
+ let(:project_member) { create(:project_member, user: user, project: project, access_level: ProjectMember::MASTER) }
+ let(:project_member2) { create(:project_member, user: user3, project: project, access_level: ProjectMember::DEVELOPER) }
describe "GET /projects" do
before { project }
@@ -269,7 +269,7 @@ describe API::API, api: true do
describe "GET /projects/:id" do
before { project }
- before { users_project }
+ before { project_member }
it "should return a project by id" do
get api("/projects/#{project.id}", user)
@@ -298,7 +298,10 @@ describe API::API, api: true do
describe 'permissions' do
context 'personal project' do
- before { get api("/projects/#{project.id}", user) }
+ before do
+ project.team << [user, :master]
+ get api("/projects/#{project.id}", user)
+ end
it { response.status.should == 200 }
it { json_response['permissions']["project_access"]["access_level"].should == Gitlab::Access::MASTER }
@@ -320,7 +323,7 @@ describe API::API, api: true do
end
describe "GET /projects/:id/events" do
- before { users_project }
+ before { project_member }
it "should return a project events" do
get api("/projects/#{project.id}/events", user)
diff --git a/spec/requests/api/repositories_spec.rb b/spec/requests/api/repositories_spec.rb
index 17173aaeeac..a339dbfe9db 100644
--- a/spec/requests/api/repositories_spec.rb
+++ b/spec/requests/api/repositories_spec.rb
@@ -8,8 +8,8 @@ describe API::API, api: true do
let(:user) { create(:user) }
let(:user2) { create(:user) }
let!(:project) { create(:project, creator_id: user.id) }
- let!(:master) { create(:users_project, user: user, project: project, project_access: UsersProject::MASTER) }
- let!(:guest) { create(:users_project, user: user2, project: project, project_access: UsersProject::GUEST) }
+ let!(:master) { create(:project_member, user: user, project: project, access_level: ProjectMember::MASTER) }
+ let!(:guest) { create(:project_member, user: user2, project: project, access_level: ProjectMember::GUEST) }
before { project.team << [user, :reporter] }
View Lorry Controller Status