reji 1.0.0 → 1.1.0

data/spec/feature/charges_spec.rb

@@ -55,7 +55,7 @@ describe 'charges', type: :request do
     begin
       user.charge(1000, 'pm_card_threeDSecure2Required')
 
-      raise RSpec::Expectations::ExpectationNotMetError.new('Expected exception PaymentActionRequiredError was not thrown.')
+      raise RSpec::Expectations::ExpectationNotMetError, 'Expected exception PaymentActionRequiredError was not thrown.'
     rescue Reji::PaymentActionRequiredError => e
       # Assert that the payment needs an extra action.
       expect(e.payment.requires_action).to be true

data/spec/feature/customer_spec.rb

@@ -7,7 +7,7 @@ describe 'customer', type: :request do
     user = create_customer('customers_in_stripe_can_be_updated')
     user.create_as_stripe_customer
 
-    customer = user.update_stripe_customer({:description => 'Van Cam'})
+    customer = user.update_stripe_customer({ description: 'Van Cam' })
 
     expect(customer.description).to eq('Van Cam')
   end

data/spec/feature/invoices_spec.rb

@@ -6,9 +6,9 @@ describe 'invoices', type: :request do
   it 'test_require_stripe_customer_for_invoicing' do
     user = create_customer('require_stripe_customer_for_invoicing')
 
-    expect {
+    expect do
       user.invoice
-    }.to raise_error(Reji::InvalidCustomerError)
+    end.to raise_error(Reji::InvalidCustomerError)
   end
 
   it 'test_invoicing_fails_with_nothing_to_invoice' do
@@ -53,9 +53,9 @@ describe 'invoices', type: :request do
     user.update_default_payment_method('pm_card_visa')
     invoice = user.invoice_for('Rails Reji', 1000)
 
-    expect {
+    expect do
       other_user.find_invoice(invoice.id)
-    }.to raise_error(Reji::InvalidInvoiceError, "The invoice `#{invoice.id}` does not belong to this customer `#{other_user.stripe_id}`.")
+    end.to raise_error(Reji::InvalidInvoiceError, "The invoice `#{invoice.id}` does not belong to this customer `#{other_user.stripe_id}`.")
   end
 
   it 'test_find_invoice_by_id_or_fail' do
@@ -66,8 +66,8 @@ describe 'invoices', type: :request do
     user.update_default_payment_method('pm_card_visa')
     invoice = user.invoice_for('Rails Reji', 1000)
 
-    expect {
+    expect do
       other_user.find_invoice_or_fail(invoice.id)
-    }.to raise_error(Reji::AccessDeniedHttpError)
+    end.to raise_error(Reji::AccessDeniedHttpError)
   end
 end

data/spec/feature/multiplan_subscriptions_spec.rb

@@ -10,47 +10,47 @@ describe 'multiplan subscriptions', type: :request do
     @premium_plan_id = "#{stripe_prefix}monthly-20-premium-#{SecureRandom.hex(5)}"
 
     Stripe::Product.create({
-      :id => @product_id,
-      :name => 'Rails Reji Test Product',
-      :type => 'service',
+      id: @product_id,
+      name: 'Rails Reji Test Product',
+      type: 'service',
     })
 
     Stripe::Plan.create({
-      :id => @plan_id,
-      :nickname => 'Monthly $10',
-      :currency => 'USD',
-      :interval => 'month',
-      :billing_scheme => 'per_unit',
-      :amount => 1000,
-      :product => @product_id,
+      id: @plan_id,
+      nickname: 'Monthly $10',
+      currency: 'USD',
+      interval: 'month',
+      billing_scheme: 'per_unit',
+      amount: 1000,
+      product: @product_id,
     })
 
     Stripe::Plan.create({
-      :id => @other_plan_id,
-      :nickname => 'Monthly $10 Other',
-      :currency => 'USD',
-      :interval => 'month',
-      :billing_scheme => 'per_unit',
-      :amount => 1000,
-      :product => @product_id,
+      id: @other_plan_id,
+      nickname: 'Monthly $10 Other',
+      currency: 'USD',
+      interval: 'month',
+      billing_scheme: 'per_unit',
+      amount: 1000,
+      product: @product_id,
     })
 
     Stripe::Plan.create({
-      :id => @premium_plan_id,
-      :nickname => 'Monthly $20 Premium',
-      :currency => 'USD',
-      :interval => 'month',
-      :billing_scheme => 'per_unit',
-      :amount => 2000,
-      :product => @product_id,
+      id: @premium_plan_id,
+      nickname: 'Monthly $20 Premium',
+      currency: 'USD',
+      interval: 'month',
+      billing_scheme: 'per_unit',
+      amount: 2000,
+      product: @product_id,
     })
 
     @tax_rate_id = Stripe::TaxRate.create({
-      :display_name => 'VAT',
-      :description => 'VAT Belgium',
-      :jurisdiction => 'BE',
-      :percentage => 21,
-      :inclusive => false,
+      display_name: 'VAT',
+      description: 'VAT Belgium',
+      jurisdiction: 'BE',
+      percentage: 21,
+      inclusive: false,
     }).id
   end
 
@@ -64,7 +64,7 @@ describe 'multiplan subscriptions', type: :request do
   it 'test_customers_can_have_multiplan_subscriptions' do
     user = create_customer('customers_can_have_multiplan_subscriptions')
 
-    user.plan_tax_rates = {@other_plan_id => [@tax_rate_id]}
+    user.plan_tax_rates = { @other_plan_id => [@tax_rate_id] }
 
     subscription = user.new_subscription('main', [@plan_id, @other_plan_id])
       .plan(@premium_plan_id, 5)
@@ -124,11 +124,11 @@ describe 'multiplan subscriptions', type: :request do
   it 'test_customers_cannot_remove_the_last_plan' do
     user = create_customer('customers_cannot_remove_the_last_plan')
 
-    subscription = self.create_subscription_with_single_plan(user)
+    subscription = create_subscription_with_single_plan(user)
 
-    expect {
+    expect do
       subscription.remove_plan(@plan_id)
-    }.to raise_error(Reji::SubscriptionUpdateFailureError)
+    end.to raise_error(Reji::SubscriptionUpdateFailureError)
   end
 
   it 'test_multiplan_subscriptions_can_be_resumed' do
@@ -152,11 +152,11 @@ describe 'multiplan subscriptions', type: :request do
   it 'test_plan_is_required_when_updating_quantities_for_multiplan_subscriptions' do
     user = create_customer('plan_is_required_when_updating_quantities_for_multiplan_subscriptions')
 
-    subscription = self.create_subscription_with_multiple_plans(user)
+    subscription = create_subscription_with_multiple_plans(user)
 
-    expect {
+    expect do
       subscription.update_quantity(5)
-    }.to raise_error(ArgumentError)
+    end.to raise_error(ArgumentError)
   end
 
   it 'test_subscription_item_quantities_can_be_updated' do
@@ -227,7 +227,7 @@ describe 'multiplan subscriptions', type: :request do
 
     subscription = user.new_subscription('main', @plan_id).create('pm_card_visa')
 
-    item = subscription.items.first.swap(@other_plan_id, {:quantity => 3})
+    item = subscription.items.first.swap(@other_plan_id, { quantity: 3 })
 
     expect(subscription.items.count).to eq(1)
     expect(subscription.stripe_plan).to eq(@other_plan_id)
@@ -279,39 +279,37 @@ describe 'multiplan subscriptions', type: :request do
     expect(user.upcoming_invoice.raw_total).to eq(2000)
   end
 
-  protected
-
   # Create a subscription with a single plan.
-  def create_subscription_with_single_plan(user)
+  protected def create_subscription_with_single_plan(user)
     subscription = user.subscriptions.create({
-      :name => 'main',
-      :stripe_id => 'sub_foo',
-      :stripe_plan => @plan_id,
-      :quantity => 1,
-      :stripe_status => 'active',
+      name: 'main',
+      stripe_id: 'sub_foo',
+      stripe_plan: @plan_id,
+      quantity: 1,
+      stripe_status: 'active',
     })
 
     subscription.items.create({
-      :stripe_id => 'it_foo',
-      :stripe_plan => @plan_id,
-      :quantity => 1,
+      stripe_id: 'it_foo',
+      stripe_plan: @plan_id,
+      quantity: 1,
     })
 
     subscription
   end
 
   # Create a subscription with multiple plans.
-  def create_subscription_with_multiple_plans(user)
-    subscription = self.create_subscription_with_single_plan(user)
+  protected def create_subscription_with_multiple_plans(user)
+    subscription = create_subscription_with_single_plan(user)
 
     subscription.stripe_plan = nil
     subscription.quantity = nil
     subscription.save
 
     subscription.items.new({
-      :stripe_id => 'it_foo',
-      :stripe_plan => @other_plan_id,
-      :quantity => 1,
+      stripe_id: 'it_foo',
+      stripe_plan: @other_plan_id,
+      quantity: 1,
     })
 
     subscription

data/spec/feature/payment_methods_spec.rb

@@ -3,13 +3,13 @@
 require 'spec_helper'
 
 describe 'payment_methods', type: :request do
-  it 'can_start_a_new_setup_intent_session' do
+  it 'test_we_can_start_a_new_setup_intent_session' do
     user = create_customer('we_can_start_a_new_setup_intent_session')
     setup_intent = user.create_setup_intent
     expect(setup_intent).to be_an_instance_of(Stripe::SetupIntent)
   end
 
-  it 'can_add_payment_methods' do
+  it 'test_we_can_add_payment_methods' do
     user = create_customer('we_can_add_payment_methods')
     user.create_as_stripe_customer
 
@@ -18,34 +18,34 @@ describe 'payment_methods', type: :request do
     expect(payment_method).to be_an_instance_of(Reji::PaymentMethod)
     expect(payment_method.card.brand).to eq('visa')
     expect(payment_method.card.last4).to eq('4242')
-    expect(user.has_payment_method).to be true
-    expect(user.has_default_payment_method).to be false
+    expect(user.payment_method?).to be true
+    expect(user.default_payment_method?).to be false
   end
 
-  it 'can_remove_payment_methods' do
+  it 'test_we_can_remove_payment_methods' do
     user = create_customer('we_can_remove_payment_methods')
     user.create_as_stripe_customer
 
     payment_method = user.add_payment_method('pm_card_visa')
 
     expect(user.payment_methods.count).to eq(1)
-    expect(user.has_payment_method).to be true
+    expect(user.payment_method?).to be true
 
     user.remove_payment_method(payment_method.as_stripe_payment_method)
 
     expect(user.payment_methods.count).to eq(0)
-    expect(user.has_payment_method).to be false
+    expect(user.payment_method?).to be false
   end
 
-  it 'can_remove_the_default_payment_method' do
+  it 'test_we_can_remove_the_default_payment_method' do
     user = create_customer('we_can_remove_the_default_payment_method')
     user.create_as_stripe_customer
 
     payment_method = user.update_default_payment_method('pm_card_visa')
 
     expect(user.payment_methods.count).to eq(1)
-    expect(user.has_payment_method).to be true
-    expect(user.has_default_payment_method).to be true
+    expect(user.payment_method?).to be true
+    expect(user.default_payment_method?).to be true
 
     user.remove_payment_method(payment_method.as_stripe_payment_method)
 
@@ -53,11 +53,11 @@ describe 'payment_methods', type: :request do
     expect(user.default_payment_method).to be_nil
     expect(user.card_brand).to be_nil
     expect(user.card_last_four).to be_nil
-    expect(user.has_payment_method).to be false
-    expect(user.has_default_payment_method).to be false
+    expect(user.payment_method?).to be false
+    expect(user.default_payment_method?).to be false
   end
 
-  it 'can_set_a_default_payment_method' do
+  it 'test_we_can_set_a_default_payment_method' do
     user = create_customer('we_can_set_a_default_payment_method')
     user.create_as_stripe_customer
 
@@ -66,7 +66,7 @@ describe 'payment_methods', type: :request do
     expect(payment_method).to be_an_instance_of(Reji::PaymentMethod)
     expect(payment_method.card.brand).to eq('visa')
     expect(payment_method.card.last4).to eq('4242')
-    expect(user.has_default_payment_method).to be true
+    expect(user.default_payment_method?).to be true
 
     payment_method = user.default_payment_method
 
@@ -75,10 +75,10 @@ describe 'payment_methods', type: :request do
     expect(payment_method.card.last4).to eq('4242')
   end
 
-  it 'can_retrieve_an_old_default_source_as_a_default_payment_method' do
+  it 'test_legacy_we_can_retrieve_an_old_default_source_as_a_default_payment_method' do
     user = create_customer('we_can_retrieve_an_old_default_source_as_a_default_payment_method')
     customer = user.create_as_stripe_customer
-    card = Stripe::Customer.create_source(customer.id, {:source => 'tok_visa'}, user.stripe_options)
+    card = Stripe::Customer.create_source(customer.id, { source: 'tok_visa' }, user.stripe_options)
     customer.default_source = card.id
     customer.save
 
@@ -89,15 +89,15 @@ describe 'payment_methods', type: :request do
     expect(payment_method.last4).to eq('4242')
   end
 
-  it 'can_retrieve_all_payment_methods' do
+  it 'test_we_can_retrieve_all_payment_methods' do
     user = create_customer('we_can_retrieve_all_payment_methods')
     customer = user.create_as_stripe_customer
 
     payment_method = Stripe::PaymentMethod.retrieve('pm_card_visa', user.stripe_options)
-    payment_method.attach({:customer => customer.id})
+    payment_method.attach({ customer: customer.id })
 
     payment_method = Stripe::PaymentMethod.retrieve('pm_card_mastercard', user.stripe_options)
-    payment_method.attach({:customer => customer.id})
+    payment_method.attach({ customer: customer.id })
 
     payment_methods = user.payment_methods
 
@@ -106,14 +106,14 @@ describe 'payment_methods', type: :request do
     expect(payment_methods.last.card.brand).to eq('visa')
   end
 
-  it 'can_sync_the_payment_method_from_stripe' do
+  it 'test_we_can_sync_the_default_payment_method_from_stripe' do
     user = create_customer('we_can_sync_the_payment_method_from_stripe')
     customer = user.create_as_stripe_customer
 
     payment_method = Stripe::PaymentMethod.retrieve('pm_card_visa', user.stripe_options)
-    payment_method.attach({:customer => customer.id})
+    payment_method.attach({ customer: customer.id })
 
-    customer.invoice_settings = {:default_payment_method => payment_method.id}
+    customer.invoice_settings = { default_payment_method: payment_method.id }
 
     customer.save
 
@@ -126,15 +126,15 @@ describe 'payment_methods', type: :request do
     expect(user.card_last_four).to eq('4242')
   end
 
-  it 'delete_all_payment_methods' do
+  it 'test_we_delete_all_payment_methods' do
     user = create_customer('we_delete_all_payment_methods')
     customer = user.create_as_stripe_customer
 
     payment_method = Stripe::PaymentMethod.retrieve('pm_card_visa', user.stripe_options)
-    payment_method.attach({:customer => customer.id})
+    payment_method.attach({ customer: customer.id })
 
     payment_method = Stripe::PaymentMethod.retrieve('pm_card_mastercard', user.stripe_options)
-    payment_method.attach({:customer => customer.id})
+    payment_method.attach({ customer: customer.id })
 
     payment_methods = user.payment_methods
 

data/spec/feature/pending_updates_spec.rb

@@ -10,39 +10,39 @@ describe 'pending updates', type: :request do
     @premium_plan_id = "#{stripe_prefix}monthly-20-premium-#{SecureRandom.hex(5)}"
 
     Stripe::Product.create({
-      :id => @product_id,
-      :name => 'Rails Reji Test Product',
-      :type => 'service',
+      id: @product_id,
+      name: 'Rails Reji Test Product',
+      type: 'service',
     })
 
     Stripe::Plan.create({
-      :id => @plan_id,
-      :nickname => 'Monthly $10',
-      :currency => 'USD',
-      :interval => 'month',
-      :billing_scheme => 'per_unit',
-      :amount => 1000,
-      :product => @product_id,
+      id: @plan_id,
+      nickname: 'Monthly $10',
+      currency: 'USD',
+      interval: 'month',
+      billing_scheme: 'per_unit',
+      amount: 1000,
+      product: @product_id,
     })
 
     Stripe::Plan.create({
-      :id => @other_plan_id,
-      :nickname => 'Monthly $10 Other',
-      :currency => 'USD',
-      :interval => 'month',
-      :billing_scheme => 'per_unit',
-      :amount => 1000,
-      :product => @product_id,
+      id: @other_plan_id,
+      nickname: 'Monthly $10 Other',
+      currency: 'USD',
+      interval: 'month',
+      billing_scheme: 'per_unit',
+      amount: 1000,
+      product: @product_id,
     })
 
     Stripe::Plan.create({
-      :id => @premium_plan_id,
-      :nickname => 'Monthly $20 Premium',
-      :currency => 'USD',
-      :interval => 'month',
-      :billing_scheme => 'per_unit',
-      :amount => 2000,
-      :product => @product_id,
+      id: @premium_plan_id,
+      nickname: 'Monthly $20 Premium',
+      currency: 'USD',
+      interval: 'month',
+      billing_scheme: 'per_unit',
+      amount: 2000,
+      product: @product_id,
     })
   end
 
@@ -65,8 +65,8 @@ describe 'pending updates', type: :request do
       # Attempt to swap and pay with a faulty card.
       subscription = subscription.error_if_payment_fails.swap_and_invoice(@premium_plan_id)
 
-      raise RSpec::Expectations::ExpectationNotMetError.new('Expected exception PaymentFailureError was not thrown.')
-    rescue Stripe::CardError => e
+      raise RSpec::Expectations::ExpectationNotMetError, 'Expected exception PaymentFailureError was not thrown.'
+    rescue Stripe::CardError => _e
       # Assert that the plan was not swapped.
       expect(subscription.stripe_plan).to eq(@plan_id)