diff options
-rw-r--r-- | app/serializers/environment_entity.rb | 2 | ||||
-rw-r--r-- | spec/features/projects/environments/environments_spec.rb | 26 |
2 files changed, 27 insertions, 1 deletions
diff --git a/app/serializers/environment_entity.rb b/app/serializers/environment_entity.rb index abb5fb1cf52..e77705a0d39 100644 --- a/app/serializers/environment_entity.rb +++ b/app/serializers/environment_entity.rb @@ -27,7 +27,7 @@ class EnvironmentEntity < Grape::Entity end expose :folder_path do |environment| - # folder_project_environments_path(environment.project, environment) + folder_project_environments_path(environment.project, environment.environment_type || environment.name) end expose :created_at, :updated_at diff --git a/spec/features/projects/environments/environments_spec.rb b/spec/features/projects/environments/environments_spec.rb index b314d7139a5..dda57ee1320 100644 --- a/spec/features/projects/environments/environments_spec.rb +++ b/spec/features/projects/environments/environments_spec.rb @@ -269,6 +269,32 @@ feature 'Environments page', :js do end end + describe 'environments folders' do + before do + create(:environment, project: project, + name: 'staging/review-1', + state: :available) + create(:environment, project: project, + name: 'staging/review-2', + state: :available) + end + + scenario 'users unfurls an environment folder' do + visit_environments(project) + + expect(page).not_to have_content 'review-1' + expect(page).not_to have_content 'review-2' + expect(page).to have_content 'staging 2' + + within('.folder-row') do + find('.folder-name', text: 'staging').click + end + + expect(page).to have_content 'review-1' + expect(page).to have_content 'review-2' + end + end + def have_terminal_button have_link(nil, href: terminal_project_environment_path(project, environment)) end |