diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
commit | 0c872e02b2c822e3397515ec324051ff540f0cd5 (patch) | |
tree | ce2fb6ce7030e4dad0f4118d21ab6453e5938cdd /spec/services/projects/update_pages_service_spec.rb | |
parent | f7e05a6853b12f02911494c4b3fe53d9540d74fc (diff) |
Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42
Diffstat (limited to 'spec/services/projects/update_pages_service_spec.rb')
-rw-r--r-- | spec/services/projects/update_pages_service_spec.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/spec/services/projects/update_pages_service_spec.rb b/spec/services/projects/update_pages_service_spec.rb index a69db3b9970..d908a169898 100644 --- a/spec/services/projects/update_pages_service_spec.rb +++ b/spec/services/projects/update_pages_service_spec.rb @@ -320,10 +320,11 @@ RSpec.describe Projects::UpdatePagesService do end context 'when retrying the job' do + let(:stage) { create(:ci_stage, position: 1_000_000, name: 'deploy', pipeline: pipeline) } let!(:older_deploy_job) do create(:generic_commit_status, :failed, pipeline: pipeline, ref: build.ref, - stage: 'deploy', + ci_stage: stage, name: 'pages:deploy') end @@ -337,13 +338,15 @@ RSpec.describe Projects::UpdatePagesService do expect(execute).to eq(:success) expect(older_deploy_job.reload).to be_retried + expect(deploy_status.ci_stage).to eq(stage) + expect(deploy_status.stage_idx).to eq(stage.position) end end private def deploy_status - GenericCommitStatus.find_by(name: 'pages:deploy') + GenericCommitStatus.where(name: 'pages:deploy').last end def execute |