diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-12-18 13:50:25 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-12-18 14:23:12 -0800 |
| commit | a9d38768e36c65ec526dd735970f3ab7f3f9ef20 (patch) | |
| tree | 29e126fae43304f1aae951558f6208a0e53e1a04 | |
| parent | e230dd330864ce149a9334009442271b0323f4c1 (diff) | |
| download | gitlab-ce-a9d38768e36c65ec526dd735970f3ab7f3f9ef20.tar.gz | |
Fix failing Rails 4 spec in notification_service_worker_spec.rb
actionmailer wasn't actually upgraded from 4.2.10 to 4.2.11 in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23520.
Attempting to run this spec in Rails 4 will fail until
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23396
is merged. Let's disable it since we are only using Rails 5 on
this branch.
| -rw-r--r-- | spec/workers/mail_scheduler/notification_service_worker_spec.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/spec/workers/mail_scheduler/notification_service_worker_spec.rb b/spec/workers/mail_scheduler/notification_service_worker_spec.rb index f725c8763a0..e726f469816 100644 --- a/spec/workers/mail_scheduler/notification_service_worker_spec.rb +++ b/spec/workers/mail_scheduler/notification_service_worker_spec.rb @@ -16,7 +16,14 @@ describe MailScheduler::NotificationServiceWorker do worker.perform(method, *serialize(key)) end - context 'when the arguments cannot be deserialized' do + # actionmailer wasn't actually upgraded from 4.2.10 to 4.2.11 in + # https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23520. + # + # Attempting to run this spec in Rails 4 will fail until + # https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23396 + # is merged. Let's disable it since we are only using Rails 5 on + # this branch. + context 'when the arguments cannot be deserialized', :rails5 do it 'does nothing' do expect(worker.notification_service).not_to receive(method) |