diff options
author | Rémy Coutable <remy@rymai.me> | 2016-12-12 17:54:00 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-12-12 17:54:00 +0000 |
commit | 927a75567a9ff61f4c7ccdc4caa4280bbcab551c (patch) | |
tree | a0bd0fccf7a4c945f98edd4249fbb53316692090 /spec/requests | |
parent | 61844de497ed364049905f9da91f11140f6cfd9b (diff) | |
parent | 8d0645c2ce3769268020ad6f8e51db07fb1e4bc6 (diff) | |
download | gitlab-ce-927a75567a9ff61f4c7ccdc4caa4280bbcab551c.tar.gz |
Merge branch 'grapify-service-api' into 'master'
Grapify the service API
Related to #22928
See merge request !7970
Diffstat (limited to 'spec/requests')
-rw-r--r-- | spec/requests/api/services_spec.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/requests/api/services_spec.rb b/spec/requests/api/services_spec.rb index d30361f53d4..668e39f9dba 100644 --- a/spec/requests/api/services_spec.rb +++ b/spec/requests/api/services_spec.rb @@ -2,6 +2,7 @@ require "spec_helper" describe API::Services, api: true do include ApiHelpers + let(:user) { create(:user) } let(:admin) { create(:admin) } let(:user2) { create(:user) } @@ -98,7 +99,7 @@ describe API::Services, api: true do post api("/projects/#{project.id}/services/idonotexist/trigger") expect(response).to have_http_status(404) - expect(json_response["message"]).to eq("404 Service Not Found") + expect(json_response["error"]).to eq("404 Not Found") end end @@ -114,7 +115,7 @@ describe API::Services, api: true do end it 'when the service is inactive' do - post api("/projects/#{project.id}/services/mattermost_slash_commands/trigger") + post api("/projects/#{project.id}/services/mattermost_slash_commands/trigger"), params expect(response).to have_http_status(404) end |