diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-12 12:08:57 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-12 12:08:57 +0300 |
commit | 1fdf76252e8fdf1a30826fe3f32a6216e50c563c (patch) | |
tree | 949a5db75031f54dafa48b31a89546bbff8182f3 /spec/features | |
parent | 5f362c717e637ba18d04d2ed6722098455c8b571 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/file_uploads/multipart_invalid_uploads_spec.rb | 6 | ||||
-rw-r--r-- | spec/features/projects/settings/service_desk_setting_spec.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/features/file_uploads/multipart_invalid_uploads_spec.rb b/spec/features/file_uploads/multipart_invalid_uploads_spec.rb index e9e24c12af1..b3ace2e30ff 100644 --- a/spec/features/file_uploads/multipart_invalid_uploads_spec.rb +++ b/spec/features/file_uploads/multipart_invalid_uploads_spec.rb @@ -22,13 +22,13 @@ RSpec.describe 'Invalid uploads that must be rejected', :api, :js do ) end - RSpec.shared_examples 'rejecting invalid keys' do |key_name:, message: nil| + RSpec.shared_examples 'rejecting invalid keys' do |key_name:, message: nil, status: 500| context "with invalid key #{key_name}" do let(:body) { { key_name => file, 'package[test][name]' => 'test' } } it { expect { subject }.not_to change { Packages::Package.nuget.count } } - it { expect(subject.code).to eq(500) } + it { expect(subject.code).to eq(status) } it { expect(subject.body).to include(message.presence || "invalid field: \"#{key_name}\"") } end @@ -45,7 +45,7 @@ RSpec.describe 'Invalid uploads that must be rejected', :api, :js do # These keys are rejected directly by rack itself. # The request will not be received by multipart.rb (can't use the 'handling file uploads' shared example) it_behaves_like 'rejecting invalid keys', key_name: 'x' * 11000, message: 'Puma caught this error: exceeded available parameter key space (RangeError)' - it_behaves_like 'rejecting invalid keys', key_name: 'package[]test', message: 'Puma caught this error: expected Hash (got Array)' + it_behaves_like 'rejecting invalid keys', key_name: 'package[]test', status: 400, message: 'Bad Request' it_behaves_like 'handling file uploads', 'by rejecting uploads with an invalid key' end diff --git a/spec/features/projects/settings/service_desk_setting_spec.rb b/spec/features/projects/settings/service_desk_setting_spec.rb index 7856ab1fb4e..59e6f54da2f 100644 --- a/spec/features/projects/settings/service_desk_setting_spec.rb +++ b/spec/features/projects/settings/service_desk_setting_spec.rb @@ -28,6 +28,6 @@ RSpec.describe 'Service Desk Setting', :js do project.reload expect(project.service_desk_enabled).to be_truthy expect(project.service_desk_address).to be_present - expect(find('.incoming-email').value).to eq(project.service_desk_address) + expect(find('[data-testid="incoming-email"]').value).to eq(project.service_desk_address) end end |