Kouhei Sutou 2018-11-19 10:36:23 +0900 (Mon, 19 Nov 2018) Revision: 6e1b24f37a282f817dbadaac2e587240770ef73f https://github.com/ranguba/groonga-client-model/commit/6e1b24f37a282f817dbadaac2e587240770ef73f Message: test: disable Active Record related codes Modified files: test/apps/rails4/Gemfile.lock test/apps/rails4/config/application.rb test/apps/rails5.0/config/initializers/new_framework_defaults.rb test/run-test.rb Modified: test/apps/rails4/Gemfile.lock (+1 -1) =================================================================== --- test/apps/rails4/Gemfile.lock 2018-11-19 10:29:35 +0900 (a57cbcf) +++ test/apps/rails4/Gemfile.lock 2018-11-19 10:36:23 +0900 (ec42504) @@ -188,7 +188,7 @@ DEPENDENCIES groonga-client-model! jbuilder (~> 2.0) jquery-rails - rails (= 4.2.10) + rails (< 5) sass-rails (~> 5.0) sdoc (~> 0.4.0) spring Modified: test/apps/rails4/config/application.rb (+1 -1) =================================================================== --- test/apps/rails4/config/application.rb 2018-11-19 10:29:35 +0900 (caf8a23) +++ test/apps/rails4/config/application.rb 2018-11-19 10:36:23 +0900 (fde875a) @@ -30,6 +30,6 @@ module Blog # config.i18n.default_locale = :de # Do not swallow errors in after_commit/after_rollback callbacks. - config.active_record.raise_in_transactional_callbacks = true + # config.active_record.raise_in_transactional_callbacks = true end end Modified: test/apps/rails5.0/config/initializers/new_framework_defaults.rb (+1 -1) =================================================================== --- test/apps/rails5.0/config/initializers/new_framework_defaults.rb 2018-11-19 10:29:35 +0900 (cbf423a) +++ test/apps/rails5.0/config/initializers/new_framework_defaults.rb 2018-11-19 10:36:23 +0900 (406af18) @@ -19,7 +19,7 @@ Rails.application.config.action_controller.forgery_protection_origin_check = fal ActiveSupport.to_time_preserves_timezone = false # Require `belongs_to` associations by default. Previous versions had false. -Rails.application.config.active_record.belongs_to_required_by_default = false +# Rails.application.config.active_record.belongs_to_required_by_default = false # Do not halt callback chains when a callback returns false. Previous versions had true. ActiveSupport.halt_callback_chains_on_return_false = true Modified: test/run-test.rb (+6 -2) =================================================================== --- test/run-test.rb 2018-11-19 10:29:35 +0900 (1d4965a) +++ test/run-test.rb 2018-11-19 10:36:23 +0900 (5df3534) @@ -32,9 +32,13 @@ Dir.glob("#{__dir__}/apps/*") do |test_application| "bundle", "exec", RbConfig.ruby, - "bin/rails", - "test", ] + if test_application.end_with?("rails4") + command_line << "bin/rake" + else + command_line << "bin/rails" + end + command_line << "test" unless ARGV.empty? command_line << "TESTOPTS=#{ARGV.join(' ')}" end -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20181119/74c71b81/attachment-0001.html>