Merge pull request #240 from bitzesty/ruby2.2.2

Ruby2.2.2

.ruby-version

@@ -1 +1 @@
-2.2.1
+2.2.2

lib/chief_transformer/logger.rb

@@ -20,7 +20,7 @@ def invalid_operation(event)
       Mailer.failed_transformation_notice(event.payload[:operation],
                                           event.payload[:exception],
                                           event.payload[:model],
-                                          event.payload[:errors]).deliver
+                                          event.payload[:errors]).deliver_now
     end
 
     def transform_lock_error(event)

lib/tariff_synchronizer/logger.rb

@@ -35,7 +35,7 @@ def config_error(event)
     def failed_updates_present(event)
       error "TariffSynchronizer found failed updates that need to be fixed before running: #{event.payload[:file_names]}"
 
-      Mailer.failures_reminder(event.payload[:file_names]).deliver
+      Mailer.failures_reminder(event.payload[:file_names]).deliver_now
     end
 
     # Apply all pending Taric and Chief updates
@@ -45,7 +45,7 @@ def apply(event)
       Mailer.applied(
         event.payload[:update_names],
         event.payload.fetch(:unconformant_records, [])
-      ).deliver
+      ).deliver_now
     end
 
     def apply_lock_error(event)
@@ -60,7 +60,7 @@ def failed_update(event)
         event.payload[:exception],
         event.payload[:update],
         event.payload[:database_queries]
-      ).deliver
+      ).deliver_now
     end
 
     def rollback(event)
@@ -76,7 +76,7 @@ def failed_download(event)
       error "Download failed: #{event.payload[:exception].to_s}, url: #{event.payload[:url]}"
 
       Mailer.failed_download(event.payload[:exception], event.payload[:url])
-            .deliver
+            .deliver_now
     end
 
     # Update rebuild from files present in the file system
@@ -88,7 +88,7 @@ def rebuild(event)
     def retry_exceeded(event)
       warn "Download retry count exceeded for #{event.payload[:url]}"
 
-      Mailer.retry_exceeded(event.payload[:url], event.payload[:date]).deliver
+      Mailer.retry_exceeded(event.payload[:url], event.payload[:date]).deliver_now
     end
 
     # Update not found
@@ -100,7 +100,7 @@ def not_found(event)
     def not_found_on_file_system(event)
       error "Update not found on file system at #{event.payload[:path]}"
 
-      Mailer.file_not_found_on_filesystem(event.payload[:path]).deliver
+      Mailer.file_not_found_on_filesystem(event.payload[:path]).deliver_now
     end
 
     def created_chief(event)
@@ -153,28 +153,28 @@ def update_written(event)
     def blank_update(event)
       error "Blank update content received for #{event.payload[:date]}: #{event.payload[:url]}"
 
-      Mailer.blank_update(event.payload[:url], event.payload[:url]).deliver
+      Mailer.blank_update(event.payload[:url], event.payload[:url]).deliver_now
     end
 
     # Can't open file for writing
     def cant_open_file(event)
       error "Can't open file for writing update at #{event.payload[:path]}"
 
-      Mailer.file_write_error(event.payload[:path], "can't open for writing").deliver
+      Mailer.file_write_error(event.payload[:path], "can't open for writing").deliver_now
     end
 
     # Can't write to file
     def cant_write_to_file(event)
       error "Can't write to update file at #{event.payload[:path]}"
 
-      Mailer.file_write_error(event.payload[:path], "can't write to file").deliver
+      Mailer.file_write_error(event.payload[:path], "can't write to file").deliver_now
     end
 
     # No permission to write update file
     def write_permission_error(event)
       error "No permission to write update to #{event.payload[:path]}"
 
-      Mailer.file_write_error(event.payload[:path], 'permission error').deliver
+      Mailer.file_write_error(event.payload[:path], 'permission error').deliver_now
     end
 
     # Delayed update fetching
@@ -198,7 +198,7 @@ def download_exception_exceeded(event)
     def missing_updates(event)
       warn "Missing #{event.payload[:count]} updates in a row for #{event.payload[:update_type].to_s.upcase}"
 
-      Mailer.missing_updates(event.payload[:count], event.payload[:update_type].to_s).deliver
+      Mailer.missing_updates(event.payload[:count], event.payload[:update_type].to_s).deliver_now
     end
   end
 end

spec/models/geographical_area_spec.rb

@@ -176,7 +176,7 @@
 
     describe "GA5" do
       let(:geographical_area) {
-        build(:geographical_area,
+        create(:geographical_area,
               validity_end_date: Date.today,
               validity_start_date: Date.today.ago(3.years),
               parent_geographical_area: parent)