Merge pull request #3576 from projectblacklight/remove-rails4

Remove code supporting Rails 4

Author: jcoyne

app/controllers/concerns/blacklight/catalog.rb

@@ -235,22 +235,14 @@ def search_action_url options = {}
   # Email Action (this will render the appropriate view on GET requests and process the form and send the email on POST requests)
   def email_action documents
     mail = RecordMailer.email_record(documents, { to: params[:to], message: params[:message], config: blacklight_config }, url_options)
-    if mail.respond_to? :deliver_now
-      mail.deliver_now
-    else
-      mail.deliver
-    end
+    mail.deliver_now
   end
 
   # SMS action (this will render the appropriate view on GET requests and process the form and send the email on POST requests)
   def sms_action documents
     to = "#{params[:to].gsub(/[^\d]/, '')}@#{params[:carrier]}"
     mail = RecordMailer.sms_record(documents, { to: to, config: blacklight_config }, url_options)
-    if mail.respond_to? :deliver_now
-      mail.deliver_now
-    else
-      mail.deliver
-    end
+    mail.deliver_now
   end
 
   def validate_sms_params

spec/controllers/catalog_controller_spec.rb

@@ -499,13 +499,14 @@ def export_as_mock
         expect(request.flash[:error]).to be_nil
       end
 
-      it "redirects back to the record upon success" do
-        allow(RecordMailer).to receive(:email_record)
-          .with(anything, { to: '[email protected]', message: 'xyz', config: config }, hash_including(host: 'test.host'))
-          .and_return double(deliver: nil)
-        post :email, params: { id: doc_id, to: '[email protected]', message: 'xyz' }
-        expect(request.flash[:error]).to be_nil
-        expect(request).to redirect_to(solr_document_path(doc_id))
+      context 'when message is provided' do
+        it "sends email and redirects back to the record" do
+          expect do
+            post :email, params: { id: doc_id, to: '[email protected]', message: 'xyz' }
+          end.to send_email(to: '[email protected]')
+          expect(request.flash[:error]).to be_nil
+          expect(request).to redirect_to(solr_document_path(doc_id))
+        end
       end
 
       it "renders email_success for XHR requests" do
@@ -549,11 +550,9 @@ def export_as_mock
       end
 
       it "sends to the appropriate carrier email address" do
-        expect(RecordMailer)
-          .to receive(:sms_record)
-          .with(anything, { to: '[email protected]', config: config }, hash_including(host: 'test.host'))
-          .and_return double(deliver: nil)
-        post :sms, params: { id: doc_id, to: '5555555555', carrier: 'txt.att.net' }
+        expect do
+          post :sms, params: { id: doc_id, to: '5555555555', carrier: 'txt.att.net' }
+        end.to send_email(to: '[email protected]')
       end
 
       it "redirects back to the record upon success" do