From 0d72489b2a08487f71dd4230846c01a5d99ef35f Mon Sep 17 00:00:00 2001
From: Kasper Timm Hansen <kaspth@gmail.com>
Date: Sun, 25 Jun 2017 19:08:26 +0200
Subject: * Don't eagerly require Rails' minitest plugin.

By making the Rails minitest behave like a standard minitest plugin
we're much more likely to not break when people use other minitest
plugins. Like minitest-focus and pride.

To do this, we need to behave like minitest: require files up front
and then perform the plugin behavior via the at_exit hook.
This also saves us a fair bit of wrangling with test file loading.

Finally, since the environment and warnings options have to be applied
as early as possible, and since minitest loads plugins at_exit, they
have to be moved to the test command.

* Don't expect the root method.

It's likely this worked because we eagerly loaded the Rails minitest plugin
and that somehow defined a root method on `Rails`.

* Assign a backtrace to failed exceptions.

Otherwise Minitest pukes when attempting to filter the backtrace (which
Rails' backtrace cleaner then removes).

Means the exception message test has to be revised too.

This is likely caused by the rails minitest plugin now being loaded for
these tests and assigning a default backtrace cleaner.
---
 railties/test/application/test_runner_test.rb | 4 ++--
 railties/test/test_unit/reporter_test.rb      | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/application/test_runner_test.rb b/railties/test/application/test_runner_test.rb
index 8e0712fca2..c0027ab9a2 100644
--- a/railties/test/application/test_runner_test.rb
+++ b/railties/test/application/test_runner_test.rb
@@ -16,13 +16,13 @@ module ApplicationTests
     end
 
     def test_run_via_backwardscompatibility
-      require "rails/test_unit/minitest_plugin"
+      require "minitest/rails_plugin"
 
       assert_nothing_raised do
         Minitest.run_via[:ruby] = true
       end
 
-      assert_predicate Minitest.run_via, :ruby?
+      assert Minitest.run_via[:ruby]
     end
 
     def test_run_single_file
diff --git a/railties/test/test_unit/reporter_test.rb b/railties/test/test_unit/reporter_test.rb
index 98201394cd..42f973357b 100644
--- a/railties/test/test_unit/reporter_test.rb
+++ b/railties/test/test_unit/reporter_test.rb
@@ -70,7 +70,7 @@ class TestUnitReporterTest < ActiveSupport::TestCase
     @reporter.record(errored_test)
     @reporter.report
 
-    expect = %r{\AE\n\nError:\nTestUnitReporterTest::ExampleTest#woot:\nArgumentError: wups\n    No backtrace\n\nbin/rails test .*test/test_unit/reporter_test\.rb:\d+\n\n\z}
+    expect = %r{\AE\n\nError:\nTestUnitReporterTest::ExampleTest#woot:\nArgumentError: wups\n    \n\nbin/rails test .*test/test_unit/reporter_test\.rb:\d+\n\n\z}
     assert_match expect, @output.string
   end
 
@@ -150,7 +150,7 @@ class TestUnitReporterTest < ActiveSupport::TestCase
       colored = Rails::TestUnitReporter.new @output, color: true, output_inline: true
       colored.record(errored_test)
 
-      expected = %r{\e\[31mE\e\[0m\n\n\e\[31mError:\nTestUnitReporterTest::ExampleTest#woot:\nArgumentError: wups\n    No backtrace\n\e\[0m}
+      expected = %r{\e\[31mE\e\[0m\n\n\e\[31mError:\nTestUnitReporterTest::ExampleTest#woot:\nArgumentError: wups\n    \n\e\[0m}
       assert_match expected, @output.string
     end
   end
@@ -171,8 +171,11 @@ class TestUnitReporterTest < ActiveSupport::TestCase
     end
 
     def errored_test
+      error = ArgumentError.new("wups")
+      error.set_backtrace([ "some_test.rb:4" ])
+
       et = ExampleTest.new(:woot)
-      et.failures << Minitest::UnexpectedError.new(ArgumentError.new("wups"))
+      et.failures << Minitest::UnexpectedError.new(error)
       et
     end
 
-- 
cgit v1.2.3


From ec4a836919c021c0a5cf9ebeebb4db5e02104a55 Mon Sep 17 00:00:00 2001
From: Lisa Ugray <lisa.ugray@shopify.com>
Date: Mon, 10 Jul 2017 11:12:45 -0400
Subject: Protect from forgery by default

Rather than protecting from forgery in the generated
ApplicationController, add it to ActionController::Base by config. This
configuration defaults to false to support older versions which have
removed it from their ApplicationController, but is set to true for
Rails 5.2.
---
 railties/test/application/configuration_test.rb | 7 +++++++
 railties/test/application/rake_test.rb          | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'railties/test')

diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 983ea5c3e6..6c0c087331 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -1209,6 +1209,13 @@ module ApplicationTests
       assert_equal false, ActionController::Parameters.action_on_unpermitted_parameters
     end
 
+    test "config.action_controller.default_protect_from_forgery is true by default" do
+      app "development"
+
+      assert_equal true, ActionController::Base.default_protect_from_forgery
+      assert_includes ActionController::Base.__callbacks[:process_action].map(&:filter), :verify_authenticity_token
+    end
+
     test "config.action_controller.permit_all_parameters can be configured in an initializer" do
       app_file "config/initializers/permit_all_parameters.rb", <<-RUBY
         Rails.application.config.action_controller.permit_all_parameters = true
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index 5ae6ea925f..134106812d 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -117,7 +117,7 @@ module ApplicationTests
     end
 
     def test_code_statistics_sanity
-      assert_match "Code LOC: 26     Test LOC: 0     Code to Test Ratio: 1:0.0",
+      assert_match "Code LOC: 25     Test LOC: 0     Code to Test Ratio: 1:0.0",
         Dir.chdir(app_path) { `bin/rails stats` }
     end
 
-- 
cgit v1.2.3


From 52e050ed00b023968fecda82f19a858876a7c435 Mon Sep 17 00:00:00 2001
From: Lisa Ugray <lisa.ugray@shopify.com>
Date: Thu, 6 Jul 2017 12:59:33 -0400
Subject: Change sqlite3 boolean serialization to use 1 and 0

Abstract boolean serialization has been using 't' and 'f', with MySQL
overriding that to use 1 and 0.

This has the advantage that SQLite natively recognizes 1 and 0 as true
and false, but does not natively recognize 't' and 'f'.

This change in serialization requires a migration of stored boolean data
for SQLite databases, so it's implemented behind a configuration flag
whose default false value is deprecated. The flag itself can be
deprecated in a future version of Rails.  While loaded models will give
the correct result for boolean columns without migrating old data,
where() clauses will interact incorrectly with old data.

While working in this area, also change the abstract adapter to use
`"TRUE"` and `"FALSE"` as quoted values and `true` and `false` for
unquoted.  These are supported by PostreSQL, and MySQL remains
overriden.
---
 railties/test/application/configuration_test.rb | 28 +++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'railties/test')

diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 6c0c087331..b8a19379e0 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -1585,6 +1585,34 @@ module ApplicationTests
       assert_equal({}, Rails.application.config.my_custom_config)
     end
 
+    test "default SQLite3Adapter.represent_boolean_as_integer for 5.1 is false" do
+      remove_from_config '.*config\.load_defaults.*\n'
+      add_to_top_of_config <<-RUBY
+        config.load_defaults 5.1
+      RUBY
+      app_file "app/models/post.rb", <<-RUBY
+        class Post < ActiveRecord::Base
+        end
+      RUBY
+
+      app "development"
+      Post.object_id # force lazy load hooks to run
+
+      assert_not ActiveRecord::ConnectionAdapters::SQLite3Adapter.represent_boolean_as_integer
+    end
+
+    test "default SQLite3Adapter.represent_boolean_as_integer for new installs is true" do
+      app_file "app/models/post.rb", <<-RUBY
+        class Post < ActiveRecord::Base
+        end
+      RUBY
+
+      app "development"
+      Post.object_id # force lazy load hooks to run
+
+      assert ActiveRecord::ConnectionAdapters::SQLite3Adapter.represent_boolean_as_integer
+    end
+
     test "config_for containing ERB tags should evaluate" do
       app_file "config/custom.yml", <<-RUBY
       development:
-- 
cgit v1.2.3


From 5803640261a324bd7d7665a2bad5b5dc6da29255 Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Mon, 26 Jun 2017 05:46:12 +0900
Subject: Do not generate unused components contents in `app:update` task

Currently, `app:update` generates all contents regardless of the
component using in application.

For example, even if not using Action Cable, `app:update` will generate
a contents related to Action Cable. This is a little inconvenient.
This PR checks the existence of the component and does not generate
unnecessary contents.
Can not check all options in this way. However, it will be able to
prevent the generation of unnecessary files.
---
 railties/test/generators/app_generator_test.rb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'railties/test')

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 059c2692be..ffdee3a6b5 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -278,6 +278,22 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
+  def test_app_update_does_not_generate_action_cable_contents_when_skip_action_cable_is_given
+    app_root = File.join(destination_root, "myapp")
+    run_generator [app_root, "--skip-action-cable"]
+
+    FileUtils.cd(app_root) do
+      # For avoid conflict file
+      FileUtils.rm("#{app_root}/config/secrets.yml")
+      quietly { system("bin/rails app:update") }
+    end
+
+    assert_no_file "#{app_root}/config/cable.yml"
+    assert_file "#{app_root}/config/environments/production.rb" do |content|
+      assert_no_match(/config\.action_cable/, content)
+    end
+  end
+
   def test_application_names_are_not_singularized
     run_generator [File.join(destination_root, "hats")]
     assert_file "hats/config/environment.rb", /Rails\.application\.initialize!/
-- 
cgit v1.2.3


From a18cf23a9cbcbeed61e8049442640c7153e0a8fb Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Fri, 14 Jul 2017 08:01:49 +0900
Subject: Set `represent_boolean_as_integer` via `configuration`

---
 railties/test/application/configuration_test.rb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'railties/test')

diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index b8a19379e0..e413163bb9 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -1613,6 +1613,24 @@ module ApplicationTests
       assert ActiveRecord::ConnectionAdapters::SQLite3Adapter.represent_boolean_as_integer
     end
 
+    test "represent_boolean_as_integer should be able to set via config.active_record.sqlite3.represent_boolean_as_integer" do
+      remove_from_config '.*config\.load_defaults.*\n'
+
+      app_file "config/initializers/new_framework_defaults_5_2.rb", <<-RUBY
+        Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true
+      RUBY
+
+      app_file "app/models/post.rb", <<-RUBY
+        class Post < ActiveRecord::Base
+        end
+      RUBY
+
+      app "development"
+      Post.object_id # force lazy load hooks to run
+
+      assert ActiveRecord::ConnectionAdapters::SQLite3Adapter.represent_boolean_as_integer
+    end
+
     test "config_for containing ERB tags should evaluate" do
       app_file "config/custom.yml", <<-RUBY
       development:
-- 
cgit v1.2.3


From c98a641ff402d3ca5b754f4621a0764f33eab155 Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Sun, 16 Jul 2017 12:00:11 +0900
Subject: add helper method for explicit lazy load

---
 railties/test/application/configuration_test.rb | 31 ++++++++++++++-----------
 1 file changed, 18 insertions(+), 13 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index e413163bb9..47bb806f84 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -1130,7 +1130,7 @@ module ApplicationTests
 
       app "development"
 
-      ActionController::Base.object_id # force lazy load hooks to run
+      lazy_load { ActionController::Base }
 
       assert_equal :raise, ActionController::Parameters.action_on_unpermitted_parameters
 
@@ -1141,7 +1141,7 @@ module ApplicationTests
     test "config.action_controller.always_permitted_parameters are: controller, action by default" do
       app "development"
 
-      ActionController::Base.object_id # force lazy load hooks to run
+      lazy_load { ActionController::Base }
 
       assert_equal %w(controller action), ActionController::Parameters.always_permitted_parameters
     end
@@ -1153,7 +1153,7 @@ module ApplicationTests
 
       app "development"
 
-      ActionController::Base.object_id # force lazy load hooks to run
+      lazy_load { ActionController::Base }
 
       assert_equal %w( controller action format ), ActionController::Parameters.always_permitted_parameters
     end
@@ -1177,7 +1177,7 @@ module ApplicationTests
 
       app "development"
 
-      ActionController::Base.object_id # force lazy load hooks to run
+      lazy_load { ActionController::Base }
 
       assert_equal :raise, ActionController::Parameters.action_on_unpermitted_parameters
 
@@ -1188,7 +1188,7 @@ module ApplicationTests
     test "config.action_controller.action_on_unpermitted_parameters is :log by default on development" do
       app "development"
 
-      ActionController::Base.object_id # force lazy load hooks to run
+      lazy_load { ActionController::Base }
 
       assert_equal :log, ActionController::Parameters.action_on_unpermitted_parameters
     end
@@ -1196,7 +1196,7 @@ module ApplicationTests
     test "config.action_controller.action_on_unpermitted_parameters is :log by default on test" do
       app "test"
 
-      ActionController::Base.object_id # force lazy load hooks to run
+      lazy_load { ActionController::Base }
 
       assert_equal :log, ActionController::Parameters.action_on_unpermitted_parameters
     end
@@ -1204,7 +1204,7 @@ module ApplicationTests
     test "config.action_controller.action_on_unpermitted_parameters is false by default on production" do
       app "production"
 
-      ActionController::Base.object_id # force lazy load hooks to run
+      lazy_load { ActionController::Base }
 
       assert_equal false, ActionController::Parameters.action_on_unpermitted_parameters
     end
@@ -1223,7 +1223,7 @@ module ApplicationTests
 
       app "development"
 
-      ActionController::Base.object_id # force lazy load hooks to run
+      lazy_load { ActionController::Base }
       assert_equal true, ActionController::Parameters.permit_all_parameters
     end
 
@@ -1234,7 +1234,7 @@ module ApplicationTests
 
       app "development"
 
-      ActionController::Base.object_id # force lazy load hooks to run
+      lazy_load { ActionController::Base }
       assert_equal [], ActionController::Parameters.always_permitted_parameters
     end
 
@@ -1245,7 +1245,7 @@ module ApplicationTests
 
       app "development"
 
-      ActionController::Base.object_id # force lazy load hooks to run
+      lazy_load { ActionController::Base }
       assert_equal :raise, ActionController::Parameters.action_on_unpermitted_parameters
     end
 
@@ -1596,7 +1596,7 @@ module ApplicationTests
       RUBY
 
       app "development"
-      Post.object_id # force lazy load hooks to run
+      lazy_load { Post }
 
       assert_not ActiveRecord::ConnectionAdapters::SQLite3Adapter.represent_boolean_as_integer
     end
@@ -1608,7 +1608,7 @@ module ApplicationTests
       RUBY
 
       app "development"
-      Post.object_id # force lazy load hooks to run
+      lazy_load { Post }
 
       assert ActiveRecord::ConnectionAdapters::SQLite3Adapter.represent_boolean_as_integer
     end
@@ -1626,7 +1626,7 @@ module ApplicationTests
       RUBY
 
       app "development"
-      Post.object_id # force lazy load hooks to run
+      lazy_load { Post }
 
       assert ActiveRecord::ConnectionAdapters::SQLite3Adapter.represent_boolean_as_integer
     end
@@ -1737,5 +1737,10 @@ module ApplicationTests
       assert_equal 301, last_response.status
       assert_equal "https://example.org/", last_response.location
     end
+
+    private
+      def lazy_load
+        yield # Tasty clarifying sugar, homie! We only need to reference a constant to load it.
+      end
   end
 end
-- 
cgit v1.2.3


From 1acd9a6464668d4d54ab30d016829f60b70dbbeb Mon Sep 17 00:00:00 2001
From: Robin Dupret <robin.dupret@gmail.com>
Date: Mon, 5 Jun 2017 23:19:00 +0200
Subject: Allow to pass a connection to the `dbconsole` command

Since 0a4f6009, it's possible to specify a 3-level database
configuration to gather connections by environment.

The `dbconsole` command will try to look for a database configuration
which points to the current environment but with such flavour, the
environment key is flushed out so let's add the ability to specify
the connection and pick `primary` by default to be consistent with
Active Record.
---
 railties/test/commands/dbconsole_test.rb | 43 ++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

(limited to 'railties/test')

diff --git a/railties/test/commands/dbconsole_test.rb b/railties/test/commands/dbconsole_test.rb
index 0f8c5dbb79..94bfe3a652 100644
--- a/railties/test/commands/dbconsole_test.rb
+++ b/railties/test/commands/dbconsole_test.rb
@@ -200,6 +200,49 @@ class Rails::DBConsoleTest < ActiveSupport::TestCase
     assert_match(/Unknown command-line client for db/, output)
   end
 
+  def test_primary_is_automatically_picked_with_3_level_configuration
+    sample_config = {
+      "test" => {
+        "primary" => {
+          "adapter" => "postgresql"
+        }
+      }
+    }
+
+    app_db_config(sample_config) do
+      assert_equal "postgresql", Rails::DBConsole.new.config["adapter"]
+    end
+  end
+
+  def test_specifying_a_custom_connection_and_environment
+    stub_available_environments(["development"]) do
+      dbconsole = parse_arguments(["-c", "custom", "-e", "development"])
+
+      assert_equal "development", dbconsole[:environment]
+      assert_equal "custom", dbconsole.connection
+    end
+  end
+
+  def test_specifying_a_missing_connection
+    app_db_config({}) do
+      e = assert_raises(ActiveRecord::AdapterNotSpecified) do
+        Rails::Command.invoke(:dbconsole, ["-c", "i_do_not_exist"])
+      end
+
+      assert_includes e.message, "'i_do_not_exist' connection is not configured."
+    end
+  end
+
+  def test_specifying_a_missing_environment
+    app_db_config({}) do
+      e = assert_raises(ActiveRecord::AdapterNotSpecified) do
+        Rails::Command.invoke(:dbconsole)
+      end
+
+      assert_includes e.message, "'test' database is not configured."
+    end
+  end
+
   def test_print_help_short
     stdout = capture(:stdout) do
       Rails::Command.invoke(:dbconsole, ["-h"])
-- 
cgit v1.2.3


From 48b249927375465a7102acc71c2dfb8d49af8309 Mon Sep 17 00:00:00 2001
From: Robin Dupret <robin.dupret@gmail.com>
Date: Fri, 9 Jun 2017 00:15:41 +0200
Subject: Deprecate environment as an argument for dbconsole and console

People should rather rely on the `-e` or `--environment` options to
specify in which environment they want to work. This will allow us
to specify the connection to pick as a regular argument in the future.
---
 railties/test/commands/console_test.rb   | 24 ++++++++++++++++--------
 railties/test/commands/dbconsole_test.rb | 12 ++++++++----
 2 files changed, 24 insertions(+), 12 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/commands/console_test.rb b/railties/test/commands/console_test.rb
index 4fc082e4ca..08c560146c 100644
--- a/railties/test/commands/console_test.rb
+++ b/railties/test/commands/console_test.rb
@@ -47,7 +47,7 @@ class Rails::ConsoleTest < ActiveSupport::TestCase
   end
 
   def test_console_with_environment
-    start ["-e production"]
+    start ["-e", "production"]
     assert_match(/\sproduction\s/, output)
   end
 
@@ -88,18 +88,24 @@ class Rails::ConsoleTest < ActiveSupport::TestCase
   end
 
   def test_rails_env_is_production_when_first_argument_is_p
-    start ["p"]
-    assert_match(/\sproduction\s/, output)
+    assert_deprecated do
+      start ["p"]
+      assert_match(/\sproduction\s/, output)
+    end
   end
 
   def test_rails_env_is_test_when_first_argument_is_t
-    start ["t"]
-    assert_match(/\stest\s/, output)
+    assert_deprecated do
+      start ["t"]
+      assert_match(/\stest\s/, output)
+    end
   end
 
   def test_rails_env_is_development_when_argument_is_d
-    start ["d"]
-    assert_match(/\sdevelopment\s/, output)
+    assert_deprecated do
+      start ["d"]
+      assert_match(/\sdevelopment\s/, output)
+    end
   end
 
   def test_rails_env_is_dev_when_argument_is_dev_and_dev_env_is_present
@@ -111,7 +117,9 @@ class Rails::ConsoleTest < ActiveSupport::TestCase
       end
     end
 
-    assert_match("dev", parse_arguments(["dev"])[:environment])
+    assert_deprecated do
+      assert_match("dev", parse_arguments(["dev"])[:environment])
+    end
   ensure
     Rails::Command::ConsoleCommand.class_eval do
       undef_method :available_environments
diff --git a/railties/test/commands/dbconsole_test.rb b/railties/test/commands/dbconsole_test.rb
index 94bfe3a652..e6a67c2c49 100644
--- a/railties/test/commands/dbconsole_test.rb
+++ b/railties/test/commands/dbconsole_test.rb
@@ -98,14 +98,18 @@ class Rails::DBConsoleTest < ActiveSupport::TestCase
   end
 
   def test_rails_env_is_development_when_argument_is_dev
-    stub_available_environments([ "development", "test" ]) do
-      assert_match("development", parse_arguments([ "dev" ])[:environment])
+    assert_deprecated do
+      stub_available_environments([ "development", "test" ]) do
+        assert_match("development", parse_arguments([ "dev" ])[:environment])
+      end
     end
   end
 
   def test_rails_env_is_dev_when_argument_is_dev_and_dev_env_is_present
-    stub_available_environments([ "dev" ]) do
-      assert_match("dev", parse_arguments([ "dev" ])[:environment])
+    assert_deprecated do
+      stub_available_environments([ "dev" ]) do
+        assert_match("dev", parse_arguments([ "dev" ])[:environment])
+      end
     end
   end
 
-- 
cgit v1.2.3


From 3777701f1380f3814bd5313b225586dec64d4104 Mon Sep 17 00:00:00 2001
From: Robin Dupret <robin.dupret@gmail.com>
Date: Sun, 16 Jul 2017 14:54:04 +0200
Subject: Properly expand the environment's name

Running the `console` and `dbconsole` commands with a regular argument
as the environment's name automatically expand it to match an existing
environment (e.g. dev for development).

This feature wasn't available using the `--environment` (a.k.a `-e`)
option.
---
 railties/test/commands/console_test.rb   | 5 +++++
 railties/test/commands/dbconsole_test.rb | 6 ++++++
 2 files changed, 11 insertions(+)

(limited to 'railties/test')

diff --git a/railties/test/commands/console_test.rb b/railties/test/commands/console_test.rb
index 08c560146c..a7169e16fb 100644
--- a/railties/test/commands/console_test.rb
+++ b/railties/test/commands/console_test.rb
@@ -82,6 +82,11 @@ class Rails::ConsoleTest < ActiveSupport::TestCase
     assert_match(/\sspecial-production\s/, output)
   end
 
+  def test_e_option_is_properly_expanded
+    start ["-e", "prod"]
+    assert_match(/\sproduction\s/, output)
+  end
+
   def test_environment_option
     start ["--environment=special-production"]
     assert_match(/\sspecial-production\s/, output)
diff --git a/railties/test/commands/dbconsole_test.rb b/railties/test/commands/dbconsole_test.rb
index e6a67c2c49..4f55eb9aa6 100644
--- a/railties/test/commands/dbconsole_test.rb
+++ b/railties/test/commands/dbconsole_test.rb
@@ -105,6 +105,12 @@ class Rails::DBConsoleTest < ActiveSupport::TestCase
     end
   end
 
+  def test_rails_env_is_development_when_environment_option_is_dev
+    stub_available_environments([ "development", "test" ]) do
+      assert_match("development", parse_arguments([ "-e", "dev" ])[:environment])
+    end
+  end
+
   def test_rails_env_is_dev_when_argument_is_dev_and_dev_env_is_present
     assert_deprecated do
       stub_available_environments([ "dev" ]) do
-- 
cgit v1.2.3


From 8be50181d3fbe0f727a68de33ec856efdf772487 Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Mon, 17 Jul 2017 09:11:21 +0900
Subject: Set `RAILS_ENV` before load application file

Since #29725, load application file when `dbconsole` command is executed.
However, if do not set `RAILS_ENV` before reading the application file,
can not connect to the env specified in option, so added the setting
of `RAILS_ENV`.
---
 railties/test/application/dbconsole_test.rb | 35 ++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/application/dbconsole_test.rb b/railties/test/application/dbconsole_test.rb
index 7e5e9ea8aa..12d1cfb089 100644
--- a/railties/test/application/dbconsole_test.rb
+++ b/railties/test/application/dbconsole_test.rb
@@ -9,6 +9,8 @@ module ApplicationTests
     include ActiveSupport::Testing::Isolation
 
     def setup
+      skip "PTY unavailable" unless available_pty?
+
       build_app
     end
 
@@ -17,7 +19,6 @@ module ApplicationTests
     end
 
     def test_use_value_defined_in_environment_file_in_database_yml
-      skip "PTY unavailable" unless available_pty?
       Dir.chdir(app_path) do
         app_file "config/database.yml", <<-YAML
           development:
@@ -41,9 +42,37 @@ module ApplicationTests
       master.puts ".exit"
     end
 
+    def test_respect_environment_option
+      Dir.chdir(app_path) do
+        app_file "config/database.yml", <<-YAML
+          default: &default
+            adapter: sqlite3
+            pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+            timeout: 5000
+
+          development:
+            <<: *default
+            database: db/development.sqlite3
+
+          production:
+            <<: *default
+            database: db/production.sqlite3
+        YAML
+      end
+
+      master, slave = PTY.open
+      spawn_dbconsole(slave, "-e production")
+      assert_output("sqlite>", master)
+
+      master.puts ".databases"
+      assert_output("production.sqlite3", master)
+    ensure
+      master.puts ".exit"
+    end
+
     private
-      def spawn_dbconsole(fd)
-        Process.spawn("#{app_path}/bin/rails dbconsole", in: fd, out: fd, err: fd)
+      def spawn_dbconsole(fd, options = nil)
+        Process.spawn("#{app_path}/bin/rails dbconsole #{options}", in: fd, out: fd, err: fd)
       end
 
       def assert_output(expected, io, timeout = 5)
-- 
cgit v1.2.3


From c24be369322b9e0211fcef30003375de195ef660 Mon Sep 17 00:00:00 2001
From: Kasper Timm Hansen <kaspth@gmail.com>
Date: Mon, 17 Jul 2017 21:37:03 +0200
Subject: Rename helper to force_lazy_load_hooks.

Clarifies the intent that aren't just loading the
model but really caring about triggering the on_load
callbacks.
---
 railties/test/application/configuration_test.rb | 28 ++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 47bb806f84..9f62ca8eb8 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -1130,7 +1130,7 @@ module ApplicationTests
 
       app "development"
 
-      lazy_load { ActionController::Base }
+      force_lazy_load_hooks { ActionController::Base }
 
       assert_equal :raise, ActionController::Parameters.action_on_unpermitted_parameters
 
@@ -1141,7 +1141,7 @@ module ApplicationTests
     test "config.action_controller.always_permitted_parameters are: controller, action by default" do
       app "development"
 
-      lazy_load { ActionController::Base }
+      force_lazy_load_hooks { ActionController::Base }
 
       assert_equal %w(controller action), ActionController::Parameters.always_permitted_parameters
     end
@@ -1153,7 +1153,7 @@ module ApplicationTests
 
       app "development"
 
-      lazy_load { ActionController::Base }
+      force_lazy_load_hooks { ActionController::Base }
 
       assert_equal %w( controller action format ), ActionController::Parameters.always_permitted_parameters
     end
@@ -1177,7 +1177,7 @@ module ApplicationTests
 
       app "development"
 
-      lazy_load { ActionController::Base }
+      force_lazy_load_hooks { ActionController::Base }
 
       assert_equal :raise, ActionController::Parameters.action_on_unpermitted_parameters
 
@@ -1188,7 +1188,7 @@ module ApplicationTests
     test "config.action_controller.action_on_unpermitted_parameters is :log by default on development" do
       app "development"
 
-      lazy_load { ActionController::Base }
+      force_lazy_load_hooks { ActionController::Base }
 
       assert_equal :log, ActionController::Parameters.action_on_unpermitted_parameters
     end
@@ -1196,7 +1196,7 @@ module ApplicationTests
     test "config.action_controller.action_on_unpermitted_parameters is :log by default on test" do
       app "test"
 
-      lazy_load { ActionController::Base }
+      force_lazy_load_hooks { ActionController::Base }
 
       assert_equal :log, ActionController::Parameters.action_on_unpermitted_parameters
     end
@@ -1204,7 +1204,7 @@ module ApplicationTests
     test "config.action_controller.action_on_unpermitted_parameters is false by default on production" do
       app "production"
 
-      lazy_load { ActionController::Base }
+      force_lazy_load_hooks { ActionController::Base }
 
       assert_equal false, ActionController::Parameters.action_on_unpermitted_parameters
     end
@@ -1223,7 +1223,7 @@ module ApplicationTests
 
       app "development"
 
-      lazy_load { ActionController::Base }
+      force_lazy_load_hooks { ActionController::Base }
       assert_equal true, ActionController::Parameters.permit_all_parameters
     end
 
@@ -1234,7 +1234,7 @@ module ApplicationTests
 
       app "development"
 
-      lazy_load { ActionController::Base }
+      force_lazy_load_hooks { ActionController::Base }
       assert_equal [], ActionController::Parameters.always_permitted_parameters
     end
 
@@ -1245,7 +1245,7 @@ module ApplicationTests
 
       app "development"
 
-      lazy_load { ActionController::Base }
+      force_lazy_load_hooks { ActionController::Base }
       assert_equal :raise, ActionController::Parameters.action_on_unpermitted_parameters
     end
 
@@ -1596,7 +1596,7 @@ module ApplicationTests
       RUBY
 
       app "development"
-      lazy_load { Post }
+      force_lazy_load_hooks { Post }
 
       assert_not ActiveRecord::ConnectionAdapters::SQLite3Adapter.represent_boolean_as_integer
     end
@@ -1608,7 +1608,7 @@ module ApplicationTests
       RUBY
 
       app "development"
-      lazy_load { Post }
+      force_lazy_load_hooks { Post }
 
       assert ActiveRecord::ConnectionAdapters::SQLite3Adapter.represent_boolean_as_integer
     end
@@ -1626,7 +1626,7 @@ module ApplicationTests
       RUBY
 
       app "development"
-      lazy_load { Post }
+      force_lazy_load_hooks { Post }
 
       assert ActiveRecord::ConnectionAdapters::SQLite3Adapter.represent_boolean_as_integer
     end
@@ -1739,7 +1739,7 @@ module ApplicationTests
     end
 
     private
-      def lazy_load
+      def force_lazy_load_hooks
         yield # Tasty clarifying sugar, homie! We only need to reference a constant to load it.
       end
   end
-- 
cgit v1.2.3


From ed44b145bd6d621cd19a4a3c94eff1311e9c3755 Mon Sep 17 00:00:00 2001
From: Cody Cutrer <cody@cutrer.us>
Date: Wed, 31 Aug 2016 09:28:44 -0600
Subject: support `-` as an argument to `rails runner`

in Rails 4.0, you could use `/dev/stdin` on both Linux and Mac, but with
the switch to Kernel.load in Rails 4.1, this broke on Linux (you get
a LoadError). Instead, explicitly detect `-` as meaning stdin, then
read from stdin explicitly, instead of performing file gymnastics. This
should now work on any platform uniformly.

Passing a script via stdin is useful when you're sshing to a server,
and the script you want to run is stored locally. You could theoretically
pass the entire script on the command line, but in reality you'll run
into problems with the command being too long.
---
 railties/test/application/runner_test.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'railties/test')

diff --git a/railties/test/application/runner_test.rb b/railties/test/application/runner_test.rb
index 0c45bc398a..81f717b2c3 100644
--- a/railties/test/application/runner_test.rb
+++ b/railties/test/application/runner_test.rb
@@ -84,6 +84,14 @@ module ApplicationTests
       assert_match %w( a b ).to_s, Dir.chdir(app_path) { `bin/rails runner "bin/program_name.rb" a b` }
     end
 
+    def test_should_run_stdin
+      app_file "bin/count_users.rb", <<-SCRIPT
+      puts User.count
+      SCRIPT
+
+      assert_match "42", Dir.chdir(app_path) { `cat bin/count_users.rb | bin/rails runner -` }
+    end
+
     def test_with_hook
       add_to_config <<-RUBY
         runner do |app|
-- 
cgit v1.2.3


From af3b6c367b46ae9df599d090015481bab21974bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20Wn=C4=99trzak?= <w.wnetrzak@gmail.com>
Date: Fri, 21 Jul 2017 14:21:45 +0200
Subject: Fix false positive test related to wrong app root path.

Without setting root config, `config.paths["config/secrets"]`
located in https://github.com/rails/rails/blob/84eb498f84ebc5d1be0b0db6f7bca9da3d679ca6/railties/lib/rails/application.rb#L390
always returned empty list.
---
 railties/test/secrets_test.rb | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/secrets_test.rb b/railties/test/secrets_test.rb
index 744d831406..d78c253765 100644
--- a/railties/test/secrets_test.rb
+++ b/railties/test/secrets_test.rb
@@ -89,7 +89,6 @@ class Rails::SecretsTest < ActiveSupport::TestCase
           yeah_yeah: lets-walk-in-the-cool-evening-light
       end_of_secrets
 
-      Rails.application.config.root = app_path
       Rails.application.config.read_encrypted_secrets = true
       Rails.application.instance_variable_set(:@secrets, nil) # Dance around caching 💃🕺
       assert_equal "lets-walk-in-the-cool-evening-light", Rails.application.secrets.yeah_yeah
@@ -113,19 +112,17 @@ class Rails::SecretsTest < ActiveSupport::TestCase
 
   test "do not update secrets.yml.enc when secretes do not change" do
     run_secrets_generator do
-      Dir.chdir(app_path) do
-        Rails::Secrets.read_for_editing do |tmp_path|
-          File.write(tmp_path, "Empty streets, empty nights. The Downtown Lights.")
-        end
+      Rails::Secrets.read_for_editing do |tmp_path|
+        File.write(tmp_path, "Empty streets, empty nights. The Downtown Lights.")
+      end
 
-        FileUtils.cp("config/secrets.yml.enc", "config/secrets.yml.enc.bk")
+      FileUtils.cp("config/secrets.yml.enc", "config/secrets.yml.enc.bk")
 
-        Rails::Secrets.read_for_editing do |tmp_path|
-          File.write(tmp_path, "Empty streets, empty nights. The Downtown Lights.")
-        end
-
-        assert_equal File.read("config/secrets.yml.enc.bk"), File.read("config/secrets.yml.enc")
+      Rails::Secrets.read_for_editing do |tmp_path|
+        File.write(tmp_path, "Empty streets, empty nights. The Downtown Lights.")
       end
+
+      assert_equal File.read("config/secrets.yml.enc.bk"), File.read("config/secrets.yml.enc")
     end
   end
 
@@ -170,6 +167,9 @@ class Rails::SecretsTest < ActiveSupport::TestCase
           Rails::Generators::EncryptedSecretsGenerator.start
         end
 
+        # Make config.paths["config/secrets"] to be relative to app_path
+        Rails.application.config.root = app_path
+
         yield
       end
     end
-- 
cgit v1.2.3


From 2b331e9098c489791031ee17f683ca8be92f7bba Mon Sep 17 00:00:00 2001
From: Eugene Kenny <elkenny@gmail.com>
Date: Sun, 23 Jul 2017 11:09:15 +0100
Subject: Avoid modifying frozen string in check_schema_file

This was missed when the frozen string literal pragma was added to this
file because the string is only modified when running in the context of
a full Rails app, which wasn't covered by the test suite.
---
 railties/test/application/rake/dbs_test.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'railties/test')

diff --git a/railties/test/application/rake/dbs_test.rb b/railties/test/application/rake/dbs_test.rb
index c63f23fa0a..9e612f1526 100644
--- a/railties/test/application/rake/dbs_test.rb
+++ b/railties/test/application/rake/dbs_test.rb
@@ -259,6 +259,13 @@ module ApplicationTests
         end
       end
 
+      test "db:schema:load fails if schema.rb doesn't exist yet" do
+        Dir.chdir(app_path) do
+          stderr_output = capture(:stderr) { `bin/rails db:schema:load` }
+          assert_match /Run `rails db:migrate` to create it/, stderr_output
+        end
+      end
+
       def db_test_load_structure
         Dir.chdir(app_path) do
           `bin/rails generate model book title:string;
-- 
cgit v1.2.3


From 2bd60c844ce92047e03359f4dde4b19f49de92ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Sun, 23 Jul 2017 01:25:26 +0200
Subject: Fix regression from multiple mountpoint support

---
 railties/test/railties/engine_test.rb         | 29 +++++++++++++++++++++++++++
 railties/test/railties/mounted_engine_test.rb |  9 +++++++++
 2 files changed, 38 insertions(+)

(limited to 'railties/test')

diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index 0379394f31..6f762d2d3f 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -1427,6 +1427,35 @@ YAML
       assert_equal "/vegetables/1/bukkits/posts", last_response.body
     end
 
+    test "route helpers resolve script name correctly when called with different script name from current one" do
+      @plugin.write "app/controllers/posts_controller.rb", <<-RUBY
+        class PostsController < ActionController::Base
+          def index
+            render plain: fruit_bukkits.posts_path(fruit_id: 2)
+          end
+        end
+      RUBY
+
+      app_file "config/routes.rb", <<-RUBY
+        Rails.application.routes.draw do
+          resources :fruits do
+            mount Bukkits::Engine => "/bukkits"
+          end
+        end
+      RUBY
+
+      @plugin.write "config/routes.rb", <<-RUBY
+        Bukkits::Engine.routes.draw do
+          resources :posts, only: :index
+        end
+      RUBY
+
+      boot_rails
+
+      get("/fruits/1/bukkits/posts")
+      assert_equal "/fruits/2/bukkits/posts", last_response.body
+    end
+
   private
     def app
       Rails.application
diff --git a/railties/test/railties/mounted_engine_test.rb b/railties/test/railties/mounted_engine_test.rb
index 6639e55382..6eb2c5acc6 100644
--- a/railties/test/railties/mounted_engine_test.rb
+++ b/railties/test/railties/mounted_engine_test.rb
@@ -111,6 +111,7 @@ module ApplicationTests
       @plugin.write "config/routes.rb", <<-RUBY
         Blog::Engine.routes.draw do
           resources :posts
+          get '/different_context', to: 'posts#different_context'
           get '/generate_application_route', to: 'posts#generate_application_route'
           get '/application_route_in_view', to: 'posts#application_route_in_view'
           get '/engine_polymorphic_path', to: 'posts#engine_polymorphic_path'
@@ -125,6 +126,10 @@ module ApplicationTests
               render plain: blog.post_path(1)
             end
 
+            def different_context
+              render plain: blog.post_path(1, user: "ada")
+            end
+
             def generate_application_route
               path = main_app.url_for(controller: "/main",
                                  action: "index",
@@ -196,6 +201,10 @@ module ApplicationTests
       get "/john/blog/posts"
       assert_equal "/john/blog/posts/1", last_response.body
 
+      # test generating engine route from engine with a different context
+      get "/john/blog/different_context"
+      assert_equal "/ada/blog/posts/1", last_response.body
+
       # test generating engine's route from engine with default_url_options
       get "/john/blog/posts", {}, "SCRIPT_NAME" => "/foo"
       assert_equal "/foo/john/blog/posts/1", last_response.body
-- 
cgit v1.2.3


From 8a0f235fd3bd3f3c813fa7034c6d741831e55c3e Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Tue, 25 Jul 2017 08:19:41 +0900
Subject: Fix `warning: ambiguous first argument`

This fixes the following warning:

```
railties/test/application/rake/dbs_test.rb:265: warning: ambiguous first argument; put parentheses or a space even after `/' operator
```
---
 railties/test/application/rake/dbs_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/test')

diff --git a/railties/test/application/rake/dbs_test.rb b/railties/test/application/rake/dbs_test.rb
index 9e612f1526..3216121de3 100644
--- a/railties/test/application/rake/dbs_test.rb
+++ b/railties/test/application/rake/dbs_test.rb
@@ -262,7 +262,7 @@ module ApplicationTests
       test "db:schema:load fails if schema.rb doesn't exist yet" do
         Dir.chdir(app_path) do
           stderr_output = capture(:stderr) { `bin/rails db:schema:load` }
-          assert_match /Run `rails db:migrate` to create it/, stderr_output
+          assert_match(/Run `rails db:migrate` to create it/, stderr_output)
         end
       end
 
-- 
cgit v1.2.3


From 75ccdfed8d43d79f6590653212ecea7124759439 Mon Sep 17 00:00:00 2001
From: Lisa Ugray <lisa.ugray@shopify.com>
Date: Mon, 24 Jul 2017 14:17:56 -0400
Subject: Stop creating ApplicationRecord on model generation

When generating models, we created ApplicationRecord in the default
location if no file existed there.  That was annoying for people who
moved it to somewhere else in the autoload path.  At this point, the
vast majority of apps should have either run the upgrade script or
generated a model since upgrading.  For those that haven't the error
message after generating a new model should be helpful:

   NameError: uninitialized constant ApplicationRecord

To ease friction in that case, this also adds a generator for
ApplicationRecord.
---
 .../generators/application_record_generator_test.rb   | 14 ++++++++++++++
 railties/test/generators/model_generator_test.rb      | 19 -------------------
 .../test/generators/namespaced_generators_test.rb     | 11 +++++++++++
 railties/test/generators/plugin_generator_test.rb     | 14 --------------
 railties/test/generators_test.rb                      |  2 +-
 5 files changed, 26 insertions(+), 34 deletions(-)
 create mode 100644 railties/test/generators/application_record_generator_test.rb

(limited to 'railties/test')

diff --git a/railties/test/generators/application_record_generator_test.rb b/railties/test/generators/application_record_generator_test.rb
new file mode 100644
index 0000000000..b734d786c0
--- /dev/null
+++ b/railties/test/generators/application_record_generator_test.rb
@@ -0,0 +1,14 @@
+require "generators/generators_test_helper"
+require "rails/generators/rails/application_record/application_record_generator"
+
+class ApplicationRecordGeneratorTest < Rails::Generators::TestCase
+  include GeneratorsTestHelper
+
+  def test_application_record_skeleton_is_created
+    run_generator
+    assert_file "app/models/application_record.rb" do |record|
+      assert_match(/class ApplicationRecord < ActiveRecord::Base/, record)
+      assert_match(/self\.abstract_class = true/, record)
+    end
+  end
+end
diff --git a/railties/test/generators/model_generator_test.rb b/railties/test/generators/model_generator_test.rb
index f41969fc46..651713d3c0 100644
--- a/railties/test/generators/model_generator_test.rb
+++ b/railties/test/generators/model_generator_test.rb
@@ -6,14 +6,6 @@ class ModelGeneratorTest < Rails::Generators::TestCase
   include GeneratorsTestHelper
   arguments %w(Account name:string age:integer)
 
-  def test_application_record_skeleton_is_created
-    run_generator
-    assert_file "app/models/application_record.rb" do |record|
-      assert_match(/class ApplicationRecord < ActiveRecord::Base/, record)
-      assert_match(/self\.abstract_class = true/, record)
-    end
-  end
-
   def test_help_shows_invoked_generators_options
     content = run_generator ["--help"]
     assert_match(/ActiveRecord options:/, content)
@@ -43,17 +35,6 @@ class ModelGeneratorTest < Rails::Generators::TestCase
     assert_no_migration "db/migrate/create_accounts.rb"
   end
 
-  def test_model_with_existent_application_record
-    mkdir_p "#{destination_root}/app/models"
-    touch "#{destination_root}/app/models/application_record.rb"
-
-    Dir.chdir(destination_root) do
-      run_generator ["account"]
-    end
-
-    assert_file "app/models/account.rb", /class Account < ApplicationRecord/
-  end
-
   def test_plural_names_are_singularized
     content = run_generator ["accounts".freeze]
     assert_file "app/models/account.rb", /class Account < ApplicationRecord/
diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb
index 1caabbe6b1..9315a1b9da 100644
--- a/railties/test/generators/namespaced_generators_test.rb
+++ b/railties/test/generators/namespaced_generators_test.rb
@@ -3,6 +3,7 @@ require "rails/generators/rails/controller/controller_generator"
 require "rails/generators/rails/model/model_generator"
 require "rails/generators/mailer/mailer_generator"
 require "rails/generators/rails/scaffold/scaffold_generator"
+require "rails/generators/rails/application_record/application_record_generator"
 
 class NamespacedGeneratorTestCase < Rails::Generators::TestCase
   include GeneratorsTestHelper
@@ -421,3 +422,13 @@ class NamespacedScaffoldGeneratorTest < NamespacedGeneratorTestCase
                 /module TestApp\n  class Admin::RolesControllerTest < ActionDispatch::IntegrationTest/
   end
 end
+
+class NamespacedApplicationRecordGeneratorTest < NamespacedGeneratorTestCase
+  include GeneratorsTestHelper
+  tests Rails::Generators::ApplicationRecordGenerator
+
+  def test_adds_namespace_to_application_record
+    run_generator
+    assert_file "app/models/test_app/application_record.rb", /module TestApp/, /  class ApplicationRecord < ActiveRecord::Base/
+  end
+end
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index f8512f9157..e8372dea47 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -679,20 +679,6 @@ class PluginGeneratorTest < Rails::Generators::TestCase
     assert_file "app/models/bukkits/article.rb", /class Article < ApplicationRecord/
   end
 
-  def test_generate_application_record_when_does_not_exist_in_mountable_engine
-    run_generator [destination_root, "--mountable"]
-    FileUtils.rm "#{destination_root}/app/models/bukkits/application_record.rb"
-    capture(:stdout) do
-      `#{destination_root}/bin/rails g model article`
-    end
-
-    assert_file "#{destination_root}/app/models/bukkits/application_record.rb" do |record|
-      assert_match(/module Bukkits/, record)
-      assert_match(/class ApplicationRecord < ActiveRecord::Base/, record)
-      assert_match(/self\.abstract_class = true/, record)
-    end
-  end
-
   def test_generate_application_mailer_when_does_not_exist_in_mountable_engine
     run_generator [destination_root, "--mountable"]
     FileUtils.rm "#{destination_root}/app/mailers/bukkits/application_mailer.rb"
diff --git a/railties/test/generators_test.rb b/railties/test/generators_test.rb
index e07627f36d..5063e864ca 100644
--- a/railties/test/generators_test.rb
+++ b/railties/test/generators_test.rb
@@ -124,7 +124,7 @@ class GeneratorsTest < Rails::Generators::TestCase
 
   def test_rails_generators_help_does_not_include_app_nor_plugin_new
     output = capture(:stdout) { Rails::Generators.help }
-    assert_no_match(/app/, output)
+    assert_no_match(/app\W/, output)
     assert_no_match(/[^:]plugin/, output)
   end
 
-- 
cgit v1.2.3


From af4cef024b40fd425ea7e24fd648591ccd196327 Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Tue, 25 Jul 2017 15:01:33 +0900
Subject: Extract `assert_output` and `available_pty?` into `ConsoleHelpers`
 module

We define almost the same method with multiple tests. Therefore, it extract
into module.
---
 railties/test/application/console_test.rb   | 31 ++++++++---------------------
 railties/test/application/dbconsole_test.rb | 23 ++-------------------
 railties/test/console_helpers.rb            | 23 +++++++++++++++++++++
 railties/test/engine/commands_test.rb       | 24 +++-------------------
 4 files changed, 36 insertions(+), 65 deletions(-)
 create mode 100644 railties/test/console_helpers.rb

(limited to 'railties/test')

diff --git a/railties/test/application/console_test.rb b/railties/test/application/console_test.rb
index 057d473870..31bef82ccc 100644
--- a/railties/test/application/console_test.rb
+++ b/railties/test/application/console_test.rb
@@ -1,4 +1,5 @@
 require "isolation/abstract_unit"
+require "console_helpers"
 
 class ConsoleTest < ActiveSupport::TestCase
   include ActiveSupport::Testing::Isolation
@@ -93,14 +94,11 @@ class ConsoleTest < ActiveSupport::TestCase
   end
 end
 
-begin
-  require "pty"
-rescue LoadError
-end
-
 class FullStackConsoleTest < ActiveSupport::TestCase
+  include ConsoleHelpers
+
   def setup
-    skip "PTY unavailable" unless defined?(PTY) && PTY.respond_to?(:open)
+    skip "PTY unavailable" unless available_pty?
 
     build_app
     app_file "app/models/post.rb", <<-CODE
@@ -116,24 +114,11 @@ class FullStackConsoleTest < ActiveSupport::TestCase
     teardown_app
   end
 
-  def assert_output(expected, timeout = 1)
-    timeout = Time.now + timeout
-
-    output = ""
-    until output.include?(expected) || Time.now > timeout
-      if IO.select([@master], [], [], 0.1)
-        output << @master.read(1)
-      end
-    end
-
-    assert_includes output, expected, "#{expected.inspect} expected, but got:\n\n#{output}"
-  end
-
   def write_prompt(command, expected_output = nil)
     @master.puts command
-    assert_output command
-    assert_output expected_output if expected_output
-    assert_output "> "
+    assert_output command, @master
+    assert_output expected_output, @master if expected_output
+    assert_output "> ", @master
   end
 
   def spawn_console(options)
@@ -142,7 +127,7 @@ class FullStackConsoleTest < ActiveSupport::TestCase
       in: @slave, out: @slave, err: @slave
     )
 
-    assert_output "> ", 30
+    assert_output "> ", @master, 30
   end
 
   def test_sandbox
diff --git a/railties/test/application/dbconsole_test.rb b/railties/test/application/dbconsole_test.rb
index 12d1cfb089..48a793e4a3 100644
--- a/railties/test/application/dbconsole_test.rb
+++ b/railties/test/application/dbconsole_test.rb
@@ -1,12 +1,10 @@
 require "isolation/abstract_unit"
-begin
-  require "pty"
-rescue LoadError
-end
+require "console_helpers"
 
 module ApplicationTests
   class DBConsoleTest < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
+    include ConsoleHelpers
 
     def setup
       skip "PTY unavailable" unless available_pty?
@@ -74,22 +72,5 @@ module ApplicationTests
       def spawn_dbconsole(fd, options = nil)
         Process.spawn("#{app_path}/bin/rails dbconsole #{options}", in: fd, out: fd, err: fd)
       end
-
-      def assert_output(expected, io, timeout = 5)
-        timeout = Time.now + timeout
-
-        output = ""
-        until output.include?(expected) || Time.now > timeout
-          if IO.select([io], [], [], 0.1)
-            output << io.read(1)
-          end
-        end
-
-        assert_includes output, expected, "#{expected.inspect} expected, but got:\n\n#{output}"
-      end
-
-      def available_pty?
-        defined?(PTY) && PTY.respond_to?(:open)
-      end
   end
 end
diff --git a/railties/test/console_helpers.rb b/railties/test/console_helpers.rb
new file mode 100644
index 0000000000..4b11afa511
--- /dev/null
+++ b/railties/test/console_helpers.rb
@@ -0,0 +1,23 @@
+begin
+  require "pty"
+rescue LoadError
+end
+
+module ConsoleHelpers
+  def assert_output(expected, io, timeout = 10)
+    timeout = Time.now + timeout
+
+    output = ""
+    until output.include?(expected) || Time.now > timeout
+      if IO.select([io], [], [], 0.1)
+        output << io.read(1)
+      end
+    end
+
+    assert_includes output, expected, "#{expected.inspect} expected, but got:\n\n#{output}"
+  end
+
+  def available_pty?
+    defined?(PTY) && PTY.respond_to?(:open)
+  end
+end
diff --git a/railties/test/engine/commands_test.rb b/railties/test/engine/commands_test.rb
index b1c937143f..018c7c949e 100644
--- a/railties/test/engine/commands_test.rb
+++ b/railties/test/engine/commands_test.rb
@@ -1,10 +1,9 @@
 require "abstract_unit"
-begin
-  require "pty"
-rescue LoadError
-end
+require "console_helpers"
 
 class Rails::Engine::CommandsTest < ActiveSupport::TestCase
+  include ConsoleHelpers
+
   def setup
     @destination_root = Dir.mktmpdir("bukkits")
     Dir.chdir(@destination_root) { `bundle exec rails plugin new bukkits --mountable` }
@@ -64,19 +63,6 @@ class Rails::Engine::CommandsTest < ActiveSupport::TestCase
       "#{@destination_root}/bukkits"
     end
 
-    def assert_output(expected, io, timeout = 10)
-      timeout = Time.now + timeout
-
-      output = ""
-      until output.include?(expected) || Time.now > timeout
-        if IO.select([io], [], [], 0.1)
-          output << io.read(1)
-        end
-      end
-
-      assert_includes output, expected, "#{expected.inspect} expected, but got:\n\n#{output}"
-    end
-
     def spawn_command(command, fd)
       Process.spawn(
         "#{plugin_path}/bin/rails #{command}",
@@ -84,10 +70,6 @@ class Rails::Engine::CommandsTest < ActiveSupport::TestCase
       )
     end
 
-    def available_pty?
-      defined?(PTY) && PTY.respond_to?(:open)
-    end
-
     def kill(pid)
       Process.kill("TERM", pid)
       Process.wait(pid)
-- 
cgit v1.2.3


From b691a946ba229b72f9ec30e50ba5b9ba1e39e6fa Mon Sep 17 00:00:00 2001
From: Sean Griffin <sean@seantheprogrammer.com>
Date: Tue, 25 Jul 2017 08:10:52 -0400
Subject: Fix `dbconsole` test when tempdir is a long path

The output of `.databases` in SQLite will truncate to a certain size.
This causes the test to fail when run locally from a mac, or anything
which has a tempdir with more than a few characters. This pragma has
the same output, but presented as a normal query, meaning no truncation
will occur.
---
 railties/test/application/dbconsole_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/test')

diff --git a/railties/test/application/dbconsole_test.rb b/railties/test/application/dbconsole_test.rb
index 12d1cfb089..ab42199db7 100644
--- a/railties/test/application/dbconsole_test.rb
+++ b/railties/test/application/dbconsole_test.rb
@@ -64,7 +64,7 @@ module ApplicationTests
       spawn_dbconsole(slave, "-e production")
       assert_output("sqlite>", master)
 
-      master.puts ".databases"
+      master.puts "pragma database_list;"
       assert_output("production.sqlite3", master)
     ensure
       master.puts ".exit"
-- 
cgit v1.2.3


From 07d84b7c8db5b85f7521cfc5d2028ed973d9a14b Mon Sep 17 00:00:00 2001
From: Pawan Dubey <git@pawandubey.com>
Date: Mon, 24 Jul 2017 21:53:01 -0400
Subject: Allow bin/rails test task to take absolute paths as arguments

Solves #29923

This regression was caused due to a wrong regex to filter out
paths, introduced in commit 796a1cf0e

The regex was /^\w+\// which did not accept paths with a leading
slash and hence all absolute paths were filtered out.

This change introduces a change in regex which allows for a leading
slash and acts on the matched term accordingly.

While cascading through the case block, the paths are checked for
line number specification, existence of a directory at that path
and if none of those match, then it is considered to be a path to the
file. The regex matchers specified are filtered out via the call
to `Array#compact` since they do not match any of these conditions.
---
 railties/test/application/test_runner_test.rb | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'railties/test')

diff --git a/railties/test/application/test_runner_test.rb b/railties/test/application/test_runner_test.rb
index c0027ab9a2..bcd311c461 100644
--- a/railties/test/application/test_runner_test.rb
+++ b/railties/test/application/test_runner_test.rb
@@ -31,12 +31,26 @@ module ApplicationTests
       assert_match "1 runs, 1 assertions, 0 failures", run_test_command("test/models/foo_test.rb")
     end
 
+    def test_run_single_file_with_absolute_path
+      create_test_file :models, "foo"
+      create_test_file :models, "bar"
+      assert_match "1 runs, 1 assertions, 0 failures", run_test_command("#{app_path}/test/models/foo_test.rb")
+    end
+
     def test_run_multiple_files
       create_test_file :models,  "foo"
       create_test_file :models,  "bar"
       assert_match "2 runs, 2 assertions, 0 failures", run_test_command("test/models/foo_test.rb test/models/bar_test.rb")
     end
 
+    def test_run_multiple_files_with_absolute_paths
+      create_test_file :models,  "foo"
+      create_test_file :controllers,  "foobar_controller"
+      create_test_file :models, "bar"
+
+      assert_match "2 runs, 2 assertions, 0 failures", run_test_command("#{app_path}/test/models/foo_test.rb #{app_path}/test/controllers/foobar_controller_test.rb")
+    end
+
     def test_run_file_with_syntax_error
       app_file "test/models/error_test.rb", <<-RUBY
         require 'test_helper'
@@ -264,6 +278,18 @@ module ApplicationTests
       end
     end
 
+    def test_run_multiple_folders_with_absolute_paths
+      create_test_file :models, "account"
+      create_test_file :controllers, "accounts_controller"
+      create_test_file :helpers, "foo_helper"
+
+      run_test_command("#{app_path}/test/models #{app_path}/test/controllers").tap do |output|
+        assert_match "AccountTest", output
+        assert_match "AccountsControllerTest", output
+        assert_match "2 runs, 2 assertions, 0 failures, 0 errors, 0 skips", output
+      end
+    end
+
     def test_run_with_ruby_command
       app_file "test/models/post_test.rb", <<-RUBY
         require 'test_helper'
-- 
cgit v1.2.3


From 65a1733545cee9d426abdb57736e2565a7776ba8 Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Thu, 27 Jul 2017 07:29:38 +0900
Subject: Fix `warning: method redefined;`

This fixes the following warning:

```
/tmp/d20170727-7039-kmdtb1/app/app/models/user.rb:5: warning: method redefined; discarding old model_name
rails/activemodel/lib/active_model/naming.rb:222: warning: previous definition of model_name was here
```
---
 railties/test/application/routing_test.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb
index 6742da20cc..bc7580d6f4 100644
--- a/railties/test/application/routing_test.rb
+++ b/railties/test/application/routing_test.rb
@@ -293,7 +293,7 @@ module ApplicationTests
             extend ActiveModel::Naming
             include ActiveModel::Conversion
 
-            def model_name
+            def self.model_name
               @_model_name ||= ActiveModel::Name.new(self.class, nil, "User")
             end
 
@@ -430,7 +430,7 @@ module ApplicationTests
           extend ActiveModel::Naming
           include ActiveModel::Conversion
 
-          def model_name
+          def self.model_name
             @_model_name ||= ActiveModel::Name.new(self.class, nil, "User")
           end
 
@@ -542,7 +542,7 @@ module ApplicationTests
           extend ActiveModel::Naming
           include ActiveModel::Conversion
 
-          def model_name
+          def self.model_name
             @_model_name ||= ActiveModel::Name.new(self.class, nil, "User")
           end
 
-- 
cgit v1.2.3


From fd7f978a5068921380308fe439af3923566c8f61 Mon Sep 17 00:00:00 2001
From: Alberto Almagro <alberto.almagro@rakuten.com>
Date: Mon, 31 Jul 2017 19:17:47 +0200
Subject: Set Ruby version in Gemfile and .ruby-version by default

---
 railties/test/generators/app_generator_test.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'railties/test')

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index ffdee3a6b5..aec73b6955 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -4,6 +4,7 @@ require "generators/shared_generator_tests"
 
 DEFAULT_APP_FILES = %w(
   .gitignore
+  .ruby-version
   README.md
   Gemfile
   Rakefile
@@ -805,6 +806,17 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
+  def test_inclusion_of_ruby_version
+    run_generator
+
+    assert_file "Gemfile" do |content|
+      assert_match(/ruby '#{RUBY_VERSION}'/, content)
+    end
+    assert_file ".ruby-version" do |content|
+      assert_match(/#{RUBY_VERSION}/, content)
+    end
+  end
+
   def test_version_control_initializes_git_repo
     run_generator [destination_root]
     assert_directory ".git"
-- 
cgit v1.2.3


From 75f87fa99e3c07bfec2719cc24bc1699cd818a70 Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Tue, 1 Aug 2017 07:40:01 +0900
Subject: Remove unnecessary `doc` directory deletion

Since 553b695, `doc` directory is not created in application.
---
 railties/test/generators/plugin_generator_test.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'railties/test')

diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index e8372dea47..1fa40f74b9 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -491,7 +491,6 @@ class PluginGeneratorTest < Rails::Generators::TestCase
     assert_no_file "test/dummy/public/robots.txt"
     assert_no_file "test/dummy/README.md"
     assert_no_directory "test/dummy/lib/tasks"
-    assert_no_directory "test/dummy/doc"
     assert_no_directory "test/dummy/test"
     assert_no_directory "test/dummy/vendor"
     assert_no_directory "test/dummy/.git"
-- 
cgit v1.2.3


From dd439bfbda2a39b305b13f00c40d07c6a8c46d8c Mon Sep 17 00:00:00 2001
From: Lars Kanis <kanis@comcard.de>
Date: Mon, 31 Jul 2017 14:59:11 +0200
Subject: Use duktape gem as default JS engine on Windows-MINGW and MS-Visual-C
 builds

The fallback javascript engine on Windows is Windows Script Host (JScript).
However this engine isn't able to process the default assets, because it supports
ES3 only but the coffeescript compiler requires ES5.

Fixes #30014
---
 railties/test/generators/app_generator_test.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'railties/test')

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index ffdee3a6b5..284c200e35 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -521,6 +521,8 @@ class AppGeneratorTest < Rails::Generators::TestCase
     run_generator
     if defined?(JRUBY_VERSION)
       assert_gem "therubyrhino"
+    elsif RUBY_PLATFORM =~ /mingw|mswin/
+      assert_gem "duktape"
     else
       assert_file "Gemfile", /# gem 'mini_racer', platforms: :ruby/
     end
-- 
cgit v1.2.3