From 6b9d3a4e8351e662c4586b24bb152de78ae9e3bf Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 29 Jan 2020 18:08:47 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .../dashboard/clone_dashboard_service_spec.rb      | 27 ++++++++--------------
 1 file changed, 9 insertions(+), 18 deletions(-)

(limited to 'spec/services/metrics')

diff --git a/spec/services/metrics/dashboard/clone_dashboard_service_spec.rb b/spec/services/metrics/dashboard/clone_dashboard_service_spec.rb
index 274d594fd68..20583ff77e9 100644
--- a/spec/services/metrics/dashboard/clone_dashboard_service_spec.rb
+++ b/spec/services/metrics/dashboard/clone_dashboard_service_spec.rb
@@ -5,6 +5,8 @@ require 'spec_helper'
 describe Metrics::Dashboard::CloneDashboardService, :use_clean_rails_memory_store_caching do
   include MetricsDashboardHelpers
 
+  STAGES = ::Gitlab::Metrics::Dashboard::Stages
+
   set(:user) { create(:user) }
   set(:project) { create(:project, :repository) }
   set(:environment) { create(:environment, project: project) }
@@ -16,6 +18,7 @@ describe Metrics::Dashboard::CloneDashboardService, :use_clean_rails_memory_stor
     let(:branch) { "dashboard_new_branch" }
     let(:dashboard) { 'config/prometheus/common_metrics.yml' }
     let(:file_name) { 'custom_dashboard.yml' }
+    let(:file_content_hash) { YAML.safe_load(File.read(dashboard)) }
     let(:params) do
       {
         dashboard: dashboard,
@@ -25,17 +28,6 @@ describe Metrics::Dashboard::CloneDashboardService, :use_clean_rails_memory_stor
       }
     end
 
-    let(:dashboard_attrs) do
-      {
-        commit_message: commit_message,
-        branch_name: branch,
-        start_branch: project.default_branch,
-        encoding: 'text',
-        file_path: ".gitlab/dashboards/#{file_name}",
-        file_content: File.read(dashboard)
-      }
-    end
-
     context 'user does not have push right to repository' do
       it_behaves_like 'misconfigured dashboard service response', :forbidden, %q(You can't commit to this project)
     end
@@ -72,11 +64,12 @@ describe Metrics::Dashboard::CloneDashboardService, :use_clean_rails_memory_stor
             start_branch: project.default_branch,
             encoding: 'text',
             file_path: ".gitlab/dashboards/custom_dashboard.yml",
-            file_content: File.read(dashboard)
+            file_content:  file_content_hash.to_yaml
           }
         end
 
         it 'strips target file name to safe value', :aggregate_failures do
+          allow(::Gitlab::Metrics::Dashboard::Processor).to receive(:new).and_return(double(process: file_content_hash))
           service_instance = instance_double(::Files::CreateService)
           expect(::Files::CreateService).to receive(:new).with(project, user, dashboard_attrs).and_return(service_instance)
           expect(service_instance).to receive(:execute).and_return(status: :success)
@@ -86,14 +79,12 @@ describe Metrics::Dashboard::CloneDashboardService, :use_clean_rails_memory_stor
       end
 
       context 'valid parameters' do
-        it 'delegates commit creation to Files::CreateService', :aggregate_failures do
-          service_instance = instance_double(::Files::CreateService)
-          expect(::Files::CreateService).to receive(:new).with(project, user, dashboard_attrs).and_return(service_instance)
-          expect(service_instance).to receive(:execute).and_return(status: :success)
-
-          service_call
+        before do
+          allow(::Gitlab::Metrics::Dashboard::Processor).to receive(:new).and_return(double(process: file_content_hash))
         end
 
+        it_behaves_like 'valid dashboard cloning process', ::Metrics::Dashboard::SystemDashboardService::DASHBOARD_PATH, [STAGES::CommonMetricsInserter, STAGES::ProjectMetricsInserter, STAGES::Sorter]
+
         context 'selected branch already exists' do
           let(:branch) { 'existing_branch' }
 
-- 
cgit v1.2.1