summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Read <tread@gitlab.com>2018-12-18 13:40:31 +0100
committerPeter Leitzen <pleitzen@gitlab.com>2019-01-02 15:29:33 +0100
commit064409b854e66b2c5ebbbcad7a1be248483f40ba (patch)
tree9033e54f996135dea6c343c68d08d3d153ad937b
parent70f7550daa6ec4b234e4fc294b2fc7d17f4da56b (diff)
downloadgitlab-ce-064409b854e66b2c5ebbbcad7a1be248483f40ba.tar.gz
Add feature flag test for error-tracking settings page
-rw-r--r--app/helpers/projects_helper.rb1
-rw-r--r--app/views/projects/sidebar/_settings_operations.html.haml2
-rw-r--r--spec/features/projects/settings/operations_settings_spec.rb32
3 files changed, 15 insertions, 20 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 0cfc2db3285..dfb98179b4f 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -546,6 +546,7 @@ module ProjectsHelper
services#edit
repository#show
ci_cd#show
+ operations#show
badges#index
pages#show
]
diff --git a/app/views/projects/sidebar/_settings_operations.html.haml b/app/views/projects/sidebar/_settings_operations.html.haml
index 31dbd729f18..c33a3758b49 100644
--- a/app/views/projects/sidebar/_settings_operations.html.haml
+++ b/app/views/projects/sidebar/_settings_operations.html.haml
@@ -1,4 +1,4 @@
- if Feature.enabled?(:error_tracking, @project, default_enabled: true)
= nav_link(controller: [:operations]) do
- = link_to project_settings_operations_path(@project), title: _('Operations') do
+ = link_to project_settings_operations_path(@project), title: _('Operations'), 'data-qa-id': 'settings-operations' do
= _('Operations')
diff --git a/spec/features/projects/settings/operations_settings_spec.rb b/spec/features/projects/settings/operations_settings_spec.rb
index 84992ee92b8..79ce923b802 100644
--- a/spec/features/projects/settings/operations_settings_spec.rb
+++ b/spec/features/projects/settings/operations_settings_spec.rb
@@ -18,27 +18,21 @@ describe 'Projects > Settings > For a forked project', :js do
visit project_path(project)
wait_for_requests
- page.within '.nav-sidebar' do
- expect(page).to have_content ('Operations')
- end
+ expect(page).to have_selector('[data-qa-id="settings-operations"]', visible: false)
end
end
- # TODO: Complete this test
- # context 'when sidebar feature flag disabled' do
- # before do
- # stub_feature_flags(error_tracking: false)
- # end
-
- # it 'does not render the settings link in the sidebar' do
- # visit project_path(project)
- # wait_for_requests
-
- # find.find('qa-settings-item').find(:xpath, 'ancestor:')
- # page.within('.sidebar-sub-level-items', text:'Settings') do
- # expect(page).not_to have_content('Operations')
- # end
- # end
- # end
+ context 'when sidebar feature flag disabled' do
+ before do
+ stub_feature_flags(error_tracking: false)
+ end
+
+ it 'does not render the settings link in the sidebar' do
+ visit project_path(project)
+ wait_for_requests
+
+ expect(page).not_to have_selector('[data-qa-id="settings-operations"]', visible: false)
+ end
+ end
end
end