diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-29 06:07:32 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-29 06:07:32 +0300 |
| commit | be8b477154c88aaf1ed2c4adea980945482350d2 (patch) | |
| tree | cd6ee0dac409eea2c0c8b560cd379d5ae25c034c /spec/features/file_uploads | |
| parent | 3d7e272e4378b00f08c0f85327c4162eaf6d42fb (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/file_uploads')
| -rw-r--r-- | spec/features/file_uploads/group_import_spec.rb | 1 | ||||
| -rw-r--r-- | spec/features/file_uploads/project_import_spec.rb | 1 | ||||
| -rw-r--r-- | spec/features/file_uploads/user_avatar_spec.rb | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/spec/features/file_uploads/group_import_spec.rb b/spec/features/file_uploads/group_import_spec.rb index 0f9d05c3975..a8592f99bd6 100644 --- a/spec/features/file_uploads/group_import_spec.rb +++ b/spec/features/file_uploads/group_import_spec.rb @@ -7,6 +7,7 @@ RSpec.describe 'Upload a group export archive', :api, :js do let_it_be(:user) { create(:user, :admin) } let_it_be(:personal_access_token) { create(:personal_access_token, user: user) } + let(:api_path) { '/groups/import' } let(:url) { capybara_url(api(api_path, personal_access_token: personal_access_token)) } let(:file) { fixture_file_upload('spec/fixtures/group_export.tar.gz') } diff --git a/spec/features/file_uploads/project_import_spec.rb b/spec/features/file_uploads/project_import_spec.rb index 1bf16f46c63..82b6f490d2a 100644 --- a/spec/features/file_uploads/project_import_spec.rb +++ b/spec/features/file_uploads/project_import_spec.rb @@ -7,6 +7,7 @@ RSpec.describe 'Upload a project export archive', :api, :js do let_it_be(:user) { create(:user, :admin) } let_it_be(:personal_access_token) { create(:personal_access_token, user: user) } + let(:api_path) { '/projects/import' } let(:url) { capybara_url(api(api_path, personal_access_token: personal_access_token)) } let(:file) { fixture_file_upload('spec/features/projects/import_export/test_project_export.tar.gz') } diff --git a/spec/features/file_uploads/user_avatar_spec.rb b/spec/features/file_uploads/user_avatar_spec.rb index 043115be61a..c30e3452201 100644 --- a/spec/features/file_uploads/user_avatar_spec.rb +++ b/spec/features/file_uploads/user_avatar_spec.rb @@ -4,6 +4,7 @@ require 'spec_helper' RSpec.describe 'Upload a user avatar', :js do let_it_be(:user, reload: true) { create(:user) } + let(:file) { fixture_file_upload('spec/fixtures/banana_sample.gif') } before do |