summaryrefslogtreecommitdiff
path: root/spec/requests/api/branches_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/requests/api/branches_spec.rb')
-rw-r--r--spec/requests/api/branches_spec.rb80
1 files changed, 40 insertions, 40 deletions
diff --git a/spec/requests/api/branches_spec.rb b/spec/requests/api/branches_spec.rb
index b45572c39fd..f40d68b75a4 100644
--- a/spec/requests/api/branches_spec.rb
+++ b/spec/requests/api/branches_spec.rb
@@ -15,79 +15,79 @@ describe API::API, api: true do
describe "GET /projects/:id/repository/branches" do
it "should return an array of project branches" do
get api("/projects/#{project.id}/repository/branches", user)
- response.status.should == 200
- json_response.should be_an Array
- json_response.first['name'].should == project.repository.branch_names.first
+ expect(response.status).to eq(200)
+ expect(json_response).to be_an Array
+ expect(json_response.first['name']).to eq(project.repository.branch_names.first)
end
end
describe "GET /projects/:id/repository/branches/:branch" do
it "should return the branch information for a single branch" do
get api("/projects/#{project.id}/repository/branches/#{branch_name}", user)
- response.status.should == 200
+ expect(response.status).to eq(200)
- json_response['name'].should == branch_name
- json_response['commit']['id'].should == branch_sha
- json_response['protected'].should == false
+ expect(json_response['name']).to eq(branch_name)
+ expect(json_response['commit']['id']).to eq(branch_sha)
+ expect(json_response['protected']).to eq(false)
end
it "should return a 403 error if guest" do
get api("/projects/#{project.id}/repository/branches", user2)
- response.status.should == 403
+ expect(response.status).to eq(403)
end
it "should return a 404 error if branch is not available" do
get api("/projects/#{project.id}/repository/branches/unknown", user)
- response.status.should == 404
+ expect(response.status).to eq(404)
end
end
describe "PUT /projects/:id/repository/branches/:branch/protect" do
it "should protect a single branch" do
put api("/projects/#{project.id}/repository/branches/#{branch_name}/protect", user)
- response.status.should == 200
+ expect(response.status).to eq(200)
- json_response['name'].should == branch_name
- json_response['commit']['id'].should == branch_sha
- json_response['protected'].should == true
+ expect(json_response['name']).to eq(branch_name)
+ expect(json_response['commit']['id']).to eq(branch_sha)
+ expect(json_response['protected']).to eq(true)
end
it "should return a 404 error if branch not found" do
put api("/projects/#{project.id}/repository/branches/unknown/protect", user)
- response.status.should == 404
+ expect(response.status).to eq(404)
end
it "should return a 403 error if guest" do
put api("/projects/#{project.id}/repository/branches/#{branch_name}/protect", user2)
- response.status.should == 403
+ expect(response.status).to eq(403)
end
it "should return success when protect branch again" do
put api("/projects/#{project.id}/repository/branches/#{branch_name}/protect", user)
put api("/projects/#{project.id}/repository/branches/#{branch_name}/protect", user)
- response.status.should == 200
+ expect(response.status).to eq(200)
end
end
describe "PUT /projects/:id/repository/branches/:branch/unprotect" do
it "should unprotect a single branch" do
put api("/projects/#{project.id}/repository/branches/#{branch_name}/unprotect", user)
- response.status.should == 200
+ expect(response.status).to eq(200)
- json_response['name'].should == branch_name
- json_response['commit']['id'].should == branch_sha
- json_response['protected'].should == false
+ expect(json_response['name']).to eq(branch_name)
+ expect(json_response['commit']['id']).to eq(branch_sha)
+ expect(json_response['protected']).to eq(false)
end
it "should return success when unprotect branch" do
put api("/projects/#{project.id}/repository/branches/unknown/unprotect", user)
- response.status.should == 404
+ expect(response.status).to eq(404)
end
it "should return success when unprotect branch again" do
put api("/projects/#{project.id}/repository/branches/#{branch_name}/unprotect", user)
put api("/projects/#{project.id}/repository/branches/#{branch_name}/unprotect", user)
- response.status.should == 200
+ expect(response.status).to eq(200)
end
end
@@ -97,46 +97,46 @@ describe API::API, api: true do
branch_name: 'feature1',
ref: branch_sha
- response.status.should == 201
+ expect(response.status).to eq(201)
- json_response['name'].should == 'feature1'
- json_response['commit']['id'].should == branch_sha
+ expect(json_response['name']).to eq('feature1')
+ expect(json_response['commit']['id']).to eq(branch_sha)
end
it "should deny for user without push access" do
post api("/projects/#{project.id}/repository/branches", user2),
branch_name: branch_name,
ref: branch_sha
- response.status.should == 403
+ expect(response.status).to eq(403)
end
it 'should return 400 if branch name is invalid' do
post api("/projects/#{project.id}/repository/branches", user),
branch_name: 'new design',
ref: branch_sha
- response.status.should == 400
- json_response['message'].should == 'Branch name invalid'
+ expect(response.status).to eq(400)
+ expect(json_response['message']).to eq('Branch name invalid')
end
it 'should return 400 if branch already exists' do
post api("/projects/#{project.id}/repository/branches", user),
branch_name: 'new_design1',
ref: branch_sha
- response.status.should == 201
+ expect(response.status).to eq(201)
post api("/projects/#{project.id}/repository/branches", user),
branch_name: 'new_design1',
ref: branch_sha
- response.status.should == 400
- json_response['message'].should == 'Branch already exists'
+ expect(response.status).to eq(400)
+ expect(json_response['message']).to eq('Branch already exists')
end
it 'should return 400 if ref name is invalid' do
post api("/projects/#{project.id}/repository/branches", user),
branch_name: 'new_design3',
ref: 'foo'
- response.status.should == 400
- json_response['message'].should == 'Invalid reference name'
+ expect(response.status).to eq(400)
+ expect(json_response['message']).to eq('Invalid reference name')
end
end
@@ -145,26 +145,26 @@ describe API::API, api: true do
it "should remove branch" do
delete api("/projects/#{project.id}/repository/branches/#{branch_name}", user)
- response.status.should == 200
- json_response['branch_name'].should == branch_name
+ expect(response.status).to eq(200)
+ expect(json_response['branch_name']).to eq(branch_name)
end
it 'should return 404 if branch not exists' do
delete api("/projects/#{project.id}/repository/branches/foobar", user)
- response.status.should == 404
+ expect(response.status).to eq(404)
end
it "should remove protected branch" do
project.protected_branches.create(name: branch_name)
delete api("/projects/#{project.id}/repository/branches/#{branch_name}", user)
- response.status.should == 405
- json_response['message'].should == 'Protected branch cant be removed'
+ expect(response.status).to eq(405)
+ expect(json_response['message']).to eq('Protected branch cant be removed')
end
it "should not remove HEAD branch" do
delete api("/projects/#{project.id}/repository/branches/master", user)
- response.status.should == 405
- json_response['message'].should == 'Cannot remove HEAD branch'
+ expect(response.status).to eq(405)
+ expect(json_response['message']).to eq('Cannot remove HEAD branch')
end
end
end