Merge pull request #350 from solidusio/kennyadsl/align-with-testing-guide

Cleanup test files copied over the host application

Author: kennyadsl

template.rb

@@ -117,13 +117,25 @@
     if defined?(FactoryBotRails)
       initializer after: "factory_bot.set_factory_paths" do
         require 'spree/testing_support/factory_bot'
-        FactoryBot.definition_file_paths = [
-          *Spree::TestingSupport::FactoryBot.definition_file_paths,
-          Rails.root.join('spec/fixtures/factories'),
+
+        # The paths for Solidus' core factories.
+        solidus_paths = Spree::TestingSupport::FactoryBot.definition_file_paths
+
+        # Optional: Any factories you want to require from extensions.
+        extension_paths = [
+          # MySolidusExtension::Engine.root.join("lib/my_solidus_extension/testing_support/factories"),
+          # or individually:
+          # MySolidusExtension::Engine.root.join("lib/my_solidus_extension/testing_support/factories/resource.rb"),
+        ]
+
+        # Your application's own factories.
+        app_paths = [
+          Rails.root.join('spec/factories'),
         ]
+
+        FactoryBot.definition_file_paths = solidus_paths + extension_paths + app_paths
       end
     end
-
   RUBY
 
   directory 'spec', verbose: false

templates/spec/solidus_starter_frontend_spec_helper.rb

@@ -85,6 +85,7 @@ module SolidusStarterFrontend; end
 
     example.run
 
+    Rails.cache.clear
     ActionController::Base.cache_store = original_cache_store
   end
 end

templates/spec/support/solidus_starter_frontend/capybara.rb

@@ -8,15 +8,6 @@
 
 Capybara.default_max_wait_time = 10
 
-# Fix a selenium deprecation warning.
-# Ref: https://github.com/rails/rails/pull/47117
-require 'action_dispatch/system_testing/driver'
-ActionDispatch::SystemTesting::Driver.class_eval do
-  def browser_options
-    @options.merge(options: @browser.options).compact
-  end
-end
-
 RSpec.configure do |config|
   config.before(:each, type: :system) do
     driven_by((ENV['CAPYBARA_DRIVER'] || :rack_test).to_sym)

templates/spec/support/solidus_starter_frontend/features/fill_addresses_fields.rb

@@ -1,8 +1,4 @@
 RSpec.configure do |config|
-  config.when_first_matching_example_defined(type: :feature) do
-    config.before(:suite) { Rails.application.precompiled_assets }
-  end
-
   config.when_first_matching_example_defined(type: :system) do
     config.before(:suite) { Rails.application.precompiled_assets }
   end

templates/spec/support/solidus_starter_frontend/solidus.rb

@@ -0,0 +1,58 @@
+module SolidusStarterFrontend
+  module System
+    module CheckoutHelpers
+      #
+      # Authentication
+      #
+      def checkout_as_guest
+        click_button "Checkout"
+
+        within '#guest_checkout' do
+          fill_in 'Email', with: 'test@example.com'
+        end
+
+        click_on 'Continue'
+      end
+
+      #
+      # Address
+      #
+      def fill_addresses_fields_with(address)
+        fields = %w[
+          address1
+          city
+          zipcode
+          phone
+        ]
+        fields += if SolidusSupport.combined_first_and_last_name_in_address?
+          %w[name]
+        else
+          %w[firstname lastname]
+        end
+
+        fields.each do |field|
+          fill_in "order_bill_address_attributes_#{field}", with: address.send(field).to_s
+        end
+        select 'United States', from: "order_bill_address_attributes_country_id"
+        select address.state.name.to_s, from: "order_bill_address_attributes_state_id"
+
+        check 'order_use_billing'
+      end
+
+      #
+      # Payment
+      #
+      def find_existing_payment_radio(wallet_source_id)
+        find("[name='order[wallet_payment_source_id]'][value='#{wallet_source_id}']")
+      end
+
+      def find_payment_radio(payment_method_id)
+        find("[name='order[payments_attributes][][payment_method_id]'][value='#{payment_method_id}']")
+      end
+
+      def find_payment_fieldset(payment_method_id)
+        find("fieldset[name='payment-method-#{payment_method_id}']")
+      end
+    end
+  end
+end

…idus_starter_frontend/features/assets.rb …olidus_starter_frontend/system/assets.rbtemplates/spec/support/solidus_starter_frontend/features/assets.rb renamed to templates/spec/support/solidus_starter_frontend/system/assets.rb templates/spec/support/solidus_starter_frontend/features/assets.rb renamed to templates/spec/support/solidus_starter_frontend/system/assets.rb

@@ -3,7 +3,7 @@
 require 'solidus_starter_frontend_spec_helper'
 
 RSpec.describe 'Address', type: :system, inaccessible: true do
-  include  SolidusStarterFrontend::SystemHelpers
+  include  SolidusStarterFrontend::System::CheckoutHelpers
 
   let!(:product) { create(:product, name: "RoR Mug") }
   let!(:order) { create(:order_with_totals, state: 'cart') }

templates/spec/support/solidus_starter_frontend/system/checkout_helpers.rb

@@ -3,6 +3,8 @@
 require 'solidus_starter_frontend_spec_helper'
 
 RSpec.feature 'Checkout', :js, type: :system do
+  include  SolidusStarterFrontend::System::CheckoutHelpers
+
   given!(:store) { create(:store) }
   given!(:country) { create(:country, name: 'United States', states_required: true) }
   given!(:state)   { create(:state, name: 'Maryland', country: country) }