summaryrefslogtreecommitdiff
path: root/spec/requests/api/services_spec.rb
diff options
context:
space:
mode:
authorJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-02-12 19:17:35 +0100
committerJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-02-12 19:17:35 +0100
commit0c4a70a306b871899bf87ce4673918abfee4d95f (patch)
treec7a702fb511209ffe0eceba245d1ffea71dce1aa /spec/requests/api/services_spec.rb
parentde1c450abd6b367390a1295cac402344f500d41d (diff)
downloadgitlab-ce-0c4a70a306b871899bf87ce4673918abfee4d95f.tar.gz
Updated rspec to rspec 3.x syntax
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Diffstat (limited to 'spec/requests/api/services_spec.rb')
-rw-r--r--spec/requests/api/services_spec.rb18
1 files changed, 9 insertions, 9 deletions
diff --git a/spec/requests/api/services_spec.rb b/spec/requests/api/services_spec.rb
index d8282d0696b..51c543578df 100644
--- a/spec/requests/api/services_spec.rb
+++ b/spec/requests/api/services_spec.rb
@@ -9,13 +9,13 @@ describe API::API, api: true do
it "should update gitlab-ci settings" do
put api("/projects/#{project.id}/services/gitlab-ci", user), token: 'secret-token', project_url: "http://ci.example.com/projects/1"
- response.status.should == 200
+ expect(response.status).to eq(200)
end
it "should return if required fields missing" do
put api("/projects/#{project.id}/services/gitlab-ci", user), project_url: "http://ci.example.com/projects/1", active: true
- response.status.should == 400
+ expect(response.status).to eq(400)
end
end
@@ -23,8 +23,8 @@ describe API::API, api: true do
it "should update gitlab-ci settings" do
delete api("/projects/#{project.id}/services/gitlab-ci", user)
- response.status.should == 200
- project.gitlab_ci_service.should be_nil
+ expect(response.status).to eq(200)
+ expect(project.gitlab_ci_service).to be_nil
end
end
@@ -33,15 +33,15 @@ describe API::API, api: true do
put api("/projects/#{project.id}/services/hipchat", user),
token: 'secret-token', room: 'test'
- response.status.should == 200
- project.hipchat_service.should_not be_nil
+ expect(response.status).to eq(200)
+ expect(project.hipchat_service).not_to be_nil
end
it 'should return if required fields missing' do
put api("/projects/#{project.id}/services/gitlab-ci", user),
token: 'secret-token', active: true
- response.status.should == 400
+ expect(response.status).to eq(400)
end
end
@@ -49,8 +49,8 @@ describe API::API, api: true do
it 'should delete hipchat settings' do
delete api("/projects/#{project.id}/services/hipchat", user)
- response.status.should == 200
- project.hipchat_service.should be_nil
+ expect(response.status).to eq(200)
+ expect(project.hipchat_service).to be_nil
end
end
end