diff options
author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-05-25 13:57:22 +0200 |
---|---|---|
committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-05-25 13:57:22 +0200 |
commit | 7ec89692858a207691489aed566af7785a923895 (patch) | |
tree | dfad4c6ea77f322b68db974102c5ec54fe0366f6 /spec/controllers/projects/environments_controller_spec.rb | |
parent | 2f62af684e127010cffd81e027f469dcde3bc9b2 (diff) | |
parent | 78de1c059ac588df4ba1ef352b28e5b1c6102804 (diff) | |
download | gitlab-ce-7ec89692858a207691489aed566af7785a923895.tar.gz |
Merge branch 'master' into zj-realtime-env-list
Diffstat (limited to 'spec/controllers/projects/environments_controller_spec.rb')
-rw-r--r-- | spec/controllers/projects/environments_controller_spec.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb index 62938a56bb4..7bdb4879afd 100644 --- a/spec/controllers/projects/environments_controller_spec.rb +++ b/spec/controllers/projects/environments_controller_spec.rb @@ -15,11 +15,11 @@ describe Projects::EnvironmentsController do end describe 'GET index' do - context 'when standardrequest has been made' do + context 'when a request for the HTML is made' do it 'responds with status code 200' do get :index, environment_params - expect(response).to be_ok + expect(response).to have_http_status(:ok) end end @@ -89,6 +89,9 @@ describe Projects::EnvironmentsController do create(:environment, project: project, name: 'staging-1.0/review', state: :available) + create(:environment, project: project, + name: 'staging-1.0/zzz', + state: :available) end context 'when using default format' do @@ -103,7 +106,7 @@ describe Projects::EnvironmentsController do end context 'when using JSON format' do - it 'responds with JSON' do + it 'sorts the subfolders lexicographically' do get :folder, namespace_id: project.namespace, project_id: project, id: 'staging-1.0', @@ -113,6 +116,8 @@ describe Projects::EnvironmentsController do expect(response).not_to render_template 'folder' expect(json_response['environments'][0]) .to include('name' => 'staging-1.0/review') + expect(json_response['environments'][1]) + .to include('name' => 'staging-1.0/zzz') end end end |