Merge pull request #281 from paviliondev/improve_subscription_classes…

…_rspec_handling

DEV: Integrate subscription gem classes in rspec suite

.rubocop.yml

@@ -9,3 +9,6 @@ RSpec/DescribeClass:
 
 Discourse/TimeEqMatcher:
   Enabled: false
+
+Discourse/NoAddReferenceOrAliasesActiveRecordMigration:
+  Enabled: false

plugin.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 # name: discourse-custom-wizard
 # about: Forms for Discourse. Better onboarding, structured posting, data enrichment, automated actions and much more.
-# version: 2.5.2
+# version: 2.5.3
 # authors: Angus McLeod, Faizaan Gagan, Robert Barrow, Keegan George, Kaitlin Maddever, Juan Marcos Gutierrez Ramos
 # url: https://github.com/paviliondev/discourse-custom-wizard
 # contact_emails: [email protected]
 # subscription_url: https://coop.pavilion.tech
 
 gem 'liquid', '5.0.1', require: true
-gem "discourse_subscription_client", "0.1.0.pre15", require_name: "discourse_subscription_client"
+gem "discourse_subscription_client", "0.1.1", require_name: "discourse_subscription_client"
 gem 'discourse_plugin_statistics', '0.1.0.pre7', require: true
 register_asset 'stylesheets/common/admin.scss'
 register_asset 'stylesheets/common/wizard.scss'

spec/components/custom_wizard/action_spec.rb

@@ -42,7 +42,6 @@ def update_template(template)
   }
 
   before do
-    stub_out_subscription_classes
     Group.refresh_automatic_group!(:trust_level_2)
     update_template(wizard_template)
   end

spec/components/custom_wizard/builder_spec.rb

@@ -29,7 +29,6 @@
   }
 
   before do
-    stub_out_subscription_classes
     Group.refresh_automatic_group!(:trust_level_3)
     CustomWizard::Template.save(wizard_template, skip_jobs: true)
     @template = CustomWizard::Template.find('super_mega_fun_wizard')

spec/components/custom_wizard/custom_field_spec.rb

@@ -5,7 +5,6 @@
   let(:custom_field_subscription_json) { get_wizard_fixture("custom_field/subscription_custom_fields") }
 
   before do
-    stub_out_subscription_classes
     CustomWizard::CustomField.invalidate_cache
   end
 

spec/components/custom_wizard/submission_spec.rb

@@ -7,7 +7,6 @@
   let(:guest_id) { CustomWizard::Wizard.generate_guest_id }
 
   before do
-    stub_out_subscription_classes
     CustomWizard::Template.save(template_json, skip_jobs: true)
     @wizard = CustomWizard::Wizard.create(template_json["id"], user)
     described_class.new(@wizard, step_1_field_1: "I am user submission").save

spec/components/custom_wizard/subscription_spec.rb

@@ -14,10 +14,6 @@
   }
 
   context "with subscription client gem mocked out" do
-    before do
-      stub_out_subscription_classes
-    end
-
     context "without a subscription" do
       before do
         DiscourseSubscriptionClient.stubs(:find_subscriptions).returns(nil)
@@ -40,9 +36,9 @@
 
       def get_subscription_result(product_ids)
         result = DiscourseSubscriptionClient::Subscriptions::Result.new
-        result.supplier = SubscriptionClientSupplier.new(product_slugs)
+        result.supplier = SubscriptionClientSupplier.new(products: product_slugs)
         result.resource = SubscriptionClientResource.new
-        result.subscriptions = product_ids.map { |product_id| ::SubscriptionClientSubscription.new(product_id) }
+        result.subscriptions = product_ids.map { |product_id| ::SubscriptionClientSubscription.new(product_id: product_id) }
         result.products = product_slugs
         result
       end

spec/components/custom_wizard/template_spec.rb

@@ -7,7 +7,6 @@
   fab!(:upload) { Fabricate(:upload) }
 
   before do
-    stub_out_subscription_classes
     CustomWizard::Template.save(template_json, skip_jobs: true)
   end
 

spec/components/custom_wizard/template_validator_spec.rb

@@ -39,10 +39,6 @@ def expect_validation_failure(object_id, message)
     expect(validator.errors.first.message).to eq("Liquid syntax error in #{object_id}: #{message}")
   end
 
-  before do
-    stub_out_subscription_classes
-  end
-
   it "validates valid templates" do
     expect(
       CustomWizard::TemplateValidator.new(template).perform

spec/components/custom_wizard/update_validator_spec.rb

@@ -6,7 +6,6 @@
   let(:url_field) { get_wizard_fixture("field/url") }
 
   before do
-    stub_out_subscription_classes
     CustomWizard::Template.save(template, skip_jobs: true)
     @template = CustomWizard::Template.find('super_mega_fun_wizard')
   end

spec/components/custom_wizard/wizard_spec.rb

@@ -10,7 +10,6 @@
   let(:step_json) { get_wizard_fixture("step/step") }
 
   before do
-    stub_out_subscription_classes
     Group.refresh_automatic_group!(:trust_level_3)
     @permitted_template = template_json.dup
     @permitted_template["permitted"] = permitted_json["permitted"]

spec/extensions/custom_field_extensions_spec.rb

@@ -11,7 +11,6 @@
   let(:subscription_custom_field_json) { get_wizard_fixture("custom_field/subscription_custom_fields") }
 
   before do
-    stub_out_subscription_classes
     custom_field_json['custom_fields'].each do |field_json|
       custom_field = CustomWizard::CustomField.new(nil, field_json)
       custom_field.save

spec/extensions/extra_locales_controller_spec.rb

@@ -7,7 +7,6 @@
   let(:permitted) { get_wizard_fixture("wizard/permitted") }
 
   before do
-    stub_out_subscription_classes
     CustomWizard::Template.save(template, skip_jobs: true)
   end
 

spec/extensions/guardian_extension_spec.rb

@@ -33,7 +33,6 @@ def create_topic_by_wizard(wizard)
   end
 
   before do
-    stub_out_subscription_classes
     CustomWizard::Template.save(wizard_template, skip_jobs: true)
     @template = CustomWizard::Template.find('super_mega_fun_wizard')
   end

spec/extensions/invites_controller_spec.rb

@@ -6,7 +6,6 @@
   let(:template) { get_wizard_fixture("wizard") }
 
   before do
-    stub_out_subscription_classes
     @controller = InvitesController.new
   end
 

spec/extensions/users_controller_spec.rb

@@ -4,7 +4,6 @@
   let(:template) { get_wizard_fixture("wizard") }
 
   before do
-    stub_out_subscription_classes
     @controller = UsersController.new
   end
 

spec/plugin_helper.rb

@@ -9,13 +9,11 @@ def get_wizard_fixture(path)
 end
 
 def enable_subscription(type)
-  stub_out_subscription_classes
   CustomWizard::Subscription.stubs("#{type}?".to_sym).returns(true)
   CustomWizard::Subscription.any_instance.stubs("#{type}?".to_sym).returns(true)
 end
 
 def disable_subscriptions
-  stub_out_subscription_classes
   %w[
     standard
     business
@@ -25,12 +23,3 @@ def disable_subscriptions
     CustomWizard::Subscription.any_instance.stubs("#{type}?".to_sym).returns(false)
   end
 end
-
-def unstub_out_subscription_classes
-  Object.send(:remove_const, :DiscourseSubscriptionClient) if Object.constants.include?(:DiscourseSubscriptionClient)
-  Object.send(:remove_const, :SubscriptionClientSubscription) if Object.constants.include?(:SubscriptionClientSubscription)
-end
-
-def stub_out_subscription_classes
-  load File.expand_path("#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/subscription_client.rb", __FILE__)
-end

spec/requests/custom_wizard/admin/api_controller_spec.rb

@@ -5,7 +5,6 @@
   let(:api_json) { get_wizard_fixture("api/api") }
 
   before do
-    stub_out_subscription_classes
     sign_in(admin_user)
   end
 

spec/requests/custom_wizard/admin/custom_fields_controller_spec.rb

@@ -5,7 +5,6 @@
   let(:custom_field_json) { get_wizard_fixture("custom_field/custom_fields") }
 
   before do
-    stub_out_subscription_classes
     custom_field_json['custom_fields'].each do |field_json|
       CustomWizard::CustomField.new(nil, field_json).save
     end

spec/requests/custom_wizard/admin/logs_controller_spec.rb

@@ -5,7 +5,6 @@
   let(:template) { get_wizard_fixture("wizard") }
 
   before do
-    stub_out_subscription_classes
     ["first", "second", "third"].each_with_index do |key, index|
       temp = template.dup
       temp["id"] = "#{key}_test_wizard"

spec/requests/custom_wizard/admin/manager_controller_spec.rb

@@ -5,7 +5,6 @@
   let(:template) { get_wizard_fixture("wizard") }
 
   before do
-    stub_out_subscription_classes
     sign_in(admin_user)
 
     template_2 = template.dup

spec/requests/custom_wizard/admin/subscription_controller_spec.rb

@@ -16,7 +16,6 @@
     context "without a subscription" do
       before do
         disable_subscriptions
-        stub_out_subscription_classes
       end
 
       it "returns the right subscription details" do
@@ -29,7 +28,6 @@
     context "with a subscription" do
       before do
         enable_subscription("standard")
-        stub_out_subscription_classes
       end
 
       it "returns the right subscription details" do

spec/requests/custom_wizard/application_controller_spec.rb

@@ -5,7 +5,6 @@
   let(:wizard_template) { get_wizard_fixture("wizard") }
 
   before do
-    stub_out_subscription_classes
     CustomWizard::Template.save(wizard_template, skip_jobs: true)
     @template = CustomWizard::Template.find('super_mega_fun_wizard')
   end

spec/requests/custom_wizard/custom_field_extensions_spec.rb

@@ -10,7 +10,6 @@
   let(:subscription_custom_field_json) { get_wizard_fixture("custom_field/subscription_custom_fields") }
 
   before do
-    stub_out_subscription_classes
     custom_field_json['custom_fields'].each do |field_json|
       custom_field = CustomWizard::CustomField.new(nil, field_json)
       custom_field.save

spec/requests/custom_wizard/steps_controller_spec.rb

@@ -11,7 +11,6 @@
   let(:guests_permitted) { get_wizard_fixture("wizard/guests_permitted") }
 
   before do
-    stub_out_subscription_classes
     CustomWizard::Template.save(wizard_template, skip_jobs: true)
   end
 

spec/requests/custom_wizard/wizard_controller_spec.rb

@@ -6,7 +6,6 @@
   let(:permitted_json) { get_wizard_fixture("wizard/permitted") }
 
   before do
-    stub_out_subscription_classes
     CustomWizard::Template.save(wizard_template, skip_jobs: true)
     @template = CustomWizard::Template.find("super_mega_fun_wizard")
   end

spec/serializers/custom_wizard/basic_wizard_serializer_spec.rb

@@ -4,10 +4,6 @@
   fab!(:user) { Fabricate(:user) }
   let(:template) { get_wizard_fixture("wizard") }
 
-  before do
-    stub_out_subscription_classes
-  end
-
   it 'should return basic wizard attributes' do
     CustomWizard::Template.save(template, skip_jobs: true)
     json = CustomWizard::BasicWizardSerializer.new(

spec/serializers/custom_wizard/custom_field_serializer_spec.rb

@@ -4,10 +4,6 @@
   fab!(:user) { Fabricate(:user) }
   let(:custom_field_json) { get_wizard_fixture("custom_field/custom_fields") }
 
-  before do
-    stub_out_subscription_classes
-  end
-
   it 'should return custom field attributes' do
     custom_field_json['custom_fields'].each do |field_json|
       CustomWizard::CustomField.new(nil, field_json).save

spec/serializers/custom_wizard/submission_serializer_spec.rb

@@ -13,7 +13,6 @@
   }
 
   before do
-    stub_out_subscription_classes
     CustomWizard::Template.save(template_json, skip_jobs: true)
 
     wizard = CustomWizard::Wizard.create(template_json["id"], user1)

spec/serializers/custom_wizard/wizard_field_serializer_spec.rb

@@ -5,7 +5,6 @@
   let(:template) { get_wizard_fixture("wizard") }
 
   before do
-    stub_out_subscription_classes
     CustomWizard::Template.save(template, skip_jobs: true)
     @wizard = CustomWizard::Builder.new("super_mega_fun_wizard", user).build
   end

spec/serializers/custom_wizard/wizard_serializer_spec.rb

@@ -8,7 +8,6 @@
   let(:advanced_fields) { get_wizard_fixture("field/advanced_types") }
 
   before do
-    stub_out_subscription_classes
     CustomWizard::Template.save(template, skip_jobs: true)
     @template = CustomWizard::Template.find('super_mega_fun_wizard')
   end

spec/serializers/custom_wizard/wizard_step_serializer_spec.rb

@@ -6,7 +6,6 @@
   let(:required_data_json) { get_wizard_fixture("step/required_data") }
 
   before do
-    stub_out_subscription_classes
     CustomWizard::Template.save(wizard_template, skip_jobs: true)
     @wizard = CustomWizard::Builder.new("super_mega_fun_wizard", user).build
   end