Adapt workflow model and yaml to workflow service specs

We pass now the whole workflow run object instead of only the corresponding id.
openSUSE · Apr 19, 2022 · 4aa2452 · 4aa2452
1 parent 078fcb2
commit 4aa2452
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/api/spec/models/token/workflow_spec.rb b/src/api/spec/models/token/workflow_spec.rb
@@ -71,7 +71,7 @@
       let(:scm_webhook) { ScmWebhook.new(payload: github_extractor_payload) }
       let(:yaml_downloader) { Workflows::YAMLDownloader.new(scm_webhook.payload, token: workflow_token) }
       let(:yaml_file) { File.expand_path(Rails.root.join('spec/support/files/workflows.yml')) }
-      let(:yaml_to_workflows_service) { Workflows::YAMLToWorkflowsService.new(yaml_file: yaml_file, scm_webhook: scm_webhook, token: workflow_token, workflow_run_id: workflow_run.id) }
+      let(:yaml_to_workflows_service) { Workflows::YAMLToWorkflowsService.new(yaml_file: yaml_file, scm_webhook: scm_webhook, token: workflow_token, workflow_run: workflow_run) }
       let(:workflow) do
         Workflow.new(scm_webhook: scm_webhook, token: workflow_token,
                      workflow_instructions: { steps: [branch_package: { source_project: 'home:Admin', source_package: 'ctris', target_project: 'dev:tools' }] })
@@ -87,7 +87,7 @@
         allow(Workflows::YAMLDownloader).to receive(:new).with(scm_webhook.payload, token: workflow_token).and_return(yaml_downloader)
         allow(yaml_downloader).to receive(:call).and_return(yaml_file)
         allow(Workflows::YAMLToWorkflowsService).to receive(:new).with(yaml_file: yaml_file, scm_webhook: scm_webhook, token: workflow_token,
-                                                                       workflow_run_id: workflow_run.id).and_return(yaml_to_workflows_service)
+                                                                       workflow_run: workflow_run).and_return(yaml_to_workflows_service)
         allow(yaml_to_workflows_service).to receive(:call).and_return(workflows)
         allow(ScmInitialStatusReporter).to receive(:new).and_return(proc { true })
       end
@@ -138,7 +138,7 @@
       let(:scm_webhook) { ScmWebhook.new(payload: github_extractor_payload) }
       let(:yaml_downloader) { Workflows::YAMLDownloader.new(scm_webhook.payload, token: workflow_token) }
       let(:yaml_file) { File.expand_path(Rails.root.join('spec/support/files/workflows.yml')) }
-      let(:yaml_to_workflows_service) { Workflows::YAMLToWorkflowsService.new(yaml_file: yaml_file, scm_webhook: scm_webhook, token: workflow_token, workflow_run_id: workflow_run.id) }
+      let(:yaml_to_workflows_service) { Workflows::YAMLToWorkflowsService.new(yaml_file: yaml_file, scm_webhook: scm_webhook, token: workflow_token, workflow_run: workflow_run) }
       let(:workflows) { [Workflow.new(scm_webhook: scm_webhook, token: workflow_token, workflow_instructions: {})] }
 
       before do
@@ -147,7 +147,7 @@
         allow(Workflows::YAMLDownloader).to receive(:new).with(scm_webhook.payload, token: workflow_token).and_return(yaml_downloader)
         allow(yaml_downloader).to receive(:call).and_return(yaml_file)
         allow(Workflows::YAMLToWorkflowsService).to receive(:new).with(yaml_file: yaml_file, scm_webhook: scm_webhook, token: workflow_token,
-                                                                       workflow_run_id: workflow_run.id).and_return(yaml_to_workflows_service)
+                                                                       workflow_run: workflow_run).and_return(yaml_to_workflows_service)
         allow(yaml_to_workflows_service).to receive(:call).and_return(workflows)
       end
 

diff --git a/src/api/spec/models/workflow_spec.rb b/src/api/spec/models/workflow_spec.rb
@@ -6,7 +6,7 @@
   let!(:workflow_run) { create(:workflow_run, token: token) }
 
   subject do
-    described_class.new(workflow_instructions: yaml, scm_webhook: ScmWebhook.new(payload: extractor_payload), token: token, workflow_run_id: workflow_run.id)
+    described_class.new(workflow_instructions: yaml, scm_webhook: ScmWebhook.new(payload: extractor_payload), token: token, workflow_run: workflow_run)
   end
 
   describe '#call' do

diff --git a/src/api/spec/services/workflows/yaml_to_workflows_service_spec.rb b/src/api/spec/services/workflows/yaml_to_workflows_service_spec.rb
@@ -35,7 +35,7 @@
 
   describe '#call' do
     subject do
-      Workflows::YAMLToWorkflowsService.new(yaml_file: workflows_yml_file, scm_webhook: ScmWebhook.new(payload: payload), token: token, workflow_run_id: workflow_run.id).call
+      Workflows::YAMLToWorkflowsService.new(yaml_file: workflows_yml_file, scm_webhook: ScmWebhook.new(payload: payload), token: token, workflow_run: workflow_run).call
     end
 
     context 'it supports many workflows' do