From d5bb3a60e276b81e7cdcbad8a298d2a4bf72d0bb Mon Sep 17 00:00:00 2001
From: Tom Naessens <Tom.Naessens@UGent.be>
Date: Sun, 8 Feb 2015 16:14:21 +0100
Subject: [PATCH] Fix depcrecation warnings and yaml syntax errors

---
 app/models/order.rb                                       | 4 ++--
 app/models/ticket.rb                                      | 2 +-
 app/models/user.rb                                        | 8 ++++----
 config/application.rb                                     | 2 ++
 config/environments/test.rb                               | 5 ++++-
 .../initializers/mute_papertrail_deprecation_warnings.rb  | 5 +++++
 config/secrets.yml                                        | 6 +++---
 7 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 config/initializers/mute_papertrail_deprecation_warnings.rb

diff --git a/app/models/order.rb b/app/models/order.rb
index 10909e1a..456f707a 100644
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -117,10 +117,10 @@ def deliver
     if self.is_paid
       self.tickets.all.map(&:deliver)
       if self.paid > self.price
-        OrderMailer.notify_overpayment(self).deliver
+        OrderMailer.notify_overpayment(self).deliver_now
       end
     else
-      OrderMailer.confirm_order(self).deliver
+      OrderMailer.confirm_order(self).deliver_now
     end
   end
 
diff --git a/app/models/ticket.rb b/app/models/ticket.rb
index 40ab28d9..d3cd4e2e 100644
--- a/app/models/ticket.rb
+++ b/app/models/ticket.rb
@@ -74,7 +74,7 @@ def deliver
       self.generate_barcode
     end
 
-    TicketMailer.ticket(self).deliver
+    TicketMailer.ticket(self).deliver_now
   end
 
   def generate_barcode
diff --git a/app/models/user.rb b/app/models/user.rb
index 45139f8c..5ea3bf15 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -37,8 +37,8 @@ def digest(*args)
     end
 
     # using httparty because it is much easier to read than net/http code
-    resp = HTTParty.get(Rails.application.config.fk_auth_url, :query => {
-              :k => digest(username, Rails.application.config.fk_auth_key),
+    resp = HTTParty.get(Rails.application.secrets.fk_auth_url, :query => {
+              :k => digest(username, Rails.application.secrets.fk_auth_key),
               :u => username
            })
 
@@ -47,7 +47,7 @@ def digest(*args)
       hash = JSON[resp.body]
 
       clubs_dig = hash['data'].map { |c| c['internalName'] }
-      dig = digest(Rails.application.config.fk_auth_salt, username, clubs_dig)
+      dig = digest(Rails.application.secrets.fk_auth_salt, username, clubs_dig)
 
       # Process clubs if the controle is correct
       if hash['controle'] == dig
@@ -91,7 +91,7 @@ def display_name
   # fetch clubs where user is enrolled in
   def fetch_enrolled_clubs
     resp = HTTParty.get("http://registratie.fkgent.be/api/v2/members/clubs_for_ugent_nr.json", query:
-                 {key: Rails.application.config.enrollment_key, ugent_nr: self.cas_ugentStudentID})
+                 {key: Rails.application.secrets.enrolment_key, ugent_nr: self.cas_ugentStudentID})
 
     if resp.code == 200
       clubs = JSON[resp.body].map(&:downcase)
diff --git a/config/application.rb b/config/application.rb
index bbf2b45e..4d20a1ed 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -21,5 +21,7 @@ class Application < Rails::Application
     # config.i18n.default_locale = :de
     #
     config.active_job.queue_adapter = :delayed_job
+
+    config.active_record.raise_in_transactional_callbacks = true
   end
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 9d21672d..90ee23b0 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -13,7 +13,7 @@
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files  = true
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching.
@@ -33,4 +33,7 @@
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
+
+  # Randomize test order
+  config.active_support.test_order = :random
 end
diff --git a/config/initializers/mute_papertrail_deprecation_warnings.rb b/config/initializers/mute_papertrail_deprecation_warnings.rb
new file mode 100644
index 00000000..10a2ed4e
--- /dev/null
+++ b/config/initializers/mute_papertrail_deprecation_warnings.rb
@@ -0,0 +1,5 @@
+current_behavior = ActiveSupport::Deprecation.behavior
+ActiveSupport::Deprecation.behavior = lambda do |message, callstack|
+  return if message =~ /`serialized_attributes` is deprecated without replacement/ && callstack.any? { |m| m =~ /paper_trail/ }
+  Array.wrap(current_behavior).each { |behavior| behavior.call(message, callstack) }
+end
diff --git a/config/secrets.yml b/config/secrets.yml
index 32c841db..703050f1 100644
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -3,18 +3,18 @@ development:
   fk_auth_url: 'http://fkgent.be/api_isengard_v2.php'
   fk_auth_salt: '#development#'
   fk_auth_key: '#development#'
-  enrollment_key: '#development#'
+  enrolment_key: '#development#'
 
 test:
   secret_key_base: '95182ec21cccb3c5ca9425bb8a45ec9327ae7e33e857395b689f38fc6d801e1185c7abb662190c2b8512f05e8087f0bab0f604f802b4c631431811b5b1d32a29'
   fk_auth_url: 'http://fkgent.be/api_isengard_v2.php'
   fk_auth_salt: '#development#'
   fk_auth_key: '#development#'
-  enrollment_key: '#development#'
+  enrolment_key: '#development#'
 
 production:
   secret_key_base: 'a27fcd9aa2eabd14030493d6b5a1521ba09c9d23a1dd90b3c9d6914b8d226d1df8b46af3005f73a29c3ef1acd86de3669fbe08605d9ce8da73856c734f8a0e36'
   fk_auth_url: 'http://fkgent.be/api_isengard_v2.php'
   fk_auth_salt: '#development#'
   fk_auth_key: '#development#'
-  enrollment_key: '#development#'
+  enrolment_key: '#development#'