Small tweaks

app/lib/event_store/active_record_event_repository.rb

@@ -5,7 +5,7 @@ class ActiveRecordEventRepository < RailsEventStoreActiveRecord::EventRepository
     def build_event_entity(record)
       return nil unless record
 
-      data = (record.data || {}).merge(
+      data = record.data.merge(
         event_id: record.event_id,
         metadata: record.metadata
       )

app/lib/three_scale/hash_hacks.rb

@@ -24,22 +24,22 @@ def sweep
 
     # Convert all keys to lowercase.
     def downcase_keys
-      transform_keys { |key| key.downcase }
+      transform_keys(&:downcase)
     end
 
     # In place version of +downcase_keys+
     def downcase_keys!
-      transform_keys! {|key| key.downcase}
+      transform_keys!(&:downcase)
     end
 
     # Convert all keys to uppercase.
     def upcase_keys
-      transform_keys { |key| key.upcase }
+      transform_keys(&:upcase)
     end
 
     # In place version of +upcase_keys+
     def upcase_keys!
-      transform_keys! { |key| key.upcase }
+      transform_keys!(&:upcase)
     end
   end
 end

app/services/finance/billing_service.rb

@@ -73,7 +73,6 @@ def with_lock
 
     def report_error(error)
       message = "Failed to perform billing job: #{error.message}"
-      Rails.logger.error(message)
       System::ErrorReporting.report_error(error, error_message: message,
                                                  error_class: error.class.name)
     end

test/factories/cms.rb

@@ -82,6 +82,6 @@
   factory :cms_builtin_legal_term, :parent => :cms_builtin_partial, :class => CMS::Builtin::LegalTerm do
     system_name { 'signup_licence' }
     sequence(:title) { |n| "Legal Term ##{n}" }
-    published { "some text" }
+    draft { "some text" }
   end
 end