disco_app 0.8.7 → 0.8.8

data/test/fixtures/disco_app/plans.yml

@@ -1,32 +1,37 @@
 development:
-  status: 2
+  id: 1
   name: Development
-  charge_type: 0
-  default_price: 0.00
-  default_trial_days: 14
+  plan_type: 0
+  trial_period_days: 0
+  amount: 0
 
 comped:
-  status: 2
   name: Comped
-  charge_type: 0
-  default_price: 0.00
-  default_trial_days: 0
+  plan_type: 0
+  trial_period_days: 0
+  amount: 0
+
+lifetime:
+  name: Lifetime
+  plan_type: 1
+  trial_period_days: 0
+  amount: 4900
 
 cheapo:
-  status: 1
   name: Cheapo
-  charge_type: 0
-  default_price: 0.99
-  default_trial_days: 14
+  status: <%= DiscoApp::Plan.statuses[:unavailable] %>
+  plan_type: 0
+  trial_period_days: 14
+  amount: 99
 
 basic:
   name: Basic
-  charge_type: 0
-  default_price: 9.99
-  default_trial_days: 14
+  plan_type: 0
+  trial_period_days: 14
+  amount: 999
 
 premium:
   name: Premium
-  charge_type: 0
-  default_price: 49.99
-  default_trial_days: 14
+  plan_type: 0
+  trial_period_days: 28
+  amount: 9999

data/test/fixtures/disco_app/recurring_application_charges.yml

@@ -0,0 +1,11 @@
+current_widget_store_subscription_recurring_charge:
+  shop: widget_store
+  subscription: current_widget_store_subscription
+  status: <%= DiscoApp::RecurringApplicationCharge.statuses[:active] %>
+
+new_widget_store_subscription_recurring_charge:
+  shop: widget_store
+  subscription: current_widget_store_subscription
+  status: <%= DiscoApp::RecurringApplicationCharge.statuses[:pending] %>
+  shopify_id: 654381179
+  confirmation_url: "https://apple.myshopify.com/admin/charges/654381179/confirm_recurring_application_charge?signature=BAhpBHsQASc%3D--b2e90c6e4e94fbae15a464c566a31a1c23e6bffa"

data/test/fixtures/disco_app/subscriptions.yml

@@ -1,26 +1,21 @@
-widget_store_old:
+old_widget_store_subscription:
   shop: widget_store
   plan: cheapo
-  status: <%= DiscoApp::Subscription.statuses[:replaced] %>
-  name: Cheapo
-  charge_type: 0
-  price: 0.99
-  trial_days: 14
+  amount: 99
+  status: <%= DiscoApp::Subscription.statuses[:cancelled] %>
+  subscription_type: 0
+  cancelled_at: <%= 1.week.ago.to_s(:db) %>
 
-widget_store:
+current_widget_store_subscription:
   shop: widget_store
   plan: basic
+  amount: 999
   status: <%= DiscoApp::Subscription.statuses[:active] %>
-  name: Basic
-  charge_type: 0
-  price: 9.99
-  trial_days: 14
+  subscription_type: 0
 
-widget_store_dev:
+current_widget_store_dev_subscription:
   shop: widget_store_dev
-  plan: development
+  plan: lifetime
+  amount: 4900
   status: <%= DiscoApp::Subscription.statuses[:active] %>
-  name: Development
-  charge_type: 0
-  price: 0.00
-  trial_days: 0
+  subscription_type: 1

data/test/jobs/disco_app/app_installed_job_test.rb

@@ -5,26 +5,38 @@ class DiscoApp::AppInstalledJobTest < ActionController::TestCase
 
   def setup
     @shop = disco_app_shops(:widget_store)
+
+    stub_request(:get, "#{@shop.admin_url}/webhooks.json").to_return(status: 200, body: api_fixture('widget_store/webhooks').to_json)
+    stub_request(:post, "#{@shop.admin_url}/webhooks.json").to_return(status: 200)
+    stub_request(:get, "#{@shop.admin_url}/shop.json").to_return(status: 200, body: api_fixture('widget_store/shop').to_json)
   end
 
   def teardown
     @shop = nil
+
+    WebMock.reset!
   end
 
   test 'app installed job performs shop update job' do
-    stub_request(:get, "#{@shop.admin_url}/webhooks.json").to_return(status: 200, body: api_fixture('widget_store/webhooks'))
-    stub_request(:post, "#{@shop.admin_url}/webhooks.json").to_return(status: 200)
-    stub_request(:get, "#{@shop.admin_url}/shop.json").to_return(status: 200, body: api_fixture('widget_store/shop'))
-
     # Assert the main install job can be enqueued and performed.
     perform_enqueued_jobs do
       DiscoApp::AppInstalledJob.perform_later(@shop.shopify_domain)
     end
-    assert_performed_jobs 1
 
     # Assert the update shop job was performed.
     @shop.reload
     assert_equal 'United States', @shop.country_name
   end
 
+  test 'app installed job automatically subscribes stores to the correct default plan' do
+    @shop.current_subscription.destroy
+
+    perform_enqueued_jobs do
+      DiscoApp::AppInstalledJob.perform_later(@shop.shopify_domain)
+    end
+
+    # Assert the shop was subscribed to the development plan.
+    assert_equal disco_app_plans(:development), @shop.current_subscription.plan
+  end
+
 end

data/test/jobs/disco_app/app_uninstalled_job_test.rb

@@ -5,7 +5,6 @@ class DiscoApp::AppUninstalledJobTest < ActionController::TestCase
 
   def setup
     @shop = disco_app_shops(:widget_store)
-    @shop.charge_active!
 
     perform_enqueued_jobs do
       DiscoApp::AppUninstalledJob.perform_later(@shop.shopify_domain, {})
@@ -25,7 +24,6 @@ class DiscoApp::AppUninstalledJobTest < ActionController::TestCase
   test 'app uninstalled job can be extended using concerns' do
     assert_performed_jobs 1
     @shop.reload
-    assert @shop.charge_cancelled? # Assert base methods still called.
     assert_equal 'Nowhere', @shop.country_name # Assert extended method called.
   end
 

data/test/models/disco_app/shop_test.rb

@@ -18,9 +18,10 @@ class DiscoApp::ShopTest < ActiveSupport::TestCase
     assert_equal 2, @shop.subscriptions.size
   end
 
-  test 'can fetch a shops active subscription' do
+  test 'can fetch a shops current subscription' do
     assert_equal 1, @shop.subscriptions.active.size
-    assert_equal disco_app_subscriptions(:widget_store), @shop.subscriptions.active.first
+    assert @shop.current_subscription?
+    assert_equal disco_app_subscriptions(:current_widget_store_subscription), @shop.current_subscription
   end
 
 end

data/test/services/disco_app/charges_service_test.rb

@@ -0,0 +1,104 @@
+require 'test_helper'
+
+class DiscoApp::ChargesServiceTest < ActiveSupport::TestCase
+  include DiscoApp::Test::ShopifyAPI
+
+  def setup
+    @shop = disco_app_shops(:widget_store)
+    @subscription = disco_app_subscriptions(:current_widget_store_subscription)
+    @new_charge = disco_app_recurring_application_charges(:new_widget_store_subscription_recurring_charge)
+
+    @dev_shop = disco_app_shops(:widget_store_dev)
+    @dev_subscription = disco_app_subscriptions(:current_widget_store_dev_subscription)
+    @dev_new_charge = disco_app_application_charges(:new_widget_store_dev_subscription_one_time_charge)
+
+    Timecop.freeze
+  end
+
+  def teardown
+    @shop = nil
+    @subscription = nil
+    @new_charge = nil
+
+    @dev_shop = nil
+    @dev_subscription = nil
+    @dev_new_charge = nil
+
+    Timecop.return
+
+    WebMock.reset!
+  end
+
+  test 'creating a new charge for a recurring subscription is successful' do
+    stub_api_request(:post, "#{@shop.admin_url}/recurring_application_charges.json", 'widget_store/charges/create_recurring_application_charge')
+
+    new_charge = DiscoApp::ChargesService.create(@shop, @subscription)
+    assert_equal 654381179, new_charge.shopify_id
+    assert_equal 'https://apple.myshopify.com/admin/charges/654381179/confirm_recurring_application_charge?signature=BAhpBHsQASc%3D--b2e90c6e4e94fbae15a464c566a31a1c23e6bffa', new_charge.confirmation_url
+  end
+
+  test 'activating a pending recurring charge is not successful' do
+    stub_api_request(:get, "#{@shop.admin_url}/recurring_application_charges/654381179.json", 'widget_store/charges/get_pending_recurring_application_charge')
+    assert_not DiscoApp::ChargesService.activate(@shop, @new_charge)
+    assert @new_charge.pending?
+  end
+
+  test 'activating a declined recurring charge is not successful' do
+    stub_api_request(:get, "#{@shop.admin_url}/recurring_application_charges/654381179.json", 'widget_store/charges/get_declined_recurring_application_charge')
+    assert_not DiscoApp::ChargesService.activate(@shop, @new_charge)
+    assert @new_charge.declined?
+  end
+
+  test 'activating an accepted recurring charge is successful and cancels any existing recurring charges' do
+    stub_api_request(:get, "#{@shop.admin_url}/recurring_application_charges/654381179.json", 'widget_store/charges/get_accepted_recurring_application_charge')
+    stub_api_request(:post, "#{@shop.admin_url}/recurring_application_charges/654381179/activate.json", 'widget_store/charges/activate_recurring_application_charge')
+
+    old_charge = @subscription.active_charge
+    assert old_charge.active?
+
+    assert DiscoApp::ChargesService.activate(@shop, @new_charge)
+    assert @new_charge.active?
+
+    old_charge.reload
+    assert old_charge.cancelled?
+  end
+
+  test 'activating an accepted recurring charge cancels other recurring charges' do
+    stub_api_request(:get, "#{@shop.admin_url}/recurring_application_charges/654381179.json", 'widget_store/charges/get_accepted_recurring_application_charge')
+    stub_api_request(:post, "#{@shop.admin_url}/recurring_application_charges/654381179/activate.json", 'widget_store/charges/activate_recurring_application_charge')
+
+    assert DiscoApp::ChargesService.activate(@shop, @new_charge)
+    assert @new_charge.active?
+  end
+
+  test 'creating a new charge for a one-time subscription is successful' do
+    stub_api_request(:post, "#{@dev_shop.admin_url}/application_charges.json", 'widget_store/charges/create_application_charge')
+
+    new_charge = DiscoApp::ChargesService.create(@dev_shop, @dev_subscription)
+    assert_equal 1012637323, new_charge.shopify_id
+    assert_equal 'https://apple.myshopify.com/admin/charges/1012637323/confirm_application_charge?signature=BAhpBIueWzw%3D--0ea1abacaf9d6fd538b7e9a7023e9b71ce1c7e98', new_charge.confirmation_url
+  end
+
+  test 'activating a pending one-time charge is not successful' do
+    stub_api_request(:get, "#{@dev_shop.admin_url}/application_charges/1012637323.json", 'widget_store/charges/get_pending_application_charge')
+
+    assert_not DiscoApp::ChargesService.activate(@dev_shop, @dev_new_charge)
+    assert @dev_new_charge.pending?
+  end
+
+  test 'activating a declined one-time charge is not successful' do
+    stub_api_request(:get, "#{@dev_shop.admin_url}/application_charges/1012637323.json", 'widget_store/charges/get_declined_application_charge')
+
+    assert_not DiscoApp::ChargesService.activate(@dev_shop, @dev_new_charge)
+    assert @dev_new_charge.declined?
+  end
+
+  test 'activating an accepted one-time charge is successful' do
+    stub_api_request(:get, "#{@dev_shop.admin_url}/application_charges/1012637323.json", 'widget_store/charges/get_accepted_application_charge')
+    stub_api_request(:post, "#{@dev_shop.admin_url}/application_charges/1012637323/activate.json", 'widget_store/charges/activate_application_charge')
+
+    assert DiscoApp::ChargesService.activate(@dev_shop, @dev_new_charge)
+    assert @dev_new_charge.active?
+  end
+
+end

data/test/services/disco_app/subscription_service_test.rb

@@ -1,28 +1,59 @@
 require 'test_helper'
 
 class DiscoApp::SubscriptionServiceTest < ActiveSupport::TestCase
+  include ActiveJob::TestHelper
 
   def setup
     @shop = disco_app_shops(:widget_store)
-    @current_subscription = @shop.current_subscription
+    @subscription = disco_app_subscriptions(:current_widget_store_subscription)
+    Timecop.freeze
   end
 
   def teardown
     @shop = nil
+    @subscription = nil
+    Timecop.return
   end
 
   test 'subscribing to a new plan deactivates current subscription and swaps to new plan' do
     DiscoApp::SubscriptionService.subscribe(@shop, disco_app_plans(:premium))
-    @current_subscription.reload
-    assert @current_subscription.replaced?
+    @subscription.reload
+    assert @subscription.cancelled?
     assert_equal disco_app_plans(:premium), @shop.current_subscription.plan
   end
 
-  test 'cancelling a plan works' do
-    DiscoApp::SubscriptionService.cancel(@shop)
-    @current_subscription.reload
-    assert @current_subscription.cancelled?
-    assert_not @shop.current_subscription
+  test 'subscribing to a new plan enqueues subscription changed background job' do
+    assert_enqueued_with(job: DiscoApp::SubscriptionChangedJob) do
+      DiscoApp::SubscriptionService.subscribe(@shop, disco_app_plans(:premium))
+    end
+  end
+
+  test 'subscribing to a new plan works for a shop without a subscription' do
+    @subscription.destroy
+    DiscoApp::SubscriptionService.subscribe(@shop, disco_app_plans(:premium))
+    assert_equal disco_app_plans(:premium), @shop.current_subscription.plan
+  end
+
+  test 'new subscription for a plan without a trial period created correctly' do
+    new_subscription = DiscoApp::SubscriptionService.subscribe(@shop, disco_app_plans(:comped))
+    assert new_subscription.active?
+    assert_equal nil, new_subscription.trial_start_at
+    assert_equal nil, new_subscription.trial_end_at
+  end
+
+  test 'new subscription for a plan with a trial period created correctly' do
+    new_subscription = DiscoApp::SubscriptionService.subscribe(@shop, disco_app_plans(:premium))
+    assert new_subscription.trial?
+    assert_equal Time.now, new_subscription.trial_start_at
+    assert_equal 28.days.from_now, new_subscription.trial_end_at
+  end
+
+  test 'new subscription for a plan with a plan code created correctly' do
+    new_subscription = DiscoApp::SubscriptionService.subscribe(@shop, disco_app_plans(:premium), disco_app_plan_codes(:podcast))
+    assert new_subscription.trial?
+    assert_equal Time.now, new_subscription.trial_start_at
+    assert_equal 60.days.from_now, new_subscription.trial_end_at
+    assert_equal 8999, new_subscription.amount
   end
 
 end

data/test/support/test_file_fixtures.rb

@@ -16,7 +16,7 @@ module DiscoApp::Test
     # API fixtures are special-case JSON fixtures.
     def api_fixture(path)
       filename = File.join(File.dirname(File.dirname(__FILE__)), 'fixtures', 'api', "#{path}.json")
-      File.read(filename)
+      HashWithIndifferentAccess.new(ActiveSupport::JSON.decode(File.read(filename)))
     end
 
     # Webhook fixtures are special-case JSON fixtures.

data/test/support/test_shopify_api.rb

@@ -0,0 +1,16 @@
+module DiscoApp::Test
+  module ShopifyAPI
+
+    def stub_api_request(method, endpoint, fixture_name)
+      if method == :get
+        stub_request(method, endpoint)
+          .to_return(status: 200, body: api_fixture("#{fixture_name}_response").to_json)
+      elsif method == :post
+        stub_request(method, endpoint)
+          .with(body: api_fixture("#{fixture_name}_request").to_json)
+          .to_return(status: 201, body: api_fixture("#{fixture_name}_response").to_json)
+      end
+    end
+
+  end
+end

data/test/test_helper.rb

@@ -15,6 +15,7 @@ require "rails/test_help"
 
 # Require our additional test support helpers.
 require 'support/test_file_fixtures'
+require 'support/test_shopify_api'
 
 # Require WebMock
 require 'webmock/minitest'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disco_app
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - Gavin Ballard
@@ -316,7 +316,9 @@ files:
 - app/controllers/disco_app/admin/application_controller.rb
 - app/controllers/disco_app/admin/concerns/app_settings_controller.rb
 - app/controllers/disco_app/admin/concerns/authenticated_controller.rb
+- app/controllers/disco_app/admin/concerns/plans_controller.rb
 - app/controllers/disco_app/admin/concerns/shops_controller.rb
+- app/controllers/disco_app/admin/plans_controller.rb
 - app/controllers/disco_app/admin/resources/shops_controller.rb
 - app/controllers/disco_app/admin/shops_controller.rb
 - app/controllers/disco_app/charges_controller.rb
@@ -325,26 +327,34 @@ files:
 - app/controllers/disco_app/concerns/carrier_request_controller.rb
 - app/controllers/disco_app/frame_controller.rb
 - app/controllers/disco_app/install_controller.rb
+- app/controllers/disco_app/subscriptions_controller.rb
 - app/controllers/disco_app/webhooks_controller.rb
+- app/controllers/sessions_controller.rb
 - app/helpers/disco_app/application_helper.rb
 - app/jobs/disco_app/app_installed_job.rb
 - app/jobs/disco_app/app_uninstalled_job.rb
 - app/jobs/disco_app/concerns/app_installed_job.rb
 - app/jobs/disco_app/concerns/app_uninstalled_job.rb
 - app/jobs/disco_app/concerns/shop_update_job.rb
+- app/jobs/disco_app/concerns/subscription_changed_job.rb
 - app/jobs/disco_app/concerns/synchronise_carrier_service_job.rb
 - app/jobs/disco_app/concerns/synchronise_webhooks_job.rb
 - app/jobs/disco_app/shop_job.rb
 - app/jobs/disco_app/shop_update_job.rb
+- app/jobs/disco_app/subscription_changed_job.rb
 - app/jobs/disco_app/synchronise_carrier_service_job.rb
 - app/jobs/disco_app/synchronise_webhooks_job.rb
 - app/models/disco_app/app_settings.rb
+- app/models/disco_app/application_charge.rb
 - app/models/disco_app/concerns/app_settings.rb
 - app/models/disco_app/concerns/plan.rb
+- app/models/disco_app/concerns/plan_code.rb
 - app/models/disco_app/concerns/shop.rb
 - app/models/disco_app/concerns/subscription.rb
 - app/models/disco_app/concerns/synchronises.rb
 - app/models/disco_app/plan.rb
+- app/models/disco_app/plan_code.rb
+- app/models/disco_app/recurring_application_charge.rb
 - app/models/disco_app/session_storage.rb
 - app/models/disco_app/shop.rb
 - app/models/disco_app/subscription.rb
@@ -356,6 +366,10 @@ files:
 - app/services/disco_app/subscription_service.rb
 - app/services/disco_app/webhook_service.rb
 - app/views/disco_app/admin/app_settings/edit.html.erb
+- app/views/disco_app/admin/plans/_form.html.erb
+- app/views/disco_app/admin/plans/edit.html.erb
+- app/views/disco_app/admin/plans/index.html.erb
+- app/views/disco_app/admin/plans/new.html.erb
 - app/views/disco_app/admin/shops/index.html.erb
 - app/views/disco_app/charges/activate.html.erb
 - app/views/disco_app/charges/create.html.erb
@@ -366,6 +380,7 @@ files:
 - app/views/disco_app/proxy_errors/404.html.erb
 - app/views/disco_app/shared/_card.html.erb
 - app/views/disco_app/shared/_section.html.erb
+- app/views/disco_app/subscriptions/new.html.erb
 - app/views/layouts/admin.html.erb
 - app/views/layouts/admin/_navbar.html.erb
 - app/views/layouts/application.html.erb
@@ -384,6 +399,15 @@ files:
 - db/migrate/20160112233706_create_disco_app_sessions.rb
 - db/migrate/20160113194418_add_shop_id_to_disco_app_sessions.rb
 - db/migrate/20160223111044_create_disco_app_settings.rb
+- db/migrate/20160301223215_update_plans.rb
+- db/migrate/20160301224558_update_subscriptions.rb
+- db/migrate/20160302104816_create_disco_app_recurring_application_charges.rb
+- db/migrate/20160302105259_create_disco_app_application_charges.rb
+- db/migrate/20160302134728_drop_charge_status_from_shops.rb
+- db/migrate/20160302142941_add_shopify_attributes_to_charges.rb
+- db/migrate/20160331093148_create_disco_app_plan_codes.rb
+- db/migrate/20160401044420_add_status_to_plan_codes.rb
+- db/migrate/20160401045551_add_amount_and_plan_code_to_disco_app_subscriptions.rb
 - lib/disco_app.rb
 - lib/disco_app/configuration.rb
 - lib/disco_app/engine.rb
@@ -414,7 +438,9 @@ files:
 - lib/tasks/start.rake
 - lib/tasks/webhooks.rake
 - test/controllers/disco_app/admin/shops_controller_test.rb
+- test/controllers/disco_app/charges_controller_test.rb
 - test/controllers/disco_app/install_controller_test.rb
+- test/controllers/disco_app/subscriptions_controller_test.rb
 - test/controllers/disco_app/webhooks_controller_test.rb
 - test/controllers/home_controller_test.rb
 - test/controllers/proxy_controller_test.rb
@@ -427,6 +453,7 @@ files:
 - test/dummy/app/controllers/home_controller.rb
 - test/dummy/app/controllers/proxy_controller.rb
 - test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/jobs/disco_app/app_installed_job.rb
 - test/dummy/app/jobs/disco_app/app_uninstalled_job.rb
 - test/dummy/app/jobs/products_create_job.rb
 - test/dummy/app/jobs/products_delete_job.rb
@@ -468,9 +495,28 @@ files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
+- test/fixtures/api/widget_store/charges/activate_application_charge_request.json
+- test/fixtures/api/widget_store/charges/activate_application_charge_response.json
+- test/fixtures/api/widget_store/charges/activate_recurring_application_charge_request.json
+- test/fixtures/api/widget_store/charges/activate_recurring_application_charge_response.json
+- test/fixtures/api/widget_store/charges/create_application_charge_request.json
+- test/fixtures/api/widget_store/charges/create_application_charge_response.json
+- test/fixtures/api/widget_store/charges/create_recurring_application_charge_request.json
+- test/fixtures/api/widget_store/charges/create_recurring_application_charge_response.json
+- test/fixtures/api/widget_store/charges/create_second_recurring_application_charge_request.json
+- test/fixtures/api/widget_store/charges/create_second_recurring_application_charge_response.json
+- test/fixtures/api/widget_store/charges/get_accepted_application_charge_response.json
+- test/fixtures/api/widget_store/charges/get_accepted_recurring_application_charge_response.json
+- test/fixtures/api/widget_store/charges/get_declined_application_charge_response.json
+- test/fixtures/api/widget_store/charges/get_declined_recurring_application_charge_response.json
+- test/fixtures/api/widget_store/charges/get_pending_application_charge_response.json
+- test/fixtures/api/widget_store/charges/get_pending_recurring_application_charge_response.json
 - test/fixtures/api/widget_store/shop.json
 - test/fixtures/api/widget_store/webhooks.json
+- test/fixtures/disco_app/application_charges.yml
+- test/fixtures/disco_app/plan_codes.yml
 - test/fixtures/disco_app/plans.yml
+- test/fixtures/disco_app/recurring_application_charges.yml
 - test/fixtures/disco_app/shops.yml
 - test/fixtures/disco_app/subscriptions.yml
 - test/fixtures/products.yml
@@ -484,9 +530,10 @@ files:
 - test/models/disco_app/plan_test.rb
 - test/models/disco_app/session_test.rb
 - test/models/disco_app/shop_test.rb
-- test/models/disco_app/subscription_test.rb
+- test/services/disco_app/charges_service_test.rb
 - test/services/disco_app/subscription_service_test.rb
 - test/support/test_file_fixtures.rb
+- test/support/test_shopify_api.rb
 - test/test_helper.rb
 homepage: https://github.com/discolabs/disco_app/
 licenses:
@@ -527,6 +574,7 @@ test_files:
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/jobs/products_create_job.rb
 - test/dummy/app/jobs/products_update_job.rb
+- test/dummy/app/jobs/disco_app/app_installed_job.rb
 - test/dummy/app/jobs/disco_app/app_uninstalled_job.rb
 - test/dummy/app/jobs/products_delete_job.rb
 - test/dummy/app/controllers/home_controller.rb
@@ -563,16 +611,36 @@ test_files:
 - test/dummy/config/database.yml
 - test/dummy/config/application.rb
 - test/fixtures/api/widget_store/webhooks.json
+- test/fixtures/api/widget_store/charges/create_application_charge_response.json
+- test/fixtures/api/widget_store/charges/create_second_recurring_application_charge_response.json
+- test/fixtures/api/widget_store/charges/activate_application_charge_response.json
+- test/fixtures/api/widget_store/charges/create_application_charge_request.json
+- test/fixtures/api/widget_store/charges/create_recurring_application_charge_response.json
+- test/fixtures/api/widget_store/charges/get_pending_recurring_application_charge_response.json
+- test/fixtures/api/widget_store/charges/get_declined_recurring_application_charge_response.json
+- test/fixtures/api/widget_store/charges/get_pending_application_charge_response.json
+- test/fixtures/api/widget_store/charges/activate_recurring_application_charge_response.json
+- test/fixtures/api/widget_store/charges/get_accepted_recurring_application_charge_response.json
+- test/fixtures/api/widget_store/charges/activate_recurring_application_charge_request.json
+- test/fixtures/api/widget_store/charges/get_accepted_application_charge_response.json
+- test/fixtures/api/widget_store/charges/create_recurring_application_charge_request.json
+- test/fixtures/api/widget_store/charges/get_declined_application_charge_response.json
+- test/fixtures/api/widget_store/charges/create_second_recurring_application_charge_request.json
+- test/fixtures/api/widget_store/charges/activate_application_charge_request.json
 - test/fixtures/api/widget_store/shop.json
+- test/fixtures/disco_app/plan_codes.yml
 - test/fixtures/disco_app/shops.yml
+- test/fixtures/disco_app/application_charges.yml
 - test/fixtures/disco_app/subscriptions.yml
 - test/fixtures/disco_app/plans.yml
+- test/fixtures/disco_app/recurring_application_charges.yml
 - test/fixtures/webhooks/app_uninstalled.json
 - test/fixtures/webhooks/product_updated.json
 - test/fixtures/webhooks/product_created.json
 - test/fixtures/webhooks/product_deleted.json
 - test/fixtures/products.yml
 - test/support/test_file_fixtures.rb
+- test/support/test_shopify_api.rb
 - test/test_helper.rb
 - test/disco_app_test.rb
 - test/jobs/disco_app/app_uninstalled_job_test.rb
@@ -580,11 +648,13 @@ test_files:
 - test/controllers/disco_app/install_controller_test.rb
 - test/controllers/disco_app/webhooks_controller_test.rb
 - test/controllers/disco_app/admin/shops_controller_test.rb
+- test/controllers/disco_app/subscriptions_controller_test.rb
+- test/controllers/disco_app/charges_controller_test.rb
 - test/controllers/proxy_controller_test.rb
 - test/controllers/home_controller_test.rb
 - test/integration/synchronises_test.rb
 - test/models/disco_app/plan_test.rb
 - test/models/disco_app/shop_test.rb
 - test/models/disco_app/session_test.rb
-- test/models/disco_app/subscription_test.rb
+- test/services/disco_app/charges_service_test.rb
 - test/services/disco_app/subscription_service_test.rb

data/test/models/disco_app/subscription_test.rb

@@ -1,6 +0,0 @@
-require 'test_helper'
-
-class DiscoApp::SubscriptionTest < ActiveSupport::TestCase
-
-end
-