diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-06 21:15:59 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-06 21:15:59 +0300 |
commit | 8c7cea621c8ce2caf4a211d09aa60b2a125652cb (patch) | |
tree | afbedbbf1fedadac80c7b231748841e4f2484e3d /spec/presenters/packages | |
parent | eb4c4ae6212b8f305af700a18d60548ef17e047c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/presenters/packages')
5 files changed, 1 insertions, 53 deletions
diff --git a/spec/presenters/packages/conan/package_presenter_spec.rb b/spec/presenters/packages/conan/package_presenter_spec.rb index 27ecf32b6f2..d35137cd820 100644 --- a/spec/presenters/packages/conan/package_presenter_spec.rb +++ b/spec/presenters/packages/conan/package_presenter_spec.rb @@ -6,6 +6,7 @@ RSpec.describe ::Packages::Conan::PackagePresenter do let_it_be(:user) { create(:user) } let_it_be(:package) { create(:conan_package) } let_it_be(:project) { package.project } + let_it_be(:package_file_pending_destruction) { create(:package_file, :pending_destruction, package: package) } let_it_be(:conan_package_reference) { '123456789'} let(:params) { { package_scope: :instance } } @@ -208,22 +209,4 @@ RSpec.describe ::Packages::Conan::PackagePresenter do end end end - - # TODO when cleaning up packages_installable_package_files, consider removing this context and - # add a dummy package file pending destruction on L8 - context 'with package files pending destruction' do - let_it_be(:package_file_pending_destruction) { create(:package_file, :pending_destruction, package: package) } - - subject { presenter.send(:package_files).to_a } - - it { is_expected.not_to include(package_file_pending_destruction) } - - context 'with packages_installable_package_files disabled' do - before do - stub_feature_flags(packages_installable_package_files: false) - end - - it { is_expected.to include(package_file_pending_destruction) } - end - end end diff --git a/spec/presenters/packages/detail/package_presenter_spec.rb b/spec/presenters/packages/detail/package_presenter_spec.rb index 4e2645b27ff..71ec3ee2d67 100644 --- a/spec/presenters/packages/detail/package_presenter_spec.rb +++ b/spec/presenters/packages/detail/package_presenter_spec.rb @@ -161,14 +161,6 @@ RSpec.describe ::Packages::Detail::PackagePresenter do subject { presenter.detail_view[:package_files].map { |e| e[:id] } } it { is_expected.not_to include(package_file_pending_destruction.id) } - - context 'with packages_installable_package_files disabled' do - before do - stub_feature_flags(packages_installable_package_files: false) - end - - it { is_expected.to include(package_file_pending_destruction.id) } - end end end end diff --git a/spec/presenters/packages/npm/package_presenter_spec.rb b/spec/presenters/packages/npm/package_presenter_spec.rb index 2308f928c92..8b99e6d8605 100644 --- a/spec/presenters/packages/npm/package_presenter_spec.rb +++ b/spec/presenters/packages/npm/package_presenter_spec.rb @@ -104,17 +104,6 @@ RSpec.describe ::Packages::Npm::PackagePresenter do it 'does not return them' do expect(shasums).not_to include(package_file_pending_destruction.file_sha1) end - - context 'with packages_installable_package_files disabled' do - before do - stub_feature_flags(packages_installable_package_files: false) - package2.package_files.id_not_in(package_file_pending_destruction.id).delete_all - end - - it 'returns them' do - expect(shasums).to include(package_file_pending_destruction.file_sha1) - end - end end end diff --git a/spec/presenters/packages/nuget/package_metadata_presenter_spec.rb b/spec/presenters/packages/nuget/package_metadata_presenter_spec.rb index 6e99b6bafec..6c56763e719 100644 --- a/spec/presenters/packages/nuget/package_metadata_presenter_spec.rb +++ b/spec/presenters/packages/nuget/package_metadata_presenter_spec.rb @@ -29,14 +29,6 @@ RSpec.describe Packages::Nuget::PackageMetadataPresenter do let_it_be(:package_file_pending_destruction) { create(:package_file, :pending_destruction, package: package, file_name: 'pending_destruction.nupkg') } it { is_expected.not_to include('pending_destruction.nupkg') } - - context 'with packages_installable_package_files disabled' do - before do - stub_feature_flags(packages_installable_package_files: false) - end - - it { is_expected.to include('pending_destruction.nupkg') } - end end end diff --git a/spec/presenters/packages/pypi/package_presenter_spec.rb b/spec/presenters/packages/pypi/package_presenter_spec.rb index 8a23c0ec3cb..b19abdbc17a 100644 --- a/spec/presenters/packages/pypi/package_presenter_spec.rb +++ b/spec/presenters/packages/pypi/package_presenter_spec.rb @@ -59,14 +59,6 @@ RSpec.describe ::Packages::Pypi::PackagePresenter do let(:project_or_group) { project } it { is_expected.not_to include(package_file_pending_destruction.file_name)} - - context 'with packages_installable_package_files disabled' do - before do - stub_feature_flags(packages_installable_package_files: false) - end - - it { is_expected.to include(package_file_pending_destruction.file_name)} - end end end end |