From b3a736ed88a1db0391cd9881e70b987bab7d89d1 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 14 Feb 2020 15:09:08 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/requests/self_monitoring_project_spec.rb | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) (limited to 'spec/requests/self_monitoring_project_spec.rb') diff --git a/spec/requests/self_monitoring_project_spec.rb b/spec/requests/self_monitoring_project_spec.rb index 5e46645e7a0..6a0258c349f 100644 --- a/spec/requests/self_monitoring_project_spec.rb +++ b/spec/requests/self_monitoring_project_spec.rb @@ -17,11 +17,7 @@ describe 'Self-Monitoring project requests' do login_as(admin) end - context 'with feature flag disabled' do - it_behaves_like 'not accessible if feature flag is disabled' - end - - context 'with feature flag enabled' do + context 'when the self monitoring project is created' do let(:status_api) { status_create_self_monitoring_project_admin_application_settings_path } it_behaves_like 'triggers async worker, returns sidekiq job_id with response accepted' @@ -45,11 +41,7 @@ describe 'Self-Monitoring project requests' do login_as(admin) end - context 'with feature flag disabled' do - it_behaves_like 'not accessible if feature flag is disabled' - end - - context 'with feature flag enabled' do + context 'when the self monitoring project is being created' do it_behaves_like 'handles invalid job_id' context 'when job is in progress' do @@ -129,11 +121,7 @@ describe 'Self-Monitoring project requests' do login_as(admin) end - context 'with feature flag disabled' do - it_behaves_like 'not accessible if feature flag is disabled' - end - - context 'with feature flag enabled' do + context 'when the self monitoring project is deleted' do let(:status_api) { status_delete_self_monitoring_project_admin_application_settings_path } it_behaves_like 'triggers async worker, returns sidekiq job_id with response accepted' @@ -157,11 +145,7 @@ describe 'Self-Monitoring project requests' do login_as(admin) end - context 'with feature flag disabled' do - it_behaves_like 'not accessible if feature flag is disabled' - end - - context 'with feature flag enabled' do + context 'when the self monitoring project is being deleted' do it_behaves_like 'handles invalid job_id' context 'when job is in progress' do -- cgit v1.2.3