Merge pull request #189 from solidusio-contrib/remove-canonical-rails

Remove "canonical-rails" from the Gemfile

3 files changed, 2 insertions, 4 deletions

diff --git a/Gemfile b/Gemfile
index 185c420..24c83d8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,8 +14,6 @@ gem 'rails', '>0.a'
 # Provides basic authentication functionality for testing parts of your engine
 gem 'solidus_auth_devise'
 
-gem 'canonical-rails', '0.2.9'
-
 case ENV['DB']
 when 'mysql'
   gem 'mysql2'
diff --git a/app/models/solidus_subscriptions/installment.rb b/app/models/solidus_subscriptions/installment.rb
index 6d6baaa..0b5f627 100644
--- a/app/models/solidus_subscriptions/installment.rb
+++ b/app/models/solidus_subscriptions/installment.rb
@@ -24,7 +24,7 @@ module SolidusSubscriptions
     end)
 
     scope :with_active_subscription, (lambda do
-      joins(:subscription).where.not(Subscription.table_name => {state: "canceled"})
+      joins(:subscription).where.not(Subscription.table_name => { state: "canceled" })
     end)
 
     scope :actionable, (lambda do
diff --git a/spec/lib/solidus_subscriptions/processor_spec.rb b/spec/lib/solidus_subscriptions/processor_spec.rb
index 3ef9aa2..d3bb268 100644
--- a/spec/lib/solidus_subscriptions/processor_spec.rb
+++ b/spec/lib/solidus_subscriptions/processor_spec.rb
@@ -132,7 +132,7 @@ RSpec.describe SolidusSubscriptions::Processor, :checkout do
 
     context 'the subscription is cancelled with pending installments' do
       let!(:cancelled_installment) do
-        installment = create(:installment, actionable_date: Date.today)
+        installment = create(:installment, actionable_date: Time.zone.today)
         installment.subscription.cancel!
       end