summaryrefslogtreecommitdiff
path: root/spec/requests/api/environments_spec.rb
diff options
context:
space:
mode:
authorZ.J. van de Weg <zegerjan@gitlab.com>2016-07-26 14:19:37 +0200
committerZ.J. van de Weg <zegerjan@gitlab.com>2016-07-29 13:54:45 +0200
commit76e9b68439510af5c783a81b93944f1c8d96d150 (patch)
tree62f4dde6c0caa56aa9ebbbdd31df9a215767dc87 /spec/requests/api/environments_spec.rb
parent84cd2120952e7ee4095cb4b5d7c959f2c11610c5 (diff)
downloadgitlab-ce-76e9b68439510af5c783a81b93944f1c8d96d150.tar.gz
Incorporate feedback
Diffstat (limited to 'spec/requests/api/environments_spec.rb')
-rw-r--r--spec/requests/api/environments_spec.rb15
1 files changed, 7 insertions, 8 deletions
diff --git a/spec/requests/api/environments_spec.rb b/spec/requests/api/environments_spec.rb
index 822139dbf3b..b731c58a206 100644
--- a/spec/requests/api/environments_spec.rb
+++ b/spec/requests/api/environments_spec.rb
@@ -5,7 +5,7 @@ describe API::API, api: true do
let(:user) { create(:user) }
let(:non_member) { create(:user) }
- let(:project) { create(:project, :private, creator_id: user.id, namespace: user.namespace) }
+ let(:project) { create(:project, :private, namespace: user.namespace) }
let!(:environment) { create(:environment, project: project) }
before do
@@ -14,7 +14,7 @@ describe API::API, api: true do
describe 'GET /projects/:id/environments' do
context 'as member of the project' do
- it 'should return project labels' do
+ it 'should return project environments' do
get api("/projects/#{project.id}/environments", user)
expect(response).to have_http_status(200)
@@ -34,7 +34,7 @@ describe API::API, api: true do
end
end
- describe 'POST /projects/:id/labels' do
+ describe 'POST /projects/:id/environments' do
context 'as a member' do
it 'creates a environment with valid params' do
post api("/projects/#{project.id}/environments", user), name: "mepmep"
@@ -50,11 +50,10 @@ describe API::API, api: true do
expect(response).to have_http_status(400)
end
- it 'should return 409 if environment already exists' do
+ it 'should return 400 if environment already exists' do
post api("/projects/#{project.id}/environments", user), name: environment.name
- expect(response).to have_http_status(409)
- expect(json_response['message']).to eq('Environment already exists')
+ expect(response).to have_http_status(400)
end
end
@@ -87,11 +86,11 @@ describe API::API, api: true do
describe 'PUT /projects/:id/environments/:environment_id' do
it 'should return 200 if name and external_url are changed' do
put api("/projects/#{project.id}/environments/#{environment.id}", user),
- name: 'Mepmep', external_url: 'mepmep.whatever.ninja'
+ name: 'Mepmep', external_url: 'https://mepmep.whatever.ninja'
expect(response).to have_http_status(200)
expect(json_response['name']).to eq('Mepmep')
- expect(json_response['external_url']).to eq('mepmep.whatever.ninja')
+ expect(json_response['external_url']).to eq('https://mepmep.whatever.ninja')
end
it 'should return 404 if the environment does not exist' do