Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI only testing with the paperclip adapter #4905

Merged
merged 1 commit into from
Feb 7, 2023
Merged

Fix CI only testing with the paperclip adapter #4905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/lib/spree/testing_support/dummy_app.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class Application < ::Rails::Application
config.active_record.dump_schema_after_migration = false

# Configure active storage to use storage within tmp folder
unless ENV['DISABLE_ACTIVE_STORAGE']
unless (ENV['DISABLE_ACTIVE_STORAGE'] == 'true')
initializer 'solidus.active_storage' do
config.active_storage.service_configurations = {
test: {
Expand Down Expand Up @@ -140,7 +140,7 @@ class Application < ::Rails::Application
Spree.config do |config|
config.use_legacy_events = (ENV['USE_LEGACY_EVENTS'] == 'true')

if ENV['DISABLE_ACTIVE_STORAGE']
if (ENV['DISABLE_ACTIVE_STORAGE'] == 'true')
config.image_attachment_module = 'Spree::Image::PaperclipAttachment'
config.taxon_attachment_module = 'Spree::Taxon::PaperclipAttachment'
end
Expand Down
2 changes: 1 addition & 1 deletion core/spec/models/spree/concerns/active_storage_adapter/attachment_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

require 'rails_helper'

unless ENV['DISABLE_ACTIVE_STORAGE']
unless (ENV['DISABLE_ACTIVE_STORAGE'] == 'true')
RSpec.describe Spree::ActiveStorageAdapter::Attachment do
describe '#variant' do
it "converts to resize_to_limit when definition doesn't contain any special symbol" do
Expand Down
2 changes: 1 addition & 1 deletion core/spec/rails_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
config.use_transactional_fixtures = true

config.before :suite do
FileUtils.rm_rf(Rails.configuration.active_storage.service_configurations[:test][:root]) unless ENV['DISABLE_ACTIVE_STORAGE']
FileUtils.rm_rf(Rails.configuration.active_storage.service_configurations[:test][:root]) unless (ENV['DISABLE_ACTIVE_STORAGE'] == 'true')
DatabaseCleaner.clean_with :truncation
end

Expand Down