solidus_subscriptions 1.0.0.rc1 → 1.0.1

data/spec/features/admin/subscriptions_spec.rb

@@ -25,7 +25,7 @@ RSpec.describe 'Subscriptions admin' do
     expect(subscription.billing_address.zipcode).to eq('33167')
   end
 
-  it 'Creates a subscription' do
+  it 'Creates a subscription' do # rubocop:disable RSpec/MultipleExpectations
     variant = create(:variant, subscribable: true)
     create(:user)
     create(:store)
@@ -53,10 +53,20 @@ RSpec.describe 'Subscriptions admin' do
       end
     end
 
-    select variant.name, from: 'Subscribable'
+    select variant.pretty_name, from: 'Subscribable'
     fill_in 'Quantity', with: 1
 
-    expect { click_on 'Create' }.to change { SolidusSubscriptions::Subscription.count }.by(1)
+    expect(SolidusSubscriptions::Subscription.count).to eq(0)
+
+    # The State field is controlled by JS, so we need to set it at the last moment
+    # available.
+    state_id = Spree::State.last.id.to_s
+    find('input#subscription_shipping_address_attributes_state_id', visible: :all).set(state_id)
+    find('input#subscription_billing_address_attributes_state_id', visible: :all).set(state_id)
+
+    click_on 'Create'
+
+    expect(SolidusSubscriptions::Subscription.count).to eq(1)
 
     expect(page).to have_text('Subscription has been successfully created!')
   end

data/spec/jobs/solidus_subscriptions/create_subscription_job_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+RSpec.describe SolidusSubscriptions::CreateSubscriptionJob do
+  describe '#perform' do
+    it 'creates new subscriptions for an order' do
+      order = create(:order, :with_subscription_line_items)
+      subscription_line_item = order.subscription_line_items.last
+
+      described_class.perform_now(order)
+
+      expect(SolidusSubscriptions::Subscription.count).to eq(order.subscription_line_items.count)
+      subscription = SolidusSubscriptions::Subscription.last
+      expect(subscription).to have_attributes(
+        user_id: order.user_id,
+        actionable_date: Time.zone.today + subscription.interval,
+        line_items: [subscription_line_item]
+      )
+    end
+  end
+end

data/spec/jobs/solidus_subscriptions/process_installment_job_spec.rb

@@ -12,7 +12,24 @@ RSpec.describe SolidusSubscriptions::ProcessInstallmentJob do
   end
 
   context 'when handling #perform errors' do
+    it 'by default logs exception data without raising exceptions' do # rubocop:disable RSpec/MultipleExpectations
+      installment = build_stubbed(:installment)
+      checkout = instance_double(SolidusSubscriptions::Checkout).tap do |c|
+        allow(c).to receive(:process).and_raise('test error')
+      end
+      allow(SolidusSubscriptions::Checkout).to receive(:new).and_return(checkout)
+      allow(Rails.logger).to receive(:error)
+
+      expect {
+        described_class.perform_now(installment)
+      }.not_to raise_error
+
+      expect(Rails.logger).to have_received(:error).with("Error processing installment with ID=#{installment.id}:").ordered
+      expect(Rails.logger).to have_received(:error).with("test error").ordered
+    end
+
     it 'swallows error when a proc is not configured' do
+      stub_config(processing_error_handler: nil )
       checkout = instance_double(SolidusSubscriptions::Checkout).tap do |c|
         allow(c).to receive(:process).and_raise('test error')
       end

data/spec/lib/solidus_subscriptions/dispatcher/payment_failed_dispatcher_spec.rb

@@ -27,15 +27,15 @@ RSpec.describe SolidusSubscriptions::Dispatcher::PaymentFailedDispatcher do
     end
 
     it 'fires an installments_failed_payment event' do
-      stub_const('Spree::Event', class_spy(Spree::Event))
+      stub_const('SolidusSupport::LegacyEventCompat::Bus', class_spy(SolidusSupport::LegacyEventCompat::Bus))
       installment = instance_spy(SolidusSubscriptions::Installment)
       order = create(:order_with_line_items)
 
       dispatcher = described_class.new(installment, order)
       dispatcher.dispatch
 
-      expect(Spree::Event).to have_received(:fire).with(
-        'solidus_subscriptions.installment_failed_payment',
+      expect(SolidusSupport::LegacyEventCompat::Bus).to have_received(:publish).with(
+        :'solidus_subscriptions.installment_failed_payment',
         installment: installment,
         order: order,
       )

data/spec/lib/solidus_subscriptions/dispatcher/success_dispatcher_spec.rb

@@ -13,15 +13,15 @@ RSpec.describe SolidusSubscriptions::Dispatcher::SuccessDispatcher do
     end
 
     it 'fires an installments_succeeded event' do
-      stub_const('Spree::Event', class_spy(Spree::Event))
+      stub_const('SolidusSupport::LegacyEventCompat::Bus', class_spy(SolidusSupport::LegacyEventCompat::Bus))
       installment = instance_spy(SolidusSubscriptions::Installment)
       order = create(:order_with_line_items)
 
       dispatcher = described_class.new(installment, order)
       dispatcher.dispatch
 
-      expect(Spree::Event).to have_received(:fire).with(
-        'solidus_subscriptions.installment_succeeded',
+      expect(SolidusSupport::LegacyEventCompat::Bus).to have_received(:publish).with(
+        :'solidus_subscriptions.installment_succeeded',
         installment: installment,
         order: order,
       )

data/spec/lib/solidus_subscriptions/subscription_generator_spec.rb

@@ -75,7 +75,7 @@ RSpec.describe SolidusSubscriptions::SubscriptionGenerator do
         weekly_subscriptions,
         expiring_subscriptions,
       ]
-      grouping_result = described_class.group(subscriptions.sum)
+      grouping_result = described_class.group(subscriptions.flatten)
 
       expect(grouping_result).to match_array(subscriptions)
     end

data/spec/models/solidus_subscriptions/installment_spec.rb

@@ -46,7 +46,7 @@ RSpec.describe SolidusSubscriptions::Installment, type: :model do
 
     it 'creates a new installment detail' do
       expect { success }.
-        to change { SolidusSubscriptions::InstallmentDetail.count }.
+        to change(SolidusSubscriptions::InstallmentDetail, :count).
         by(1)
     end