diff options
author | Tristan Read <tread@gitlab.com> | 2019-08-09 20:35:43 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2019-08-09 20:35:43 +0000 |
commit | 5e6a58040bcfaa4c933027cddfad04810042b904 (patch) | |
tree | 98add06845bf9d558de38c9c1034ade7d05d9ce2 /spec/controllers/projects/environments_controller_spec.rb | |
parent | 25dd49cda27b479a478eac861e1704812602d938 (diff) | |
download | gitlab-ce-5e6a58040bcfaa4c933027cddfad04810042b904.tar.gz |
Remove gfm_embed_metrics flag from BE
Removes the feature flag that controls whether
metrics dashboard urls unfurl the metrics dashboard
charts.
Diffstat (limited to 'spec/controllers/projects/environments_controller_spec.rb')
-rw-r--r-- | spec/controllers/projects/environments_controller_spec.rb | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb index b3852355d77..71ee1fd03bf 100644 --- a/spec/controllers/projects/environments_controller_spec.rb +++ b/spec/controllers/projects/environments_controller_spec.rb @@ -613,31 +613,13 @@ describe Projects::EnvironmentsController do end end - shared_examples_for 'dashboard cannot be embedded' do - context 'when the embedded flag is included' do - let(:dashboard_params) { { format: :json, embedded: true } } - - it_behaves_like 'the default dashboard' - end - end - let(:dashboard_params) { { format: :json } } it_behaves_like 'the default dashboard' it_behaves_like 'dashboard can be specified' it_behaves_like 'dashboard can be embedded' - context 'when multiple dashboards is enabled and embedding metrics is disabled' do - before do - stub_feature_flags(gfm_embedded_metrics: false) - end - - it_behaves_like 'the default dashboard' - it_behaves_like 'dashboard can be specified' - it_behaves_like 'dashboard cannot be embedded' - end - - context 'when multiple dashboards is disabled and embedding metrics is enabled' do + context 'when multiple dashboards is disabled' do before do stub_feature_flags(environment_metrics_show_multiple_dashboards: false) end @@ -646,19 +628,6 @@ describe Projects::EnvironmentsController do it_behaves_like 'dashboard cannot be specified' it_behaves_like 'dashboard can be embedded' end - - context 'when multiple dashboards and embedding metrics are disabled' do - before do - stub_feature_flags( - environment_metrics_show_multiple_dashboards: false, - gfm_embedded_metrics: false - ) - end - - it_behaves_like 'the default dashboard' - it_behaves_like 'dashboard cannot be specified' - it_behaves_like 'dashboard cannot be embedded' - end end describe 'GET #search' do |