diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
commit | 7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0 (patch) | |
tree | 5bdc2229f5198d516781f8d24eace62fc7e589e9 /spec/models/packages | |
parent | 185b095e93520f96e9cfc31d9c3e69b498cdab7c (diff) |
Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42
Diffstat (limited to 'spec/models/packages')
-rw-r--r-- | spec/models/packages/package_file_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/packages/package_spec.rb | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/spec/models/packages/package_file_spec.rb b/spec/models/packages/package_file_spec.rb index 9554fc3bb1b..c665f738ead 100644 --- a/spec/models/packages/package_file_spec.rb +++ b/spec/models/packages/package_file_spec.rb @@ -314,7 +314,7 @@ RSpec.describe Packages::PackageFile, type: :model do # to `1`. expect(package_file) .to receive(:update_column) - .with(:file_store, ::Packages::PackageFileUploader::Store::LOCAL) + .with('file_store', ::Packages::PackageFileUploader::Store::LOCAL) expect { subject }.to change { package_file.size }.from(nil).to(3513) end diff --git a/spec/models/packages/package_spec.rb b/spec/models/packages/package_spec.rb index 0edb04224a3..241c585099c 100644 --- a/spec/models/packages/package_spec.rb +++ b/spec/models/packages/package_spec.rb @@ -969,12 +969,12 @@ RSpec.describe Packages::Package, type: :model do end context 'sorting' do - let_it_be(:project) { create(:project, name: 'aaa' ) } - let_it_be(:project2) { create(:project, name: 'bbb' ) } - let_it_be(:package1) { create(:package, project: project ) } - let_it_be(:package2) { create(:package, project: project2 ) } - let_it_be(:package3) { create(:package, project: project2 ) } - let_it_be(:package4) { create(:package, project: project ) } + let_it_be(:project) { create(:project, name: 'aaa') } + let_it_be(:project2) { create(:project, name: 'bbb') } + let_it_be(:package1) { create(:package, project: project) } + let_it_be(:package2) { create(:package, project: project2) } + let_it_be(:package3) { create(:package, project: project2) } + let_it_be(:package4) { create(:package, project: project) } it 'orders packages by their projects name ascending' do expect(Packages::Package.order_project_name).to eq([package1, package4, package2, package3]) |