From 55e97919a2c17471fe975881c614db1e20861366 Mon Sep 17 00:00:00 2001
From: charlieablett <cablett@gitlab.com>
Date: Tue, 14 Apr 2020 17:22:37 +1200
Subject: [PATCH 1/2] Update gitlab-ci to reflect new ruby versions

(cherry picked from commit 52331344baffb3c95ff385ab255f2e0dc79c47dc)
---
 .gitlab-ci.yml | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8184ba4..9d58113 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,27 +5,23 @@
     paths:
       - vendor/ruby
   script:
-  - bundle exec rspec spec
+    - bundle exec rspec spec
   before_script:
     - apt update && apt install -y libicu-dev
     - ruby -v                                   # Print out ruby version for debugging
     # Uncomment next line if your rails app needs a JS runtime:
     # - apt-get update -q && apt-get install nodejs -yqq
-    - gem install bundler  --no-ri --no-rdoc    # Bundler is not installed with the image
+    - gem install bundler  --no-document    # Bundler is not installed with the image
     - bundle install -j $(nproc) --path vendor  # Install dependencies into ./vendor/ruby
 
-rspec-2.0:
-  image: "ruby:2.0"
+rspec-2.5:
+  image: "ruby:2.5"
   <<: *test
 
-rspec-2.1:
-  image: "ruby:2.1"
+rspec-2.6:
+  image: "ruby:2.6"
   <<: *test
 
-rspec-2.2:
-  image: "ruby:2.2"
-  <<: *test
-
-rspec-2.3:
-  image: "ruby:2.3"
+rspec-2.7:
+  image: "ruby:2.7"
   <<: *test

From 14bb0bff0beefb2c2a875c1b3b3a1f8d5f6d7601 Mon Sep 17 00:00:00 2001
From: cablett <cablett@gitlab.com>
Date: Wed, 23 Nov 2022 17:41:07 +1300
Subject: [PATCH 2/2] Fix specs to stub methods

---
 spec/lib/delivery/letter_opener_spec.rb | 3 ++-
 spec/lib/delivery/logger_spec.rb        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/spec/lib/delivery/letter_opener_spec.rb b/spec/lib/delivery/letter_opener_spec.rb
index 8b430e9..d0ac561 100644
--- a/spec/lib/delivery/letter_opener_spec.rb
+++ b/spec/lib/delivery/letter_opener_spec.rb
@@ -4,12 +4,13 @@
 describe MailRoom::Delivery::LetterOpener do
   describe '#deliver' do
     let(:mailbox) {build_mailbox(location: '/tmp/somewhere')}
-    let(:delivery_method) {stub(:deliver!)}
+    let(:delivery_method) {stub}
     let(:mail) {stub}
 
     before :each do
       Mail.stubs(:read_from_string).returns(mail)
       ::LetterOpener::DeliveryMethod.stubs(:new).returns(delivery_method)
+      delivery_method.stubs(:deliver!)
     end
 
     it 'creates a new LetterOpener::DeliveryMethod' do
diff --git a/spec/lib/delivery/logger_spec.rb b/spec/lib/delivery/logger_spec.rb
index b584754..30bd073 100644
--- a/spec/lib/delivery/logger_spec.rb
+++ b/spec/lib/delivery/logger_spec.rb
@@ -19,7 +19,8 @@
       let(:mailbox) {build_mailbox(log_path: '/var/log/mail-room.log')}
 
       it 'creates a new file to append to' do
-        file = stub(:sync=)
+        file = stub
+        file.stubs(:sync=)
 
         File.expects(:open).with('/var/log/mail-room.log', 'a').returns(file)
         ::Logger.stubs(:new).with(file)