diff --git a/app/controllers/admin/subscriptions_controller.rb b/app/controllers/admin/subscriptions_controller.rb index be781ee..0ee948d 100644 --- a/app/controllers/admin/subscriptions_controller.rb +++ b/app/controllers/admin/subscriptions_controller.rb @@ -1,14 +1,16 @@ # frozen_string_literal: true module DiscoursePatrons - class SubscriptionsController < ::Admin::AdminController - include DiscoursePatrons::Stripe + module Admin + class SubscriptionsController < ::Admin::AdminController + include DiscoursePatrons::Stripe - before_action :set_api_key + before_action :set_api_key - def index - subscriptions = ::Stripe::Subscription.list - subscriptions.to_json + def index + subscriptions = ::Stripe::Subscription.list + subscriptions.to_json + end end end end diff --git a/config/routes.rb b/config/routes.rb index 95452ce..c2b1f90 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,14 +1,14 @@ # frozen_string_literal: true DiscoursePatrons::Engine.routes.draw do + # TODO: namespace this scope 'admin' do get '/' => 'admin#index' - - resources :subscriptions, only: [:index] end namespace :admin do resources :plans + resources :subscriptions, only: [:index] end get '/' => 'patrons#index' diff --git a/spec/requests/admin/subscriptions_controller_spec.rb b/spec/requests/admin/subscriptions_controller_spec.rb new file mode 100644 index 0000000..640d4eb --- /dev/null +++ b/spec/requests/admin/subscriptions_controller_spec.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true + +require 'rails_helper' + +module DiscoursePatrons + module Admin + RSpec.describe SubscriptionsController do + + let(:admin) { Fabricate(:admin) } + + before { sign_in(admin) } + + it 'is a subclass of AdminController' do + expect(DiscoursePatrons::Admin::SubscriptionsController < ::Admin::AdminController).to eq(true) + end + + it "gets the empty subscriptions" do + ::Stripe::Subscription.expects(:list) + get "/patrons/admin/subscriptions.json" + expect(response.status).to eq(204) + end + end + end +end diff --git a/spec/requests/subscriptions_controller_spec.rb b/spec/requests/subscriptions_controller_spec.rb deleted file mode 100644 index 07e4948..0000000 --- a/spec/requests/subscriptions_controller_spec.rb +++ /dev/null @@ -1,22 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -module DiscoursePatrons - RSpec.describe SubscriptionsController do - - let(:admin) { Fabricate(:admin) } - - before { sign_in(admin) } - - it 'is a subclass of AdminController' do - expect(DiscoursePatrons::SubscriptionsController < ::Admin::AdminController).to eq(true) - end - - it "gets the empty subscriptions" do - ::Stripe::Subscription.expects(:list) - get "/patrons/admin/subscriptions.json" - expect(response.status).to eq(204) - end - end -end diff --git a/test/javascripts/helpers/discourse-patrons-pretender.js.es6 b/test/javascripts/helpers/discourse-patrons-pretender.js.es6 index b210c71..4339bcc 100644 --- a/test/javascripts/helpers/discourse-patrons-pretender.js.es6 +++ b/test/javascripts/helpers/discourse-patrons-pretender.js.es6 @@ -1,4 +1,3 @@ - export default function(helpers) { const { response } = helpers; diff --git a/test/javascripts/helpers/stripe.js.es6 b/test/javascripts/helpers/stripe.js.es6 index b202e8e..bb85450 100644 --- a/test/javascripts/helpers/stripe.js.es6 +++ b/test/javascripts/helpers/stripe.js.es6 @@ -1,4 +1,3 @@ - export function stubStripe() { window.Stripe = () => { return {