diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /spec/features/file_uploads | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'spec/features/file_uploads')
-rw-r--r-- | spec/features/file_uploads/git_lfs_spec.rb | 4 | ||||
-rw-r--r-- | spec/features/file_uploads/multipart_invalid_uploads_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/file_uploads/nuget_package_spec.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/spec/features/file_uploads/git_lfs_spec.rb b/spec/features/file_uploads/git_lfs_spec.rb index b902d7ab702..239afb1a1bb 100644 --- a/spec/features/file_uploads/git_lfs_spec.rb +++ b/spec/features/file_uploads/git_lfs_spec.rb @@ -6,7 +6,7 @@ RSpec.describe 'Upload a git lfs object', :js do include_context 'file upload requests helpers' let_it_be(:project) { create(:project) } - let_it_be(:user) { create(:user, :admin) } + let_it_be(:user) { project.owner } let_it_be(:personal_access_token) { create(:personal_access_token, user: user) } let(:file) { fixture_file_upload('spec/fixtures/banana_sample.gif') } @@ -19,7 +19,7 @@ RSpec.describe 'Upload a git lfs object', :js do HTTParty.put( url, headers: headers, - basic_auth: { user: user.username, password: personal_access_token.token }, + basic_auth: { username: user.username, password: personal_access_token.token }, body: file.read ) end diff --git a/spec/features/file_uploads/multipart_invalid_uploads_spec.rb b/spec/features/file_uploads/multipart_invalid_uploads_spec.rb index b3ace2e30ff..91c8e100e6a 100644 --- a/spec/features/file_uploads/multipart_invalid_uploads_spec.rb +++ b/spec/features/file_uploads/multipart_invalid_uploads_spec.rb @@ -17,7 +17,7 @@ RSpec.describe 'Invalid uploads that must be rejected', :api, :js do subject do HTTParty.put( url, - basic_auth: { user: user.username, password: personal_access_token.token }, + basic_auth: { username: user.username, password: personal_access_token.token }, body: body ) end diff --git a/spec/features/file_uploads/nuget_package_spec.rb b/spec/features/file_uploads/nuget_package_spec.rb index fb1e0a54744..6e05e5d1a6e 100644 --- a/spec/features/file_uploads/nuget_package_spec.rb +++ b/spec/features/file_uploads/nuget_package_spec.rb @@ -16,7 +16,7 @@ RSpec.describe 'Upload a nuget package', :api, :js do subject do HTTParty.put( url, - basic_auth: { user: user.username, password: personal_access_token.token }, + basic_auth: { username: user.username, password: personal_access_token.token }, body: { package: file } ) end |