Context handling and tests cleanup + simple test kube_namespace context test

2 files changed, 6 insertions, 15 deletions

diff --git a/spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb b/spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb
index e42e034f4fb..c7169717fc1 100644
--- a/spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb
+++ b/spec/lib/gitlab/prometheus/queries/additional_metrics_deployment_query_spec.rb
@@ -1,19 +1,14 @@
 require 'spec_helper'
 
 describe Gitlab::Prometheus::Queries::AdditionalMetricsDeploymentQuery do
-  include Prometheus::MetricBuilders
-
-  let(:client) { double('prometheus_client') }
-  let(:environment) { create(:environment, slug: 'environment-slug') }
-  let(:deployment) { create(:deployment, environment: environment) }
-
-  subject(:query_result) { described_class.new(client).query(deployment.id) }
-
   around do |example|
     Timecop.freeze(Time.local(2008, 9, 1, 12, 0, 0)) { example.run }
   end
 
   include_examples 'additional metrics query' do
+    let(:deployment) { create(:deployment, environment: environment) }
+    let(:query_params) { [deployment.id] }
+
     it 'queries using specific time' do
       expect(client).to receive(:query_range).with(anything,
                                                    start: (deployment.created_at - 30.minutes).to_f,
diff --git a/spec/lib/gitlab/prometheus/queries/additional_metrics_environment_query_spec.rb b/spec/lib/gitlab/prometheus/queries/additional_metrics_environment_query_spec.rb
index e9fd66d45fe..a02d2a90b97 100644
--- a/spec/lib/gitlab/prometheus/queries/additional_metrics_environment_query_spec.rb
+++ b/spec/lib/gitlab/prometheus/queries/additional_metrics_environment_query_spec.rb
@@ -1,18 +1,14 @@
 require 'spec_helper'
 
 describe Gitlab::Prometheus::Queries::AdditionalMetricsEnvironmentQuery do
-  include Prometheus::MetricBuilders
-
-  let(:client) { double('prometheus_client') }
-  let(:environment) { create(:environment, slug: 'environment-slug') }
-
-  subject(:query_result) { described_class.new(client).query(environment.id) }
-
   around do |example|
     Timecop.freeze { example.run }
   end
 
   include_examples 'additional metrics query' do
+    let(:query_result) { described_class.new(client).query(environment.id) }
+    let(:query_params) { [environment.id] }
+
     it 'queries using specific time' do
       expect(client).to receive(:query_range).with(anything, start: 8.hours.ago.to_f, stop: Time.now.to_f)
       expect(query_result).not_to be_nil