Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Properly setup test apps for non views gems

Damian Legawiecdb56b241d8cb
diff --git a/admin/Gemfile b/admin/Gemfile
index 1dc0e76e77..37f9657eb7 100644
--- a/admin/Gemfile
+++ b/admin/Gemfile
@@ -4,6 +4,8 @@ gem 'spree_core', path: '../core'
gem 'spree_api', path: '../api'
gem 'spree_emails', path: '../emails'
+gem 'sprockets-rails', '>= 3.5.2'
+
group :test, :development do
gem 'selenium-webdriver'
end
diff --git a/common_spree_dependencies.rb b/common_spree_dependencies.rb
index 7515ed2de7..9892d7f7c9 100644
--- a/common_spree_dependencies.rb
+++ b/common_spree_dependencies.rb
@@ -17,8 +17,6 @@ platforms :ruby do
gem 'sqlite3', '>= 2.0'
end
-gem 'sprockets-rails', '>= 3.5.2'
-
group :test do
gem 'capybara'
gem 'capybara-screenshot'
diff --git a/core/lib/generators/spree/dummy/dummy_generator.rb b/core/lib/generators/spree/dummy/dummy_generator.rb
index 7e41d50c24..c2f353ccb3 100644
--- a/core/lib/generators/spree/dummy/dummy_generator.rb
+++ b/core/lib/generators/spree/dummy/dummy_generator.rb
@@ -10,6 +10,7 @@ module Spree
class_option :lib_name, default: ''
class_option :database, default: ''
+ class_option :api, type: :boolean, default: false
def self.source_paths
paths = superclass.source_paths
@@ -21,34 +22,35 @@ module Spree
remove_directory_if_exists(dummy_path)
end
- PASSTHROUGH_OPTIONS = [
- :skip_active_record, :skip_javascript, :database, :javascript, :quiet, :pretend, :force, :skip
- ]
-
def generate_test_dummy
- # calling slice on a Thor::CoreExtensions::HashWithIndifferentAccess
- # object has been known to return nil
- opts = {}.merge(options).slice(*PASSTHROUGH_OPTIONS)
- opts[:database] = 'sqlite3' if opts[:database].blank?
- opts[:force] = true
- opts[:skip_bundle] = true
- opts[:skip_git] = true
- opts[:skip_listen] = true
- opts[:skip_rc] = true
- opts[:skip_spring] = true
- opts[:skip_test] = true
- opts[:skip_bootsnap] = true
- opts[:skip_docker] = true
- opts[:skip_rubocop] = true
- opts[:skip_brakeman] = true
- opts[:skip_ci] = true
- opts[:skip_kamal] = true
- opts[:skip_devcontainer] = true
- opts[:skip_solid] = true
-
puts 'Generating dummy Rails application...'
- invoke Rails::Generators::AppGenerator,
- [File.expand_path(dummy_path, destination_root)], opts
+
+ args = [File.expand_path(dummy_path, destination_root)]
+
+ # Database
+ args << "--database=#{options[:database].presence || 'sqlite3'}"
+
+ # Skip options
+ args << '--force'
+ args << '--skip-bundle'
+ args << '--skip-git'
+ args << '--skip-keeps'
+ args << '--skip-rc'
+ args << '--skip-spring'
+ args << '--skip-test'
+ args << '--skip-bootsnap'
+ args << '--skip-docker'
+ args << '--skip-rubocop'
+ args << '--skip-brakeman'
+ args << '--skip-ci'
+ args << '--skip-kamal'
+ args << '--skip-devcontainer'
+ args << '--skip-solid'
+
+ # API mode (implies skip-asset-pipeline, skip-javascript, skip-hotwire)
+ args << '--api' if options[:api]
+
+ Rails::Generators.invoke('app', args)
inject_yaml_permitted_classes
end
@@ -62,7 +64,7 @@ module Spree
template 'rails/routes.rb', "#{dummy_path}/config/routes.rb", force: true
template 'rails/test.rb', "#{dummy_path}/config/environments/test.rb", force: true
template 'initializers/devise.rb', "#{dummy_path}/config/initializers/devise.rb", force: true
- template "app/assets/config/manifest.js", "#{dummy_path}/app/assets/config/manifest.js", force: true
+ template "app/assets/config/manifest.js", "#{dummy_path}/app/assets/config/manifest.js", force: true unless options[:api]
end
def test_dummy_inject_extension_requirements
diff --git a/core/lib/spree/testing_support/common_rake.rb b/core/lib/spree/testing_support/common_rake.rb
index cc8f5c1b57..9e9cde0f83 100644
--- a/core/lib/spree/testing_support/common_rake.rb
+++ b/core/lib/spree/testing_support/common_rake.rb
@@ -19,12 +19,15 @@ namespace :common do
ENV['RAILS_ENV'] = 'test'
Rails.env = 'test'
- skip_javascript = ['spree/api', 'spree/core', 'spree/sample', 'spree/emails'].include?(ENV['LIB_NAME'])
+ api_only = ['spree/api', 'spree/core', 'spree/sample'].include?(ENV['LIB_NAME'])
+ skip_javascript = api_only || ENV['LIB_NAME'] == 'spree/emails'
dummy_app_args = [
"--lib_name=#{ENV['LIB_NAME']}"
]
- if skip_javascript
+ if api_only
+ dummy_app_args << '--api'
+ elsif skip_javascript
dummy_app_args << '--skip_javascript'
end
Spree::DummyGenerator.start dummy_app_args
diff --git a/core/spec/lib/spree/core/controller_helpers/auth_spec.rb b/core/spec/lib/spree/core/controller_helpers/auth_spec.rb
index 5e900064a9..8a49af583a 100644
--- a/core/spec/lib/spree/core/controller_helpers/auth_spec.rb
+++ b/core/spec/lib/spree/core/controller_helpers/auth_spec.rb
@@ -2,6 +2,7 @@ require 'spec_helper'
require 'spree/testing_support/url_helpers'
class FakesController < ApplicationController
+ include ActionController::Cookies
include Spree::Core::ControllerHelpers::Auth
def index
render plain: 'index'
diff --git a/core/spec/lib/spree/core/controller_helpers/order_spec.rb b/core/spec/lib/spree/core/controller_helpers/order_spec.rb
index d7d517a0c5..4dec3ffd7d 100644
--- a/core/spec/lib/spree/core/controller_helpers/order_spec.rb
+++ b/core/spec/lib/spree/core/controller_helpers/order_spec.rb
@@ -1,6 +1,7 @@
require 'spec_helper'
class FakesController < ApplicationController
+ include ActionController::Cookies
include Spree::Core::ControllerHelpers::Store
include Spree::Core::ControllerHelpers::Order
include Spree::Core::ControllerHelpers::Currency
diff --git a/emails/Gemfile b/emails/Gemfile
index 95dc8177c1..169609b1d3 100644
--- a/emails/Gemfile
+++ b/emails/Gemfile
@@ -2,4 +2,6 @@ eval_gemfile('../common_spree_dependencies.rb')
gem 'spree_core', path: '../core'
+gem 'sprockets-rails', '>= 3.5.2'
+
gemspec
diff --git a/page_builder/Gemfile b/page_builder/Gemfile
index ee68099359..a2b29a61e6 100644
--- a/page_builder/Gemfile
+++ b/page_builder/Gemfile
@@ -6,4 +6,6 @@ gem 'spree_admin', path: '../admin'
gem 'devise'
+gem 'sprockets-rails', '>= 3.5.2'
+
gemspec
diff --git a/storefront/Gemfile b/storefront/Gemfile
index 1bd01d94af..f39df2676d 100644
--- a/storefront/Gemfile
+++ b/storefront/Gemfile
@@ -8,6 +8,7 @@ gem 'spree_page_builder', path: '../page_builder'
gem 'devise'
gem 'canonical-rails', github: 'commonlit/canonical-rails', branch: "bump-rails-8-1" # temporary fix for Rails 8.1 compatibility
+gem 'sprockets-rails', '>= 3.5.2'
group :test, :development do
gem 'selenium-webdriver'