diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /spec/presenters/ci/build_runner_presenter_spec.rb | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'spec/presenters/ci/build_runner_presenter_spec.rb')
-rw-r--r-- | spec/presenters/ci/build_runner_presenter_spec.rb | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/spec/presenters/ci/build_runner_presenter_spec.rb b/spec/presenters/ci/build_runner_presenter_spec.rb index f78ad38f4e8..43b677483ce 100644 --- a/spec/presenters/ci/build_runner_presenter_spec.rb +++ b/spec/presenters/ci/build_runner_presenter_spec.rb @@ -17,7 +17,7 @@ RSpec.describe Ci::BuildRunnerPresenter do describe '#artifacts' do context "when option contains archive-type artifacts" do - let(:build) { create(:ci_build, options: { artifacts: archive } ) } + let(:build) { create(:ci_build, options: { artifacts: archive }) } it 'presents correct hash' do expect(presenter.artifacts.first).to include(archive_expectation) @@ -196,16 +196,6 @@ RSpec.describe Ci::BuildRunnerPresenter do expect(subject[0]).to match(/^\+[0-9a-f]{40}:refs\/pipelines\/[0-9]+$/) end - context 'when the scalability_ci_fetch_sha feature flag is disabled' do - before do - stub_feature_flags(scalability_ci_fetch_sha: false) - end - - it 'fetches the ref by name' do - expect(subject[0]).to eq("+refs/pipelines/#{pipeline.id}:refs/pipelines/#{pipeline.id}") - end - end - context 'when ref is tag' do let(:build) { create(:ci_build, :tag) } @@ -259,7 +249,7 @@ RSpec.describe Ci::BuildRunnerPresenter do it 'returns the correct refspecs' do is_expected.to contain_exactly("+#{pipeline.sha}:refs/pipelines/#{pipeline.id}", - "+refs/heads/#{build.ref}:refs/remotes/origin/#{build.ref}") + "+refs/heads/#{build.ref}:refs/remotes/origin/#{build.ref}") end end end |