diff options
| -rw-r--r-- | actioncable/test/client_test.rb | 1 | ||||
| -rw-r--r-- | guides/bug_report_templates/generic_master.rb | 3 | ||||
| -rw-r--r-- | guides/source/active_record_basics.md | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/actioncable/test/client_test.rb b/actioncable/test/client_test.rb index d7eecfa322..3c79d61569 100644 --- a/actioncable/test/client_test.rb +++ b/actioncable/test/client_test.rb @@ -32,6 +32,7 @@ class ClientTest < ActionCable::TestCase server.config.channel_load_paths = [File.expand_path('client', __dir__)] Thread.new { EventMachine.run } unless EventMachine.reactor_running? + Thread.pass until EventMachine.reactor_running? # faye-websocket is warning-rich @previous_verbose, $VERBOSE = $VERBOSE, nil diff --git a/guides/bug_report_templates/generic_master.rb b/guides/bug_report_templates/generic_master.rb index 0a8048cc48..fcc90fa503 100644 --- a/guides/bug_report_templates/generic_master.rb +++ b/guides/bug_report_templates/generic_master.rb @@ -19,9 +19,6 @@ require 'active_support' require 'active_support/core_ext/object/blank' require 'minitest/autorun' -# Ensure backward compatibility with Minitest 4 -Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test) - class BugTest < Minitest::Test def test_stuff assert "zomg".present? diff --git a/guides/source/active_record_basics.md b/guides/source/active_record_basics.md index 061ad975fc..0932cc4829 100644 --- a/guides/source/active_record_basics.md +++ b/guides/source/active_record_basics.md @@ -474,6 +474,6 @@ end ``` That's all there is to it! When configuring your database via the -`config/database.yml` file, or connecting manually in your model`, +`config/database.yml` file, or connecting manually in your model, connecting to your database and making changes is easy when using Active Record. |