diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 03:07:49 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 03:07:49 +0300 |
commit | 77237c5a6b9044f58beabc54d3589e5fa09cbfba (patch) | |
tree | f43188047fe8955f6cf78e05ae9c2e8f6a019e0b /spec/services/metrics | |
parent | 2fd92f2dc784ade9cb4e1c33dd60cbfad7b86818 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/metrics')
4 files changed, 22 insertions, 4 deletions
diff --git a/spec/services/metrics/dashboard/custom_metric_embed_service_spec.rb b/spec/services/metrics/dashboard/custom_metric_embed_service_spec.rb index 744693dad15..2f03d18cd1f 100644 --- a/spec/services/metrics/dashboard/custom_metric_embed_service_spec.rb +++ b/spec/services/metrics/dashboard/custom_metric_embed_service_spec.rb @@ -35,12 +35,18 @@ describe Metrics::Dashboard::CustomMetricEmbedService do it { is_expected.to be_truthy } - context 'not embedded' do + context 'missing embedded' do let(:params) { valid_params.except(:embedded) } it { is_expected.to be_falsey } end + context 'not embedded' do + let(:params) { valid_params.merge(embedded: 'false') } + + it { is_expected.to be_falsey } + end + context 'non-system dashboard' do let(:dashboard_path) { '.gitlab/dashboards/test.yml' } diff --git a/spec/services/metrics/dashboard/default_embed_service_spec.rb b/spec/services/metrics/dashboard/default_embed_service_spec.rb index 1b88276368c..8e32316433d 100644 --- a/spec/services/metrics/dashboard/default_embed_service_spec.rb +++ b/spec/services/metrics/dashboard/default_embed_service_spec.rb @@ -27,7 +27,7 @@ describe Metrics::Dashboard::DefaultEmbedService, :use_clean_rails_memory_store_ end context 'not embedded' do - let(:params) { { embedded: false } } + let(:params) { { embedded: 'false' } } it { is_expected.to be_falsey } end diff --git a/spec/services/metrics/dashboard/dynamic_embed_service_spec.rb b/spec/services/metrics/dashboard/dynamic_embed_service_spec.rb index c1ce9818f21..ee75284b4ce 100644 --- a/spec/services/metrics/dashboard/dynamic_embed_service_spec.rb +++ b/spec/services/metrics/dashboard/dynamic_embed_service_spec.rb @@ -35,12 +35,18 @@ describe Metrics::Dashboard::DynamicEmbedService, :use_clean_rails_memory_store_ it { is_expected.to be_truthy } - context 'not embedded' do + context 'missing embedded' do let(:params) { valid_params.except(:embedded) } it { is_expected.to be_falsey } end + context 'not embedded' do + let(:params) { valid_params.merge(embedded: 'false') } + + it { is_expected.to be_falsey } + end + context 'undefined dashboard' do let(:params) { valid_params.except(:dashboard_path) } diff --git a/spec/services/metrics/dashboard/grafana_metric_embed_service_spec.rb b/spec/services/metrics/dashboard/grafana_metric_embed_service_spec.rb index a772b911d8a..034d6aba5d6 100644 --- a/spec/services/metrics/dashboard/grafana_metric_embed_service_spec.rb +++ b/spec/services/metrics/dashboard/grafana_metric_embed_service_spec.rb @@ -28,12 +28,18 @@ describe Metrics::Dashboard::GrafanaMetricEmbedService do it { is_expected.to be_truthy } - context 'not embedded' do + context 'missing embedded' do let(:params) { valid_params.except(:embedded) } it { is_expected.to be_falsey } end + context 'not embedded' do + let(:params) { valid_params.merge(embedded: 'false') } + + it { is_expected.to be_falsey } + end + context 'undefined grafana_url' do let(:params) { valid_params.except(:grafana_url) } |