Streamline controller specs

app/controllers/projects/environments/prometheus_api_controller.rb

@@ -25,10 +25,8 @@ class Projects::Environments::PrometheusApiController < Projects::ApplicationCon
     if result[:status] == :success
       render status: result[:http_status], json: result[:body]
     else
-      render status: result[:http_status] || :bad_request, json: {
-          status: result[:status],
-          message: result[:message]
-        }
+      render status: result[:http_status] || :bad_request,
+        json: { status: result[:status], message: result[:message] }
     end
   end
 

spec/controllers/projects/environments/prometheus_api_controller_spec.rb

@@ -14,27 +14,27 @@ describe Projects::Environments::PrometheusApiController do
 
   describe 'GET #proxy' do
     let(:prometheus_proxy_service) { instance_double(Prometheus::ProxyService) }
-    let(:prometheus_response) { { status: :success, body: response_body } }
-    let(:json_response_body) { JSON.parse(response_body) }
-
-    let(:response_body) do
-      "{\"status\":\"success\",\"data\":{\"resultType\":\"scalar\",\"result\":[1553864609.117,\"1\"]}}"
-    end
 
+    context 'with valid requests' do
       before do
         allow(Prometheus::ProxyService).to receive(:new)
           .with(environment, 'GET', 'query', anything)
           .and_return(prometheus_proxy_service)
 
         allow(prometheus_proxy_service).to receive(:execute)
-        .and_return(prometheus_response)
+          .and_return(service_result)
       end
 
+      context 'with success result' do
+        let(:service_result) { { status: :success, body: prometheus_body } }
+        let(:prometheus_body) { '{"status":"success"}' }
+        let(:prometheus_json_body) { JSON.parse(prometheus_body) }
+
         it 'returns prometheus response' do
           get :proxy, params: environment_params
 
           expect(response).to have_gitlab_http_status(:ok)
-      expect(json_response).to eq(json_response_body)
+          expect(json_response).to eq(prometheus_json_body)
         end
 
         it 'filters params' do
@@ -43,13 +43,11 @@ describe Projects::Environments::PrometheusApiController do
           expect(Prometheus::ProxyService).to have_received(:new)
             .with(environment, 'GET', 'query', ActionController::Parameters.new({ 'query' => '1' }).permit!)
         end
-
-    context 'Prometheus::ProxyService returns nil' do
-      before do
-        allow(prometheus_proxy_service).to receive(:execute)
-          .and_return(nil)
       end
 
+      context 'with nil result' do
+        let(:service_result) { nil }
+
         it 'returns 202 accepted' do
           get :proxy, params: environment_params
 
@@ -59,13 +57,8 @@ describe Projects::Environments::PrometheusApiController do
         end
       end
 
-    context 'Prometheus::ProxyService returns status success' do
-      let(:service_response) { { http_status: 404, status: :success, body: '{"body": "value"}' } }
-
-      before do
-        allow(prometheus_proxy_service).to receive(:execute)
-          .and_return(service_response)
-      end
+      context 'with 404 result' do
+        let(:service_result) { { http_status: 404, status: :success, body: '{"body": "value"}' } }
 
         it 'returns body' do
           get :proxy, params: environment_params
@@ -75,14 +68,9 @@ describe Projects::Environments::PrometheusApiController do
         end
       end
 
-    context 'Prometheus::ProxyService returns status error' do
-      before do
-        allow(prometheus_proxy_service).to receive(:execute)
-          .and_return(service_response)
-      end
-
+      context 'with error result' do
         context 'with http_status' do
-        let(:service_response) do
+          let(:service_result) do
             { http_status: :service_unavailable, status: :error, message: 'error message' }
           end
 
@@ -96,9 +84,9 @@ describe Projects::Environments::PrometheusApiController do
         end
 
         context 'without http_status' do
-        let(:service_response) { { status: :error, message: 'error message' } }
+          let(:service_result) { { status: :error, message: 'error message' } }
 
-        it 'returns message' do
+          it 'returns bad_request' do
             get :proxy, params: environment_params
 
             expect(response).to have_gitlab_http_status(:bad_request)
@@ -107,7 +95,9 @@ describe Projects::Environments::PrometheusApiController do
           end
         end
       end
+    end
 
+    context 'with inappropriate requests' do
       context 'with anonymous user' do
         before do
           sign_out(user)
@@ -132,6 +122,7 @@ describe Projects::Environments::PrometheusApiController do
         end
       end
     end
+  end
 
   private
 
@@ -142,6 +133,6 @@ describe Projects::Environments::PrometheusApiController do
       project_id: project,
       proxy_path: 'query',
       query: '1'
-    }.merge(params)
+    }.reverse_merge(params)
   end
 end