diff --git a/core/lib/generators/spree/dummy/dummy_generator.rb b/core/lib/generators/spree/dummy/dummy_generator.rb index 9a12652c1df..a2c6024e653 100644 --- a/core/lib/generators/spree/dummy/dummy_generator.rb +++ b/core/lib/generators/spree/dummy/dummy_generator.rb @@ -46,7 +46,7 @@ def generate_test_dummy opts[:skip_javascript] = true opts[:skip_action_cable] = true - puts "Generating dummy Rails application..." + say "Generating dummy Rails application..." invoke Rails::Generators::AppGenerator, [File.expand_path(dummy_path, destination_root)], opts end diff --git a/core/lib/spree/testing_support/common_rake.rb b/core/lib/spree/testing_support/common_rake.rb index 442cfda8b14..ca823bb2d31 100644 --- a/core/lib/spree/testing_support/common_rake.rb +++ b/core/lib/spree/testing_support/common_rake.rb @@ -6,6 +6,7 @@ class CommonRakeTasks include Rake::DSL def initialize + Rails.logger ||= Logger.new($stdout) namespace :common do task :test_app, :user_class do |_t, args| args.with_defaults(user_class: "Spree::LegacyUser") @@ -45,19 +46,19 @@ def initialize sh "bin/rails g solidus_frontend:install --auto-accept" end - puts "Setting up dummy database..." + Rails.logger.info "Setting up dummy database..." sh "bin/rails db:environment:set RAILS_ENV=test" sh "bin/rails db:drop db:create db:migrate VERBOSE=false RAILS_ENV=test" if extension_installation_generator_exists? - puts 'Running extension installation generator...' + Rails.logger.info 'Running extension installation generator...' sh "bin/rails generate #{rake_generator_namespace}:install --auto-run-migrations" end end task :seed do |_t, _args| - puts "Seeding ..." + Rails.logger.info "Seeding ..." sh "bundle exec rake db:seed RAILS_ENV=test" end diff --git a/core/lib/spree/testing_support/dummy_app.rb b/core/lib/spree/testing_support/dummy_app.rb index 7e2e7707f20..459d357b946 100644 --- a/core/lib/spree/testing_support/dummy_app.rb +++ b/core/lib/spree/testing_support/dummy_app.rb @@ -10,6 +10,7 @@ require 'active_storage/engine' Rails.env = 'test' +Rails.logger ||= Logger.new($stdout) require 'solidus_core' diff --git a/core/lib/spree/testing_support/dummy_app/migrations.rb b/core/lib/spree/testing_support/dummy_app/migrations.rb index 2a0a504ab1c..7a1e3887851 100644 --- a/core/lib/spree/testing_support/dummy_app/migrations.rb +++ b/core/lib/spree/testing_support/dummy_app/migrations.rb @@ -6,7 +6,7 @@ module Migrations def auto_migrate if needs_migration? - puts "Configuration changed. Re-running migrations" + Rails.logger.info "Configuration changed. Re-running migrations" # Disconnect to avoid "database is being accessed by other users" on postgres ActiveRecord::Base.remove_connection @@ -29,7 +29,7 @@ def needs_migration? end def sh(cmd) - puts cmd + Rails.logger.info cmd system cmd end end diff --git a/core/lib/spree/testing_support/translations.rb b/core/lib/spree/testing_support/translations.rb index 77e7c7824ed..20c382ec7c3 100644 --- a/core/lib/spree/testing_support/translations.rb +++ b/core/lib/spree/testing_support/translations.rb @@ -6,8 +6,8 @@ module Translations def check_missing_translations(page, example) missing_translations = page.body.scan(/translation missing: #{I18n.locale}\.(.*?)[\s<\"&]/) if missing_translations.any? - puts "Found missing translations: #{missing_translations.inspect}" - puts "In spec: #{example.location}" + Rails.logger.info "Found missing translations: #{missing_translations.inspect}" + Rails.logger.info "In spec: #{example.location}" end end end diff --git a/promotions/lib/generators/solidus_promotions/install/install_generator.rb b/promotions/lib/generators/solidus_promotions/install/install_generator.rb index d1365879428..fdc58d187b2 100644 --- a/promotions/lib/generators/solidus_promotions/install/install_generator.rb +++ b/promotions/lib/generators/solidus_promotions/install/install_generator.rb @@ -41,7 +41,7 @@ def run_migrations if run_migrations run "bin/rails db:migrate" else - puts "Skipping bin/rails db:migrate, don't forget to run it!" + Rails.logger.info "Skipping bin/rails db:migrate, don't forget to run it!" end end diff --git a/promotions/lib/solidus_promotions/promotion_migrator.rb b/promotions/lib/solidus_promotions/promotion_migrator.rb index 2cc7ecdf6f9..babdc6804ba 100644 --- a/promotions/lib/solidus_promotions/promotion_migrator.rb +++ b/promotions/lib/solidus_promotions/promotion_migrator.rb @@ -78,7 +78,7 @@ def copy_promotion(old_promotion) def generate_new_benefits(old_promotion_action) promo_action_config = promotion_map[:actions][old_promotion_action.class] if promo_action_config.nil? - puts("#{old_promotion_action.class} is not supported") + Rails.logger.info("#{old_promotion_action.class} is not supported") return nil end promo_action_config.call(old_promotion_action) @@ -87,7 +87,7 @@ def generate_new_benefits(old_promotion_action) def generate_new_promotion_conditions(old_promotion_rule) new_promo_condition_class = promotion_map[:conditions][old_promotion_rule.class] if new_promo_condition_class.nil? - puts("#{old_promotion_rule.class} is not supported") + Rails.logger.info("#{old_promotion_rule.class} is not supported") [] elsif new_promo_condition_class.respond_to?(:call) new_promo_condition_class.call(old_promotion_rule)