summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/environments_controller_spec.rb
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2017-05-17 13:36:19 +0200
committerZ.J. van de Weg <git@zjvandeweg.nl>2017-05-17 13:45:11 +0200
commit0385f9efc2a7844b0900958281296eb444b5070c (patch)
tree8d8c753de4a73202841574af5085fff6164b32ba /spec/controllers/projects/environments_controller_spec.rb
parent6a2bcb4b2ae8bed4730f3589c2693b17c57b4a75 (diff)
downloadgitlab-ce-0385f9efc2a7844b0900958281296eb444b5070c.tar.gz
Sort environments folders when opening them
Fixes gitlab-org/gitlab-ce#30814
Diffstat (limited to 'spec/controllers/projects/environments_controller_spec.rb')
-rw-r--r--spec/controllers/projects/environments_controller_spec.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb
index c0f8c36a018..e783c60452f 100644
--- a/spec/controllers/projects/environments_controller_spec.rb
+++ b/spec/controllers/projects/environments_controller_spec.rb
@@ -84,6 +84,9 @@ describe Projects::EnvironmentsController do
create(:environment, project: project,
name: 'staging-1.0/review',
state: :available)
+ create(:environment, project: project,
+ name: 'staging-1.0/preview',
+ state: :available)
end
context 'when using default format' do
@@ -107,6 +110,8 @@ describe Projects::EnvironmentsController do
expect(response).to be_ok
expect(response).not_to render_template 'folder'
expect(json_response['environments'][0])
+ .to include('name' => 'staging-1.0/preview')
+ expect(json_response['environments'][1])
.to include('name' => 'staging-1.0/review')
end
end