From ccd6f8b931efa7b3eb191a62522fbfc89389b091 Mon Sep 17 00:00:00 2001
From: Tamir Duberstein <tamird@squareup.com>
Date: Tue, 4 Jun 2013 15:01:08 -0700
Subject: make sure both headers are set before checking for ip spoofing

---
 railties/test/application/middleware/remote_ip_test.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'railties/test')

diff --git a/railties/test/application/middleware/remote_ip_test.rb b/railties/test/application/middleware/remote_ip_test.rb
index 91c5807379..946b82eeb3 100644
--- a/railties/test/application/middleware/remote_ip_test.rb
+++ b/railties/test/application/middleware/remote_ip_test.rb
@@ -33,6 +33,16 @@ module ApplicationTests
       end
     end
 
+    test "works with both headers individually" do
+      make_basic_app
+      assert_nothing_raised(ActionDispatch::RemoteIp::IpSpoofAttackError) do
+        assert_equal "1.1.1.1", remote_ip("HTTP_X_FORWARDED_FOR" => "1.1.1.1")
+      end
+      assert_nothing_raised(ActionDispatch::RemoteIp::IpSpoofAttackError) do
+        assert_equal "1.1.1.2", remote_ip("HTTP_CLIENT_IP" => "1.1.1.2")
+      end
+    end
+
     test "can disable IP spoofing check" do
       make_basic_app do |app|
         app.config.action_dispatch.ip_spoofing_check = false
-- 
cgit v1.2.3


From ba5fab4c015366e355ab92371b27e77e896124a4 Mon Sep 17 00:00:00 2001
From: Jon Kessler <jwkpiano1@gmail.com>
Date: Fri, 16 Aug 2013 08:22:08 -0700
Subject: update Rails::Railtie::Configuration and
 ActionDispatch::Response#respond_to? to accept include_private argument

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

(limited to 'railties/test')

diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index c51488e0e1..03a735b1c1 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -679,5 +679,12 @@ module ApplicationTests
       end
       assert_equal Logger::INFO, Rails.logger.level
     end
+
+    test "respond_to? accepts include_private" do
+      make_basic_app
+
+      assert_not Rails.configuration.respond_to?(:method_missing)
+      assert Rails.configuration.respond_to?(:method_missing, true)
+    end
   end
 end
-- 
cgit v1.2.3


From 1385ae138d701174916a3c44d8bc8b92f3dd3aeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@plataformatec.com.br>
Date: Mon, 9 Sep 2013 16:10:41 -0300
Subject: Remove BasicRendering tests

---
 railties/test/application/basic_rendering_test.rb | 62 -----------------------
 1 file changed, 62 deletions(-)
 delete mode 100644 railties/test/application/basic_rendering_test.rb

(limited to 'railties/test')

diff --git a/railties/test/application/basic_rendering_test.rb b/railties/test/application/basic_rendering_test.rb
deleted file mode 100644
index 00ba433a05..0000000000
--- a/railties/test/application/basic_rendering_test.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-require 'isolation/abstract_unit'
-require 'rack/test'
-
-module ApplicationTests
-  class BasicRenderingTest < ActiveSupport::TestCase
-    include ActiveSupport::Testing::Isolation
-    include Rack::Test::Methods
-
-    def setup
-      build_app
-    end
-
-    def teardown
-      teardown_app
-    end
-
-    test "Rendering without ActionView" do
-      gsub_app_file 'config/application.rb', "require 'rails/all'", <<-RUBY
-        require "active_model/railtie"
-        require "action_controller/railtie"
-      RUBY
-
-      # Turn off ActionView and jquery-rails (it depends on AV)
-      $:.reject! {|path| path =~ /(actionview|jquery\-rails)/ }
-      boot_rails
-
-      app_file 'app/controllers/pages_controller.rb', <<-RUBY
-        class PagesController < ApplicationController
-          def render_hello_world
-            render text: "Hello World!"
-          end
-
-          def render_nothing
-            render nothing: true
-          end
-
-          def no_render; end
-
-          def raise_error
-            render foo: "bar"
-          end
-        end
-      RUBY
-
-      get '/pages/render_hello_world'
-      assert_equal 200, last_response.status
-      assert_equal "Hello World!", last_response.body
-      assert_equal "text/plain; charset=utf-8", last_response.content_type
-
-      get '/pages/render_nothing'
-      assert_equal 200, last_response.status
-      assert_equal " ", last_response.body
-      assert_equal "text/plain; charset=utf-8", last_response.content_type
-
-      get '/pages/no_render'
-      assert_equal 500, last_response.status
-
-      get '/pages/raise_error'
-      assert_equal 500, last_response.status
-    end
-  end
-end
-- 
cgit v1.2.3


From 4a36eb64a5d26f4d95df8037a3ecb198a5c0ef78 Mon Sep 17 00:00:00 2001
From: SUGINO Yasuhiro <suginoyasuhiro@gmail.com>
Date: Fri, 13 Sep 2013 17:44:35 +0900
Subject: Fix typos: the indefinite articles(a -> an)

---
 railties/test/application/assets_test.rb                | 4 ++--
 railties/test/application/multiple_applications_test.rb | 2 +-
 railties/test/paths_test.rb                             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 4de8fcaa38..035535ce22 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -293,7 +293,7 @@ module ApplicationTests
 
     test "precompile should handle utf8 filenames" do
       filename = "レイルズ.png"
-      app_file "app/assets/images/#{filename}", "not a image really"
+      app_file "app/assets/images/#{filename}", "not an image really"
       add_to_config "config.assets.precompile = [ /\.png$/, /application.(css|js)$/ ]"
 
       precompile!
@@ -305,7 +305,7 @@ module ApplicationTests
       require "#{app_path}/config/environment"
 
       get "/assets/#{URI.parser.escape(asset_path)}"
-      assert_match "not a image really", last_response.body
+      assert_match "not an image really", last_response.body
       assert_file_exists("#{app_path}/public/assets/#{asset_path}")
     end
 
diff --git a/railties/test/application/multiple_applications_test.rb b/railties/test/application/multiple_applications_test.rb
index 03c343c475..5bfea599e0 100644
--- a/railties/test/application/multiple_applications_test.rb
+++ b/railties/test/application/multiple_applications_test.rb
@@ -110,7 +110,7 @@ module ApplicationTests
 
       assert_equal 0, $run_count, "Without loading the initializers, the count should be 0"
 
-      # Set config.eager_load to false so that a eager_load warning doesn't pop up
+      # Set config.eager_load to false so that an eager_load warning doesn't pop up
       AppTemplate::Application.new { config.eager_load = false }.initialize!
 
       assert_equal 3, $run_count, "There should have been three initializers that incremented the count"
diff --git a/railties/test/paths_test.rb b/railties/test/paths_test.rb
index 12f18b9dbf..178c505865 100644
--- a/railties/test/paths_test.rb
+++ b/railties/test/paths_test.rb
@@ -180,7 +180,7 @@ class PathsTest < ActiveSupport::TestCase
     assert_equal 1, @root.eager_load.select {|p| p == @root["app"].expanded.first }.size
   end
 
-  test "paths added to a eager_load path should be added to the eager_load collection" do
+  test "paths added to an eager_load path should be added to the eager_load collection" do
     @root["app"] = "/app"
     @root["app"].eager_load!
     @root["app"] << "/app2"
-- 
cgit v1.2.3


From 47ac67b8d4f77e22ce1cae5c7bf836b0d6325d1e Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Sat, 7 Sep 2013 22:50:54 +0200
Subject: Don't require using application_name before options

Before this commit options for `rails new` and `rails plugin new` had to
be passed in a strict order, trying to execute a following command:

    rails new -J path/to/app

resulted in an error.

This commit fixes the situation and allows to pass path to app anywhere
after `new`
---
 railties/test/generators/shared_generator_tests.rb | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb
index 369a0ee46c..7184639d23 100644
--- a/railties/test/generators/shared_generator_tests.rb
+++ b/railties/test/generators/shared_generator_tests.rb
@@ -46,11 +46,6 @@ module SharedGeneratorTests
     assert_no_file "test"
   end
 
-  def test_options_before_application_name_raises_an_error
-    content = capture(:stderr){ run_generator(["--pretend", destination_root]) }
-    assert_match(/Options should be given after the \w+ name. For details run: rails( plugin new)? --help\n/, content)
-  end
-
   def test_name_collision_raises_an_error
     reserved_words = %w[application destroy plugin runner test]
     reserved_words.each do |reserved|
-- 
cgit v1.2.3


From 5f98bb402b657f785e6bf1a49e83d44c6d3aa062 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Tue, 18 Jun 2013 15:24:00 -0500
Subject: Only output Server logs in Development

Right now when you start a server via `rails s`, the logger gets extended so that it logs to the file system and also to stdout. This extension behavior is not "intelligent" and if the default logger is already set to output to stdout, then the contents will be received twice.

To capture logs in accordance with http://www.12factor.net/logs some platforms require the logs to be sent to standard out. If a logger is set to stdout, and the server is started using `rails server` instead of another method (i.e. `thin start` etc.) then the app will produce double logs.

This PR fixes the issue by only extending the logger to standard out in the development environment. So that in production you don't get double logs like this:

```
ActionView::Template::Error (wrong number of arguments (5 for 4)):
    1: <% lang_index = 0 %>
    2: <div class="row">
    3:   <ul class="nav nav-tabs nav-stacked span2" data-tabs="tabs" id="repo-tabs">
    4:     <% repos.group_by(&:language).each do |lang, repos| %>
    5:       <% unless lang == nil %>
    6:         <li><a href="#<%= "#{lang.parameterize}#{lang.hash}" %>" data-toggle="tab"><%= lang %></a></li>
    7:       <% end -%>
  app/views/shared/_repos.html.erb:4:in `_app_views_shared__repos_html_erb___1685450633638247395_70300668607000'
  app/views/pages/index.html.erb:13:in `_app_views_pages_index_html_erb__2084723628308867770_70300687584880'

ActionView::Template::Error (wrong number of arguments (5 for 4)):
    1: <% lang_index = 0 %>
    2: <div class="row">
    3:   <ul class="nav nav-tabs nav-stacked span2" data-tabs="tabs" id="repo-tabs">
    4:     <% repos.group_by(&:language).each do |lang, repos| %>
    5:       <% unless lang == nil %>
    6:         <li><a href="#<%= "#{lang.parameterize}#{lang.hash}" %>" data-toggle="tab"><%= lang %></a></li>
    7:       <% end -%>
  app/views/shared/_repos.html.erb:4:in `_app_views_shared__repos_html_erb___1685450633638247395_70300668607000'
  app/views/pages/index.html.erb:13:in `_app_views_pages_index_html_erb__2084723628308867770_70300687584880'
```

ATP Railties. Opened against master in favor of #10999
---
 railties/test/commands/server_test.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'railties/test')

diff --git a/railties/test/commands/server_test.rb b/railties/test/commands/server_test.rb
index cb57b3c0cd..20afca2618 100644
--- a/railties/test/commands/server_test.rb
+++ b/railties/test/commands/server_test.rb
@@ -39,4 +39,14 @@ class Rails::ServerTest < ActiveSupport::TestCase
       assert_equal 'production', server.options[:environment]
     end
   end
+
+  def test_log_stdout
+    args    = ["-e", "development"]
+    options = Rails::Server::Options.new.parse!(args)
+    assert_equal true, options[:log_stdout]
+
+    args    = ["-e", "production"]
+    options = Rails::Server::Options.new.parse!(args)
+    assert_equal false, options[:log_stdout]
+  end
 end
-- 
cgit v1.2.3


From 4de8851289077239ecc91473bdba30f8cf6727bb Mon Sep 17 00:00:00 2001
From: Ben Pickles <spideryoung@gmail.com>
Date: Wed, 9 Oct 2013 11:16:22 +0100
Subject: Expose MiddlewareStack#unshift to environment configuration.

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

(limited to 'railties/test')

diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 31a35a09bb..20d1d76d78 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -144,6 +144,12 @@ module ApplicationTests
       assert_equal "Rack::Config", middleware.second
     end
 
+    test 'unshift middleware' do
+      add_to_config 'config.middleware.unshift Rack::Config'
+      boot!
+      assert_equal 'Rack::Config', middleware.first
+    end
+
     test "Rails.cache does not respond to middleware" do
       add_to_config "config.cache_store = :memory_store"
       boot!
-- 
cgit v1.2.3


From 16c0023a9a14688bbc96d81e809bd26ccf651438 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Sch=C3=BCtz?= <schuetzm@gmx.net>
Date: Sat, 12 Oct 2013 20:27:13 +0200
Subject: Make logging to stdout work again with implicit `development` env

---
 railties/test/commands/server_test.rb | 60 ++++++++++++++++++++++++++++-------
 railties/test/env_helpers.rb          |  4 +++
 2 files changed, 52 insertions(+), 12 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/commands/server_test.rb b/railties/test/commands/server_test.rb
index 20afca2618..ba688f1e9e 100644
--- a/railties/test/commands/server_test.rb
+++ b/railties/test/commands/server_test.rb
@@ -27,26 +27,62 @@ class Rails::ServerTest < ActiveSupport::TestCase
   end
 
   def test_environment_with_rails_env
-    with_rails_env 'production' do
-      server = Rails::Server.new
-      assert_equal 'production', server.options[:environment]
+    with_rack_env nil do
+      with_rails_env 'production' do
+        server = Rails::Server.new
+        assert_equal 'production', server.options[:environment]
+      end
     end
   end
 
   def test_environment_with_rack_env
-    with_rack_env 'production' do
-      server = Rails::Server.new
-      assert_equal 'production', server.options[:environment]
+    with_rails_env nil do
+      with_rack_env 'production' do
+        server = Rails::Server.new
+        assert_equal 'production', server.options[:environment]
+      end
     end
   end
 
   def test_log_stdout
-    args    = ["-e", "development"]
-    options = Rails::Server::Options.new.parse!(args)
-    assert_equal true, options[:log_stdout]
+    with_rack_env nil do
+      with_rails_env nil do
+        args    = []
+        options = Rails::Server::Options.new.parse!(args)
+        assert_equal true, options[:log_stdout]
 
-    args    = ["-e", "production"]
-    options = Rails::Server::Options.new.parse!(args)
-    assert_equal false, options[:log_stdout]
+        args    = ["-e", "development"]
+        options = Rails::Server::Options.new.parse!(args)
+        assert_equal true, options[:log_stdout]
+
+        args    = ["-e", "production"]
+        options = Rails::Server::Options.new.parse!(args)
+        assert_equal false, options[:log_stdout]
+
+        with_rack_env 'development' do
+          args    = []
+          options = Rails::Server::Options.new.parse!(args)
+          assert_equal true, options[:log_stdout]
+        end
+
+        with_rack_env 'production' do
+          args    = []
+          options = Rails::Server::Options.new.parse!(args)
+          assert_equal false, options[:log_stdout]
+        end
+
+        with_rails_env 'development' do
+          args    = []
+          options = Rails::Server::Options.new.parse!(args)
+          assert_equal true, options[:log_stdout]
+        end
+
+        with_rails_env 'production' do
+          args    = []
+          options = Rails::Server::Options.new.parse!(args)
+          assert_equal false, options[:log_stdout]
+        end
+      end
+    end
   end
 end
diff --git a/railties/test/env_helpers.rb b/railties/test/env_helpers.rb
index 6223c85bbf..330fe150ca 100644
--- a/railties/test/env_helpers.rb
+++ b/railties/test/env_helpers.rb
@@ -1,7 +1,10 @@
+require 'rails'
+
 module EnvHelpers
   private
 
   def with_rails_env(env)
+    Rails.instance_variable_set :@_env, nil
     switch_env 'RAILS_ENV', env do
       switch_env 'RACK_ENV', nil do
         yield
@@ -10,6 +13,7 @@ module EnvHelpers
   end
 
   def with_rack_env(env)
+    Rails.instance_variable_set :@_env, nil
     switch_env 'RACK_ENV', env do
       switch_env 'RAILS_ENV', nil do
         yield
-- 
cgit v1.2.3


From 4f642dcb39cea155ddb50978a38fb3a2f2290ea3 Mon Sep 17 00:00:00 2001
From: yalab <rudeboyjet@gmail.com>
Date: Sat, 13 Jul 2013 14:38:00 +0900
Subject: Added --model-name option scaffold_controller_generator.

---
 railties/test/generators/named_base_test.rb           | 19 +++++++++++++++++++
 .../generators/scaffold_controller_generator_test.rb  |  9 +++++++++
 2 files changed, 28 insertions(+)

(limited to 'railties/test')

diff --git a/railties/test/generators/named_base_test.rb b/railties/test/generators/named_base_test.rb
index 2bc2c33a72..ac5cfff229 100644
--- a/railties/test/generators/named_base_test.rb
+++ b/railties/test/generators/named_base_test.rb
@@ -117,6 +117,25 @@ class NamedBaseTest < Rails::Generators::TestCase
     assert Rails::Generators.hidden_namespaces.include?('hidden')
   end
 
+  def test_scaffold_plural_names_with_model_name_option
+    g = generator ['Admin::Foo'], model_name: 'User'
+    assert_name g, 'user',        :singular_name
+    assert_name g, 'User',        :name
+    assert_name g, 'user',        :file_path
+    assert_name g, 'User',        :class_name
+    assert_name g, 'user',        :file_name
+    assert_name g, 'User',        :human_name
+    assert_name g, 'users',       :plural_name
+    assert_name g, 'user',        :i18n_scope
+    assert_name g, 'users',       :table_name
+    assert_name g, 'Admin::Foos', :controller_name
+    assert_name g, %w(admin),     :controller_class_path
+    assert_name g, 'Admin::Foos', :controller_class_name
+    assert_name g, 'admin/foos',  :controller_file_path
+    assert_name g, 'foos',        :controller_file_name
+    assert_name g, 'admin.foos',  :controller_i18n_scope
+  end
+
   protected
 
     def assert_name(generator, value, method)
diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb
index 013cb78252..26e56a162c 100644
--- a/railties/test/generators/scaffold_controller_generator_test.rb
+++ b/railties/test/generators/scaffold_controller_generator_test.rb
@@ -166,4 +166,13 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
       assert_match(/render action: 'new'/, content)
     end
   end
+
+  def test_model_name_option
+    run_generator ["Admin::User", "--model-name=User"]
+    assert_file "app/controllers/admin/users_controller.rb" do |content|
+      assert_instance_method :index, content do |m|
+        assert_match("@users = User.all", m)
+      end
+    end
+  end
 end
-- 
cgit v1.2.3


From 52b252614e275da799b6a15cebbfd067c59987d1 Mon Sep 17 00:00:00 2001
From: Robin Dupret <robin.dupret@gmail.com>
Date: Tue, 22 Oct 2013 13:17:52 +0200
Subject: Make the application name snake cased when it contains spaces

The application name is used to fill the `database.yml` and
`session_store.rb` files ; previously, if the provided name contained
whitespaces, it led to unexpected names in these files.

Since Shellwords.escape adds backslashes to escape spaces, the app_name
should remove them and replace any space with an underscore (just like
periods previously).

Also improve the assert_file helper to work with paths containing spaces
using String#shellescape.
---
 railties/test/generators/app_generator_test.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'railties/test')

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 2f0dfc7d3e..24f01c878c 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -367,6 +367,16 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_no_match(/run  bundle install/, output)
   end
 
+  def test_application_name_with_spaces
+    path = File.join(destination_root, "foo bar".shellescape)
+
+    # This also applies to MySQL apps but not with SQLite
+    run_generator [path, "-d", 'postgresql']
+
+    assert_file "foo bar/config/database.yml", /database: foo_bar_development/
+    assert_file "foo bar/config/initializers/session_store.rb", /key: '_foo_bar/
+  end
+
 protected
 
   def action(*args, &block)
-- 
cgit v1.2.3


From 84e261b9309d362a210ed55941f2852ec4230038 Mon Sep 17 00:00:00 2001
From: Robin Dupret <robin.dupret@gmail.com>
Date: Sun, 27 Oct 2013 10:43:17 +0100
Subject: Removal of javascript related gems when creating an app

Commit 0417bc8 add the coffee-rails and javascript runtime gems even
when passing the --skip-javascript option but this is not the desired
behavior.

Also remove all javascript related stuff in the generated application
such as the vendor/assets/javascripts folder.
---
 railties/test/generators/app_generator_test.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 24f01c878c..9b0c9ebf5b 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -298,15 +298,17 @@ class AppGeneratorTest < Rails::Generators::TestCase
 
   def test_javascript_is_skipped_if_required
     run_generator [destination_root, "--skip-javascript"]
-    assert_file "app/assets/javascripts/application.js" do |contents|
-      assert_no_match %r{^//=\s+require\s}, contents
-    end
+
+    assert_no_file "app/assets/javascripts"
+    assert_no_file "vendor/assets/javascripts"
+
     assert_file "app/views/layouts/application.html.erb" do |contents|
       assert_match(/stylesheet_link_tag\s+"application", media: "all" %>/, contents)
-      assert_match(/javascript_include_tag\s+"application" \%>/, contents)
+      assert_no_match(/javascript_include_tag\s+"application" \%>/, contents)
     end
+
     assert_file "Gemfile" do |content|
-      assert_match(/coffee-rails/, content)
+      assert_no_match(/coffee-rails/, content)
     end
   end
 
-- 
cgit v1.2.3


From 97ac5ed2a7812bc9b323de84a646165a311271d4 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sun, 27 Oct 2013 23:07:10 +0100
Subject: Fixed tests for app_generator

Added test for jbuilder and web-console inclusion.

Added README.rdoc for test default files
---
 railties/test/generators/app_generator_test.rb | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 9b0c9ebf5b..39d4acb7b2 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
+  README.rdoc
   Gemfile
   Rakefile
   config.ru
@@ -254,7 +255,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
     if defined?(JRUBY_VERSION)
       assert_gem "therubyrhino"
     else
-      assert_file "Gemfile", /# gem\s+["']therubyracer["']+, platforms: :ruby$/
+      assert_file "Gemfile", /# gem\s+["']therubyracer["']+, \s+platforms: :ruby$/
     end
   end
 
@@ -312,6 +313,16 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
+  def test_inclusion_of_web_console
+    run_generator
+    assert_file "Gemfile", /gem 'web-console', \s+group: :development/
+  end
+
+  def test_inclusion_of_jbuilder
+    run_generator
+    assert_file "Gemfile", /gem 'jbuilder'/
+  end
+
   def test_inclusion_of_debugger
     run_generator
     assert_file "Gemfile", /# gem 'debugger'/
@@ -319,7 +330,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
 
   def test_inclusion_of_lazy_loaded_sdoc
     run_generator
-    assert_file 'Gemfile', /gem 'sdoc', require: false/
+    assert_file 'Gemfile', /gem 'sdoc', \s+group: :doc, require: false/
   end
 
   def test_template_from_dir_pwd
-- 
cgit v1.2.3


From 9696073b2db210745738c8328a6524ea6dc57fff Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 30 Oct 2013 15:03:34 -0700
Subject: forgot the test, oops!

---
 railties/test/generators/argv_scrubber_test.rb | 36 ++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 railties/test/generators/argv_scrubber_test.rb

(limited to 'railties/test')

diff --git a/railties/test/generators/argv_scrubber_test.rb b/railties/test/generators/argv_scrubber_test.rb
new file mode 100644
index 0000000000..9fd1112f18
--- /dev/null
+++ b/railties/test/generators/argv_scrubber_test.rb
@@ -0,0 +1,36 @@
+require 'active_support/test_case'
+require 'active_support/testing/autorun'
+require 'rails/generators/rails/app/app_generator'
+
+module Rails
+  module Generators
+    class ARGVScrubberTest < ActiveSupport::TestCase
+      def test_version
+        ['-v', '--version'].each do |str|
+          scrubber = ARGVScrubber.new [str]
+          output    = nil
+          exit_code = nil
+          scrubber.extend(Module.new {
+            define_method(:puts) { |str| output = str }
+            define_method(:exit) { |code| exit_code = code }
+          })
+          scrubber.prepare
+          assert_equal "Rails #{Rails::VERSION::STRING}", output
+          assert_equal 0, exit_code
+        end
+      end
+
+      def test_prepare_returns_args
+        scrubber = ARGVScrubber.new ['hi mom']
+        args = scrubber.prepare
+        assert_equal '--help', args.first
+      end
+
+      def test_no_mutations
+        scrubber = ARGVScrubber.new ['hi mom'].freeze
+        args = scrubber.prepare
+        assert_equal '--help', args.first
+      end
+    end
+  end
+end
-- 
cgit v1.2.3


From 3060dfce5a45dac0d19ec3d73af3cdebdf0bb20e Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 30 Oct 2013 15:29:01 -0700
Subject: test some of the rc specification

---
 railties/test/generators/argv_scrubber_test.rb | 46 ++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 3 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/generators/argv_scrubber_test.rb b/railties/test/generators/argv_scrubber_test.rb
index 9fd1112f18..5bf8442074 100644
--- a/railties/test/generators/argv_scrubber_test.rb
+++ b/railties/test/generators/argv_scrubber_test.rb
@@ -1,6 +1,7 @@
 require 'active_support/test_case'
 require 'active_support/testing/autorun'
 require 'rails/generators/rails/app/app_generator'
+require 'tempfile'
 
 module Rails
   module Generators
@@ -14,7 +15,7 @@ module Rails
             define_method(:puts) { |str| output = str }
             define_method(:exit) { |code| exit_code = code }
           })
-          scrubber.prepare
+          scrubber.prepare!
           assert_equal "Rails #{Rails::VERSION::STRING}", output
           assert_equal 0, exit_code
         end
@@ -22,15 +23,54 @@ module Rails
 
       def test_prepare_returns_args
         scrubber = ARGVScrubber.new ['hi mom']
-        args = scrubber.prepare
+        args = scrubber.prepare!
         assert_equal '--help', args.first
       end
 
       def test_no_mutations
         scrubber = ARGVScrubber.new ['hi mom'].freeze
-        args = scrubber.prepare
+        args = scrubber.prepare!
         assert_equal '--help', args.first
       end
+
+      def test_new_command_no_rc
+        scrubber = Class.new(ARGVScrubber) {
+          def self.default_rc_file
+            File.join(Dir.tmpdir, 'whatever')
+          end
+        }.new ['new']
+        args = scrubber.prepare!
+        assert_nil args.first
+        assert_equal [], args
+      end
+
+      def test_new_homedir_rc
+        file = Tempfile.new 'myrcfile'
+        file.puts '--hello-world'
+        file.flush
+
+        message = nil
+        scrubber = Class.new(ARGVScrubber) {
+          define_singleton_method(:default_rc_file) do
+            file.path
+          end
+          define_method(:puts) { |msg| message = msg }
+        }.new ['new']
+        args = scrubber.prepare!
+        assert_nil args.first
+        assert_equal [nil, '--hello-world'], args
+        assert_match 'hello-world', message
+        assert_match file.path, message
+      ensure
+        file.close
+        file.unlink
+      end
+
+      def test_no_rc
+        scrubber = ARGVScrubber.new ['new', '--no-rc']
+        args = scrubber.prepare!
+        assert_equal [], args
+      end
     end
   end
 end
-- 
cgit v1.2.3


From 327c6023cdf17cd1ac557d5db5bccf92dd681292 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 30 Oct 2013 15:31:14 -0700
Subject: remove useless assertions

---
 railties/test/generators/argv_scrubber_test.rb | 2 --
 1 file changed, 2 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/generators/argv_scrubber_test.rb b/railties/test/generators/argv_scrubber_test.rb
index 5bf8442074..26b33740c8 100644
--- a/railties/test/generators/argv_scrubber_test.rb
+++ b/railties/test/generators/argv_scrubber_test.rb
@@ -40,7 +40,6 @@ module Rails
           end
         }.new ['new']
         args = scrubber.prepare!
-        assert_nil args.first
         assert_equal [], args
       end
 
@@ -57,7 +56,6 @@ module Rails
           define_method(:puts) { |msg| message = msg }
         }.new ['new']
         args = scrubber.prepare!
-        assert_nil args.first
         assert_equal [nil, '--hello-world'], args
         assert_match 'hello-world', message
         assert_match file.path, message
-- 
cgit v1.2.3


From 2f11668eb844f6d7d64eaf4b4856d8a8b41e3a0c Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 30 Oct 2013 15:33:46 -0700
Subject: add a test for the rc commandline option

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

(limited to 'railties/test')

diff --git a/railties/test/generators/argv_scrubber_test.rb b/railties/test/generators/argv_scrubber_test.rb
index 26b33740c8..2d2e81bf2c 100644
--- a/railties/test/generators/argv_scrubber_test.rb
+++ b/railties/test/generators/argv_scrubber_test.rb
@@ -64,6 +64,24 @@ module Rails
         file.unlink
       end
 
+      def test_new_rc_option
+        file = Tempfile.new 'myrcfile'
+        file.puts '--hello-world'
+        file.flush
+
+        message = nil
+        scrubber = Class.new(ARGVScrubber) {
+          define_method(:puts) { |msg| message = msg }
+        }.new ['new', "--rc=#{file.path}"]
+        args = scrubber.prepare!
+        assert_equal [nil, '--hello-world'], args
+        assert_match 'hello-world', message
+        assert_match file.path, message
+      ensure
+        file.close
+        file.unlink
+      end
+
       def test_no_rc
         scrubber = ARGVScrubber.new ['new', '--no-rc']
         args = scrubber.prepare!
-- 
cgit v1.2.3


From 7d01907f95ec2fdbf1b5641987396193277e64c3 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 30 Oct 2013 15:41:09 -0700
Subject: adding a test for the current behavior

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

(limited to 'railties/test')

diff --git a/railties/test/generators/argv_scrubber_test.rb b/railties/test/generators/argv_scrubber_test.rb
index 2d2e81bf2c..6030139d88 100644
--- a/railties/test/generators/argv_scrubber_test.rb
+++ b/railties/test/generators/argv_scrubber_test.rb
@@ -82,6 +82,24 @@ module Rails
         file.unlink
       end
 
+      def test_new_rc_option_and_custom_options
+        file = Tempfile.new 'myrcfile'
+        file.puts '--hello-world'
+        file.flush
+
+        message = nil
+        scrubber = Class.new(ARGVScrubber) {
+          define_method(:puts) { |msg| message = msg }
+        }.new ['new', '--tender', '--love', "--rc=#{file.path}"]
+        args = scrubber.prepare!
+        assert_equal ['--tender', '--hello-world', '--love'], args
+        assert_match 'hello-world', message
+        assert_match file.path, message
+      ensure
+        file.close
+        file.unlink
+      end
+
       def test_no_rc
         scrubber = ARGVScrubber.new ['new', '--no-rc']
         args = scrubber.prepare!
-- 
cgit v1.2.3


From 169fa516c3178077eb9a35fa757063de936be53c Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 30 Oct 2013 15:49:47 -0700
Subject: change the test to make argv a little more realistic

---
 railties/test/generators/argv_scrubber_test.rb | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/generators/argv_scrubber_test.rb b/railties/test/generators/argv_scrubber_test.rb
index 6030139d88..97aa1bce52 100644
--- a/railties/test/generators/argv_scrubber_test.rb
+++ b/railties/test/generators/argv_scrubber_test.rb
@@ -84,17 +84,16 @@ module Rails
 
       def test_new_rc_option_and_custom_options
         file = Tempfile.new 'myrcfile'
-        file.puts '--hello-world'
+        file.puts '--hello'
+        file.puts '--world'
         file.flush
 
-        message = nil
         scrubber = Class.new(ARGVScrubber) {
-          define_method(:puts) { |msg| message = msg }
-        }.new ['new', '--tender', '--love', "--rc=#{file.path}"]
+          define_method(:puts) { |msg| }
+        }.new ['new', 'tenderapp', '--love', "--rc=#{file.path}"]
+
         args = scrubber.prepare!
-        assert_equal ['--tender', '--hello-world', '--love'], args
-        assert_match 'hello-world', message
-        assert_match file.path, message
+        assert_equal ["tenderapp", "--hello", "--world", "--love"], args
       ensure
         file.close
         file.unlink
-- 
cgit v1.2.3


From baaf9acaa7f4131c25be13c133eb6d958a88a571 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 30 Oct 2013 16:12:40 -0700
Subject: adding a test for --help defaults

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

(limited to 'railties/test')

diff --git a/railties/test/generators/argv_scrubber_test.rb b/railties/test/generators/argv_scrubber_test.rb
index 97aa1bce52..5b0a023428 100644
--- a/railties/test/generators/argv_scrubber_test.rb
+++ b/railties/test/generators/argv_scrubber_test.rb
@@ -21,6 +21,13 @@ module Rails
         end
       end
 
+      def test_default_help
+        argv = ['zomg', 'how', 'are', 'you']
+        scrubber = ARGVScrubber.new argv
+        args = scrubber.prepare!
+        assert_equal ['--help'] + argv.drop(1), args
+      end
+
       def test_prepare_returns_args
         scrubber = ARGVScrubber.new ['hi mom']
         args = scrubber.prepare!
-- 
cgit v1.2.3


From a27d2d74f25110e4ebd8d44dc7fd1f44c103ca9e Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 30 Oct 2013 16:14:02 -0700
Subject: add a comment to people of the future

---
 railties/test/generators/argv_scrubber_test.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'railties/test')

diff --git a/railties/test/generators/argv_scrubber_test.rb b/railties/test/generators/argv_scrubber_test.rb
index 5b0a023428..5e86acfde5 100644
--- a/railties/test/generators/argv_scrubber_test.rb
+++ b/railties/test/generators/argv_scrubber_test.rb
@@ -5,7 +5,11 @@ require 'tempfile'
 
 module Rails
   module Generators
-    class ARGVScrubberTest < ActiveSupport::TestCase
+    class ARGVScrubberTest < ActiveSupport::TestCase # :nodoc:
+      # Future people who read this... These tests are just to surround the
+      # current behavior of the ARGVScrubber, they do not mean that the class
+      # *must* act this way, I just want to prevent regressions.
+
       def test_version
         ['-v', '--version'].each do |str|
           scrubber = ARGVScrubber.new [str]
-- 
cgit v1.2.3


From 19ca0952bbdcf744f12d2bedb267dff20618e149 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 30 Oct 2013 16:37:33 -0700
Subject: there is no reason for ARGV[0] to be nil

---
 railties/test/generators/argv_scrubber_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/generators/argv_scrubber_test.rb b/railties/test/generators/argv_scrubber_test.rb
index 5e86acfde5..56df1cec02 100644
--- a/railties/test/generators/argv_scrubber_test.rb
+++ b/railties/test/generators/argv_scrubber_test.rb
@@ -67,7 +67,7 @@ module Rails
           define_method(:puts) { |msg| message = msg }
         }.new ['new']
         args = scrubber.prepare!
-        assert_equal [nil, '--hello-world'], args
+        assert_equal ['--hello-world'], args
         assert_match 'hello-world', message
         assert_match file.path, message
       ensure
@@ -85,7 +85,7 @@ module Rails
           define_method(:puts) { |msg| message = msg }
         }.new ['new', "--rc=#{file.path}"]
         args = scrubber.prepare!
-        assert_equal [nil, '--hello-world'], args
+        assert_equal ['--hello-world'], args
         assert_match 'hello-world', message
         assert_match file.path, message
       ensure
-- 
cgit v1.2.3


From 9bc99b4fe5fb23f447483a3b031026cc121f2ab8 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 30 Oct 2013 16:53:08 -0700
Subject: add a test for whitespace separated args in the rc file

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

(limited to 'railties/test')

diff --git a/railties/test/generators/argv_scrubber_test.rb b/railties/test/generators/argv_scrubber_test.rb
index 56df1cec02..a94350cbd7 100644
--- a/railties/test/generators/argv_scrubber_test.rb
+++ b/railties/test/generators/argv_scrubber_test.rb
@@ -75,6 +75,22 @@ module Rails
         file.unlink
       end
 
+      def test_rc_whitespace_separated
+        file = Tempfile.new 'myrcfile'
+        file.puts '--hello --world'
+        file.flush
+
+        message = nil
+        scrubber = Class.new(ARGVScrubber) {
+          define_method(:puts) { |msg| message = msg }
+        }.new ['new', "--rc=#{file.path}"]
+        args = scrubber.prepare!
+        assert_equal ['--hello', '--world'], args
+      ensure
+        file.close
+        file.unlink
+      end
+
       def test_new_rc_option
         file = Tempfile.new 'myrcfile'
         file.puts '--hello-world'
-- 
cgit v1.2.3


From 90ace1b9863675f26a0b9fce4de3b95388cd1a35 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 31 Oct 2013 11:48:12 -0700
Subject: forgot to add the test. orz :cry:

---
 railties/test/generators/generator_test.rb | 50 ++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 railties/test/generators/generator_test.rb

(limited to 'railties/test')

diff --git a/railties/test/generators/generator_test.rb b/railties/test/generators/generator_test.rb
new file mode 100644
index 0000000000..7600a40ae9
--- /dev/null
+++ b/railties/test/generators/generator_test.rb
@@ -0,0 +1,50 @@
+require 'active_support/test_case'
+require 'active_support/testing/autorun'
+require 'rails/generators/app_base'
+
+module Rails
+  module Generators
+    class GeneratorTest < ActiveSupport::TestCase
+      def make_builder_class
+        klass = Class.new(AppBase) do
+          add_shared_options_for "application"
+
+          # include a module to get around thor's method_added hook
+          include(Module.new {
+            def gemfile_entries; super; end
+            def invoke_all; super; self; end
+            def add_gem_entry_filter; super; end
+          })
+        end
+      end
+
+      def test_construction
+        klass     = make_builder_class
+        assert klass.start(['new', 'blah'])
+      end
+
+      def test_filter
+        klass     = make_builder_class
+        generator = klass.start(['new', 'blah'])
+        gems      = generator.gemfile_entries
+        generator.add_gem_entry_filter { |gem|
+          gem.name != gems.first.name
+        }
+        assert_equal gems.drop(1), generator.gemfile_entries
+      end
+
+      def test_two_filters
+        klass     = make_builder_class
+        generator = klass.start(['new', 'blah'])
+        gems      = generator.gemfile_entries
+        generator.add_gem_entry_filter { |gem|
+          gem.name != gems.first.name
+        }
+        generator.add_gem_entry_filter { |gem|
+          gem.name != gems[1].name
+        }
+        assert_equal gems.drop(2), generator.gemfile_entries
+      end
+    end
+  end
+end
-- 
cgit v1.2.3


From 3f2230b9ece12b93f9bd6da0e1532b8771aad886 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 31 Oct 2013 14:59:56 -0700
Subject: gemfile entries can be added to the app builder

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

(limited to 'railties/test')

diff --git a/railties/test/generators/generator_test.rb b/railties/test/generators/generator_test.rb
index 7600a40ae9..dd4868585b 100644
--- a/railties/test/generators/generator_test.rb
+++ b/railties/test/generators/generator_test.rb
@@ -14,6 +14,7 @@ module Rails
             def gemfile_entries; super; end
             def invoke_all; super; self; end
             def add_gem_entry_filter; super; end
+            def gemfile_entry(*args); super; end
           })
         end
       end
@@ -23,6 +24,40 @@ module Rails
         assert klass.start(['new', 'blah'])
       end
 
+      def test_add_gem
+        klass = make_builder_class
+        generator = klass.start(['new', 'blah'])
+        generator.gemfile_entry 'tenderlove'
+        assert_includes generator.gemfile_entries.map(&:name), 'tenderlove'
+      end
+
+      def test_add_gem_with_version
+        klass = make_builder_class
+        generator = klass.start(['new', 'blah'])
+        generator.gemfile_entry 'tenderlove', '2.0.0'
+        assert generator.gemfile_entries.find { |gfe|
+          gfe.name == 'tenderlove' && gfe.version == '2.0.0'
+        }
+      end
+
+      def test_add_github_gem
+        klass = make_builder_class
+        generator = klass.start(['new', 'blah'])
+        generator.gemfile_entry 'tenderlove', github: 'hello world'
+        assert generator.gemfile_entries.find { |gfe|
+          gfe.name == 'tenderlove' && gfe.options[:github] == 'hello world'
+        }
+      end
+
+      def test_add_path_gem
+        klass = make_builder_class
+        generator = klass.start(['new', 'blah'])
+        generator.gemfile_entry 'tenderlove', path: 'hello world'
+        assert generator.gemfile_entries.find { |gfe|
+          gfe.name == 'tenderlove' && gfe.options[:path] == 'hello world'
+        }
+      end
+
       def test_filter
         klass     = make_builder_class
         generator = klass.start(['new', 'blah'])
-- 
cgit v1.2.3


From e42fb393c25e80a423e75e598e6988a0a35389b9 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Fri, 1 Nov 2013 11:11:52 +0100
Subject: Passing args for gemfile entry

Fixing build
---
 railties/test/generators/generator_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/test')

diff --git a/railties/test/generators/generator_test.rb b/railties/test/generators/generator_test.rb
index dd4868585b..7871399dd7 100644
--- a/railties/test/generators/generator_test.rb
+++ b/railties/test/generators/generator_test.rb
@@ -6,7 +6,7 @@ module Rails
   module Generators
     class GeneratorTest < ActiveSupport::TestCase
       def make_builder_class
-        klass = Class.new(AppBase) do
+        Class.new(AppBase) do
           add_shared_options_for "application"
 
           # include a module to get around thor's method_added hook
-- 
cgit v1.2.3


From c10a78124c1c32f8ce3a92888863b9b258efcc06 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Fri, 1 Nov 2013 10:39:06 +0100
Subject: More Warnings removed for ruby trunk

Same as 4d4ff531b8807ee88a3fc46875c7e76f613956fb
---
 railties/test/application/assets_test.rb   |  2 +-
 railties/test/application/rake/dbs_test.rb |  4 ++--
 railties/test/application/rake_test.rb     | 10 +++++-----
 railties/test/generators_test.rb           |  4 ++--
 railties/test/railties/engine_test.rb      |  6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 035535ce22..b235b51d90 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -37,7 +37,7 @@ module ApplicationTests
     end
 
     def assert_no_file_exists(filename)
-      assert !File.exists?(filename), "#{filename} does exist"
+      assert !File.exist?(filename), "#{filename} does exist"
     end
 
     test "assets routes have higher priority" do
diff --git a/railties/test/application/rake/dbs_test.rb b/railties/test/application/rake/dbs_test.rb
index 9e711f25bd..4d348c6b4b 100644
--- a/railties/test/application/rake/dbs_test.rb
+++ b/railties/test/application/rake/dbs_test.rb
@@ -33,12 +33,12 @@ module ApplicationTests
         Dir.chdir(app_path) do
           output = `bundle exec rake db:create`
           assert_equal output, ""
-          assert File.exists?(expected[:database])
+          assert File.exist?(expected[:database])
           assert_equal expected[:database],
                         ActiveRecord::Base.connection_config[:database]
           output = `bundle exec rake db:drop`
           assert_equal output, ""
-          assert !File.exists?(expected[:database])
+          assert !File.exist?(expected[:database])
         end
       end
 
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index c1cb1c1eba..2169304aa4 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -227,7 +227,7 @@ module ApplicationTests
         # ensure we have a schema_migrations table to dump
         `bundle exec rake db:migrate db:structure:dump DB_STRUCTURE=db/my_structure.sql`
       end
-      assert File.exists?(File.join(app_path, 'db', 'my_structure.sql'))
+      assert File.exist?(File.join(app_path, 'db', 'my_structure.sql'))
     end
 
     def test_rake_dump_structure_should_be_called_twice_when_migrate_redo
@@ -248,24 +248,24 @@ module ApplicationTests
          rails generate model product name:string;
          bundle exec rake db:migrate db:schema:cache:dump`
       end
-      assert File.exists?(File.join(app_path, 'db', 'schema_cache.dump'))
+      assert File.exist?(File.join(app_path, 'db', 'schema_cache.dump'))
     end
 
     def test_rake_clear_schema_cache
       Dir.chdir(app_path) do
         `bundle exec rake db:schema:cache:dump db:schema:cache:clear`
       end
-      assert !File.exists?(File.join(app_path, 'db', 'schema_cache.dump'))
+      assert !File.exist?(File.join(app_path, 'db', 'schema_cache.dump'))
     end
 
     def test_copy_templates
       Dir.chdir(app_path) do
         `bundle exec rake rails:templates:copy`
         %w(controller mailer scaffold).each do |dir|
-          assert File.exists?(File.join(app_path, 'lib', 'templates', 'erb', dir))
+          assert File.exist?(File.join(app_path, 'lib', 'templates', 'erb', dir))
         end
         %w(controller helper scaffold_controller assets).each do |dir|
-          assert File.exists?(File.join(app_path, 'lib', 'templates', 'rails', dir))
+          assert File.exist?(File.join(app_path, 'lib', 'templates', 'rails', dir))
         end
       end
     end
diff --git a/railties/test/generators_test.rb b/railties/test/generators_test.rb
index 5130b285a9..eac28badfe 100644
--- a/railties/test/generators_test.rb
+++ b/railties/test/generators_test.rb
@@ -15,7 +15,7 @@ class GeneratorsTest < Rails::Generators::TestCase
   end
 
   def test_simple_invoke
-    assert File.exists?(File.join(@path, 'generators', 'model_generator.rb'))
+    assert File.exist?(File.join(@path, 'generators', 'model_generator.rb'))
     TestUnit::Generators::ModelGenerator.expects(:start).with(["Account"], {})
     Rails::Generators.invoke("test_unit:model", ["Account"])
   end
@@ -31,7 +31,7 @@ class GeneratorsTest < Rails::Generators::TestCase
   end
 
   def test_should_give_higher_preference_to_rails_generators
-    assert File.exists?(File.join(@path, 'generators', 'model_generator.rb'))
+    assert File.exist?(File.join(@path, 'generators', 'model_generator.rb'))
     Rails::Generators::ModelGenerator.expects(:start).with(["Account"], {})
     warnings = capture(:stderr){ Rails::Generators.invoke :model, ["Account"] }
     assert warnings.empty?
diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index d095535abd..3075ffee0d 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -90,8 +90,8 @@ module RailtiesTest
       Dir.chdir(app_path) do
         output = `bundle exec rake bukkits:install:migrations`
 
-        assert File.exists?("#{app_path}/db/migrate/2_create_users.bukkits.rb")
-        assert File.exists?("#{app_path}/db/migrate/3_add_last_name_to_users.bukkits.rb")
+        assert File.exist?("#{app_path}/db/migrate/2_create_users.bukkits.rb")
+        assert File.exist?("#{app_path}/db/migrate/3_add_last_name_to_users.bukkits.rb")
         assert_match(/Copied migration 2_create_users.bukkits.rb from bukkits/, output)
         assert_match(/Copied migration 3_add_last_name_to_users.bukkits.rb from bukkits/, output)
         assert_match(/NOTE: Migration 3_create_sessions.rb from bukkits has been skipped/, output)
@@ -136,7 +136,7 @@ module RailtiesTest
 
       Dir.chdir(@plugin.path) do
         output = `bundle exec rake app:bukkits:install:migrations`
-        assert File.exists?("#{app_path}/db/migrate/0_add_first_name_to_users.bukkits.rb")
+        assert File.exist?("#{app_path}/db/migrate/0_add_first_name_to_users.bukkits.rb")
         assert_match(/Copied migration 0_add_first_name_to_users.bukkits.rb from bukkits/, output)
         assert_equal 1, Dir["#{app_path}/db/migrate/*.rb"].length
       end
-- 
cgit v1.2.3


From bca36b080b77089cb8b2e8269c6be3b975171216 Mon Sep 17 00:00:00 2001
From: Robin Dupret <robin.dupret@gmail.com>
Date: Fri, 1 Nov 2013 14:42:12 +0100
Subject: Fix some failing tests for Rails::Paths

Since we are not using the File.exists? alias which raises a warning on
current ruby trunk, few stubs are wrong.
---
 railties/test/app_rails_loader_test.rb | 4 ++--
 railties/test/paths_test.rb            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/app_rails_loader_test.rb b/railties/test/app_rails_loader_test.rb
index ceae78ae80..92cb3233d8 100644
--- a/railties/test/app_rails_loader_test.rb
+++ b/railties/test/app_rails_loader_test.rb
@@ -22,8 +22,8 @@ class AppRailsLoaderTest < ActiveSupport::TestCase
     exe = "#{script_dir}/rails"
 
     test "is not in a Rails application if #{exe} is not found in the current or parent directories" do
-      File.stubs(:exists?).with('bin/rails').returns(false)
-      File.stubs(:exists?).with('script/rails').returns(false)
+      File.stubs(:exist?).with('bin/rails').returns(false)
+      File.stubs(:exist?).with('script/rails').returns(false)
 
       assert !Rails::AppRailsLoader.exec_app_rails
     end
diff --git a/railties/test/paths_test.rb b/railties/test/paths_test.rb
index 178c505865..ed4559ec6f 100644
--- a/railties/test/paths_test.rb
+++ b/railties/test/paths_test.rb
@@ -3,7 +3,7 @@ require 'rails/paths'
 
 class PathsTest < ActiveSupport::TestCase
   def setup
-    File.stubs(:exists?).returns(true)
+    File.stubs(:exist?).returns(true)
     @root = Rails::Paths::Root.new("/foo/bar")
   end
 
-- 
cgit v1.2.3


From fae08dd9ca917c09a136d68065a2ea59ae35a6ea Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sun, 3 Nov 2013 22:11:50 +0100
Subject: No web-console for now

---
 railties/test/generators/app_generator_test.rb | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 39d4acb7b2..cbcfe48f71 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -313,11 +313,6 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
-  def test_inclusion_of_web_console
-    run_generator
-    assert_file "Gemfile", /gem 'web-console', \s+group: :development/
-  end
-
   def test_inclusion_of_jbuilder
     run_generator
     assert_file "Gemfile", /gem 'jbuilder'/
-- 
cgit v1.2.3


From 84eac5dab8b0fe9ee20b51250e52ad7bfea36553 Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Mon, 28 Oct 2013 13:44:17 +0100
Subject: BACKTRACE environment variable to show unfiltered backtraces.

We used to support the `BACKTRACE` environment variable but when
we switched to MiniTest it got removed: f9382cd7948

This commit adds back the functionality to show the unfiltered backtrace when needed.
This also works when you run your tests with `rake`:

* `BACKTRACE=1 bin/rake test`
* `BACKTRACE=1 ruby -Itest ...`
---
 railties/test/application/test_test.rb | 39 +++++++++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 5 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/application/test_test.rb b/railties/test/application/test_test.rb
index c7ad2fba8f..6f2f328588 100644
--- a/railties/test/application/test_test.rb
+++ b/railties/test/application/test_test.rb
@@ -24,7 +24,7 @@ module ApplicationTests
         end
       RUBY
 
-      run_test_file 'unit/foo_test.rb'
+      assert_successful_test_run 'unit/foo_test.rb'
     end
 
     test "integration test" do
@@ -49,19 +49,48 @@ module ApplicationTests
         end
       RUBY
 
-      run_test_file 'integration/posts_test.rb'
+      assert_successful_test_run 'integration/posts_test.rb'
+    end
+
+    test "enable full backtraces on test failures" do
+      app_file 'test/unit/failing_test.rb', <<-RUBY
+        require 'test_helper'
+
+        class FailingTest < ActiveSupport::TestCase
+          def test_failure
+            raise "fail"
+          end
+        end
+      RUBY
+
+      output = run_test_file('unit/failing_test.rb', env: { "BACKTRACE" => "1" })
+      assert_match %r{/app/test/unit/failing_test\.rb}, output
     end
 
     private
-      def run_test_file(name)
-        result = ruby '-Itest', "#{app_path}/test/#{name}"
+      def assert_successful_test_run(name)
+        result = run_test_file(name)
         assert_equal 0, $?.to_i, result
       end
 
+      def run_test_file(name, options = {})
+        ruby '-Itest', "#{app_path}/test/#{name}", options
+      end
+
       def ruby(*args)
+        options = args.extract_options!
+        env = options.fetch(:env, {})
+        env["RUBYLIB"] = $:.join(':')
+
         Dir.chdir(app_path) do
-          `RUBYLIB='#{$:.join(':')}' #{Gem.ruby} #{args.join(' ')}`
+          `#{env_string(env)} #{Gem.ruby} #{args.join(' ')}`
         end
       end
+
+      def env_string(variables)
+        variables.map do |key, value|
+          "#{key}='#{value}'"
+        end.join " "
+      end
   end
 end
-- 
cgit v1.2.3


From 8beb42cfbc41753ae4dbb91e16abcd1fb7d00356 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 4 Nov 2013 14:55:21 -0800
Subject: gems can be added or skipped from the template

---
 railties/test/generators/app_generator_test.rb | 26 ++++++++++++++++++++++++++
 railties/test/generators/generator_test.rb     |  1 +
 2 files changed, 27 insertions(+)

(limited to 'railties/test')

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index cbcfe48f71..bd8efcc6c7 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -156,6 +156,32 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
+  def test_add_gemfile_entry
+    template = Tempfile.open 'my_template'
+    template.puts 'gemfile_entry "tenderlove"'
+    template.flush
+
+    run_generator([destination_root, "-m", template.path])
+    assert_file "Gemfile", /tenderlove/
+  ensure
+    template.close
+    template.unlink
+  end
+
+  def test_add_skip_entry
+    template = Tempfile.open 'my_template'
+    template.puts 'add_gem_entry_filter { |gem| gem.name != "jbuilder" }'
+    template.flush
+
+    run_generator([destination_root, "-m", template.path])
+    assert_file "Gemfile" do |contents|
+      assert_no_match 'jbuilder', contents
+    end
+  ensure
+    template.close
+    template.unlink
+  end
+
   def test_config_another_database
     run_generator([destination_root, "-d", "mysql"])
     assert_file "config/database.yml", /mysql/
diff --git a/railties/test/generators/generator_test.rb b/railties/test/generators/generator_test.rb
index 7871399dd7..94d2c1bf50 100644
--- a/railties/test/generators/generator_test.rb
+++ b/railties/test/generators/generator_test.rb
@@ -1,6 +1,7 @@
 require 'active_support/test_case'
 require 'active_support/testing/autorun'
 require 'rails/generators/app_base'
+require 'rails/generators/rails/app/app_generator'
 
 module Rails
   module Generators
-- 
cgit v1.2.3


From 7eb586f57f3e9eb63954a432180b4661ffca7916 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 4 Nov 2013 15:00:19 -0800
Subject: application template respects Gemfile entries

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

(limited to 'railties/test')

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index bd8efcc6c7..43a985615f 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -182,6 +182,26 @@ class AppGeneratorTest < Rails::Generators::TestCase
     template.unlink
   end
 
+  def test_application_html_checks_gems
+    template = Tempfile.open 'my_template'
+    template.puts 'add_gem_entry_filter { |gem| gem.name != "turbolinks" }'
+    template.flush
+
+    run_generator([destination_root, "-m", template.path])
+    assert_file "Gemfile" do |contents|
+      assert_no_match 'turbolinks', contents
+    end
+    assert_file "Gemfile" do |contents|
+      assert_no_match 'turbolinks', contents
+    end
+    assert_file "app/views/layouts/application.html.erb" do |contents|
+      assert_no_match 'turbolinks', contents
+    end
+  ensure
+    template.close
+    template.unlink
+  end
+
   def test_config_another_database
     run_generator([destination_root, "-d", "mysql"])
     assert_file "config/database.yml", /mysql/
-- 
cgit v1.2.3


From e259afe847f83ae26645d95bb73ec38279414c92 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Thu, 7 Nov 2013 10:55:24 +0100
Subject: Added platform dependent gems

See #12475

If people are on rbx they will get the desired gem
---
 railties/test/generators/app_generator_test.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'railties/test')

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 43a985615f..e6cda07ae5 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -305,6 +305,13 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
+  def test_inclusion_of_plateform_dependent_gems
+    run_generator([destination_root])
+    if RUBY_ENGINE == 'rbx'
+      assert_gem 'rubysl'
+    end
+  end
+
   def test_creation_of_a_test_directory
     run_generator
     assert_file 'test'
-- 
cgit v1.2.3


From ec3134739c6bf7cf6482feb46155293e2b09c45b Mon Sep 17 00:00:00 2001
From: Mike Pack <mikepackdev@gmail.com>
Date: Tue, 29 Oct 2013 16:58:52 -0600
Subject: Allow Pathnames to be added to eager load paths

---
 railties/test/application/initializers/load_path_test.rb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'railties/test')

diff --git a/railties/test/application/initializers/load_path_test.rb b/railties/test/application/initializers/load_path_test.rb
index b36628ee37..cd05956356 100644
--- a/railties/test/application/initializers/load_path_test.rb
+++ b/railties/test/application/initializers/load_path_test.rb
@@ -71,6 +71,20 @@ module ApplicationTests
       assert Zoo
     end
 
+    test "eager loading accepts Pathnames" do
+      app_file "lib/foo.rb", <<-RUBY
+        module Foo; end
+      RUBY
+
+      add_to_config <<-RUBY
+        config.eager_load = true
+        config.eager_load_paths << Pathname.new("#{app_path}/lib")
+      RUBY
+
+      require "#{app_path}/config/environment"
+      assert Foo
+    end
+
     test "load environment with global" do
       $initialize_test_set_from_env = nil
       app_file "config/environments/development.rb", <<-RUBY
-- 
cgit v1.2.3


From 7166507eae3d12c22e04a99ddd70972419643cd3 Mon Sep 17 00:00:00 2001
From: Etienne Lemay <etiennelemay21@gmail.com>
Date: Mon, 11 Nov 2013 13:24:57 -0500
Subject: Make static error pages responsive

---
 railties/test/application/middleware/exceptions_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/test')

diff --git a/railties/test/application/middleware/exceptions_test.rb b/railties/test/application/middleware/exceptions_test.rb
index 42096cfec4..9145cb6936 100644
--- a/railties/test/application/middleware/exceptions_test.rb
+++ b/railties/test/application/middleware/exceptions_test.rb
@@ -73,7 +73,7 @@ module ApplicationTests
 
       assert_nothing_raised(ActionController::RoutingError) do
         get '/foo'
-        assert_match "The page you were looking for doesn't exist.", last_response.body
+        assert_match "The page you were looking for doesn't exist.", last_response.body
       end
     end
 
-- 
cgit v1.2.3


From 251923c7a85a303d74b41255c39d8928ffa109ea Mon Sep 17 00:00:00 2001
From: Paul Nikitochkin <paul.nikitochkin@gmail.com>
Date: Mon, 11 Nov 2013 19:56:02 +0200
Subject: Instrument each load config initializer

In order to simplify profiling loading of initializers,
added instument for tracking load config initializer event from
`config/initializers`
---
 .../test/application/initializers/notifications_test.rb     | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'railties/test')

diff --git a/railties/test/application/initializers/notifications_test.rb b/railties/test/application/initializers/notifications_test.rb
index baae6fd928..0c10726b6f 100644
--- a/railties/test/application/initializers/notifications_test.rb
+++ b/railties/test/application/initializers/notifications_test.rb
@@ -39,5 +39,18 @@ module ApplicationTests
       assert_equal 1, logger.logged(:debug).size
       assert_match(/SHOW tables/, logger.logged(:debug).last)
     end
+
+    test 'rails load_config_initializer event is instrumented' do
+      app_file 'config/initializers/foo.rb', ''
+
+      events = []
+      callback = -> (*_) { events << _ }
+      ActiveSupport::Notifications.subscribed(callback, 'load_config_initializer.railties') do
+        app
+      end
+
+      assert_equal %w[load_config_initializer.railties], events.map(&:first)
+      assert_includes events.first.last[:initializer], 'config/initializers/foo.rb'
+    end
   end
 end
-- 
cgit v1.2.3


From e23c77f12b2ba38240c0b4367e6b1964a1698d16 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sat, 16 Nov 2013 22:50:52 +0100
Subject: Build fix for ruby 1.9.3 syntax

---
 railties/test/application/initializers/notifications_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/test')

diff --git a/railties/test/application/initializers/notifications_test.rb b/railties/test/application/initializers/notifications_test.rb
index 0c10726b6f..95655b74cf 100644
--- a/railties/test/application/initializers/notifications_test.rb
+++ b/railties/test/application/initializers/notifications_test.rb
@@ -44,7 +44,7 @@ module ApplicationTests
       app_file 'config/initializers/foo.rb', ''
 
       events = []
-      callback = -> (*_) { events << _ }
+      callback = ->(*_) { events << _ }
       ActiveSupport::Notifications.subscribed(callback, 'load_config_initializer.railties') do
         app
       end
-- 
cgit v1.2.3


From 4b7fee029f6cc6e058531dd21a65ec9d44a0b047 Mon Sep 17 00:00:00 2001
From: Kuldeep Aggarwal <kd.engineer@yahoo.co.in>
Date: Sun, 17 Nov 2013 15:33:02 +0530
Subject: added test cases to find notes in a file with .builder extension

---
 railties/test/application/rake/notes_test.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'railties/test')

diff --git a/railties/test/application/rake/notes_test.rb b/railties/test/application/rake/notes_test.rb
index 01d751e822..05f6338b68 100644
--- a/railties/test/application/rake/notes_test.rb
+++ b/railties/test/application/rake/notes_test.rb
@@ -28,6 +28,7 @@ module ApplicationTests
         app_file "app/assets/stylesheets/application.css.less", "// TODO: note in less"
         app_file "app/controllers/application_controller.rb", 1000.times.map { "" }.join("\n") << "# TODO: note in ruby"
         app_file "lib/tasks/task.rake", "# TODO: note in rake"
+        app_file 'app/views/home/index.html.builder', '# TODO: note in builder'
 
         boot_rails
         require 'rake'
@@ -51,8 +52,9 @@ module ApplicationTests
           assert_match(/note in sass/, output)
           assert_match(/note in less/, output)
           assert_match(/note in rake/, output)
+          assert_match(/note in builder/, output)
 
-          assert_equal 11, lines.size
+          assert_equal 12, lines.size
 
           lines.each do |line|
             assert_equal 4, line[0].size
-- 
cgit v1.2.3


From f1ffedb2337c42153a06fa022afa7cd0a2d3ba9a Mon Sep 17 00:00:00 2001
From: Dmitriy Budnik <dmbu@ciklum.com>
Date: Thu, 21 Nov 2013 13:25:16 +0200
Subject: replace U+00A0 with whitespace

---
 railties/test/application/middleware/exceptions_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/test')

diff --git a/railties/test/application/middleware/exceptions_test.rb b/railties/test/application/middleware/exceptions_test.rb
index 9145cb6936..42096cfec4 100644
--- a/railties/test/application/middleware/exceptions_test.rb
+++ b/railties/test/application/middleware/exceptions_test.rb
@@ -73,7 +73,7 @@ module ApplicationTests
 
       assert_nothing_raised(ActionController::RoutingError) do
         get '/foo'
-        assert_match "The page you were looking for doesn't exist.", last_response.body
+        assert_match "The page you were looking for doesn't exist.", last_response.body
       end
     end
 
-- 
cgit v1.2.3


From 6701b4cf41f6f3d9cfc6a93715acbf852d1e468e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C4=B1tk=C4=B1=20Ba=C4=9Fdat?= <sbagdat@gmail.com>
Date: Thu, 21 Nov 2013 01:52:09 +0200
Subject: Fix for routes task

This commit fixes formatting issue for `rake routes` task, when a section is shorter than a header.
---
 railties/test/application/rake_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index 2169304aa4..b91856e2a4 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -111,7 +111,7 @@ module ApplicationTests
       RUBY
 
       output = Dir.chdir(app_path){ `rake routes` }
-      assert_equal "Prefix Verb URI Pattern     Controller#Action\ncart GET /cart(.:format) cart#show\n", output
+      assert_equal "Prefix Verb URI Pattern     Controller#Action\ncart   GET  /cart(.:format) cart#show\n", output
     end
 
     def test_rake_routes_with_controller_environment
@@ -124,7 +124,7 @@ module ApplicationTests
 
       ENV['CONTROLLER'] = 'cart'
       output = Dir.chdir(app_path){ `rake routes` }
-      assert_equal "Prefix Verb URI Pattern     Controller#Action\ncart GET /cart(.:format) cart#show\n", output
+      assert_equal "Prefix Verb URI Pattern     Controller#Action\ncart   GET  /cart(.:format) cart#show\n", output
     end
 
     def test_rake_routes_displays_message_when_no_routes_are_defined
-- 
cgit v1.2.3


From c09ef94a494eb8d0f690a84bc82b2bddcfe13e1b Mon Sep 17 00:00:00 2001
From: Lauro Caetano <laurocaetano1@gmail.com>
Date: Thu, 21 Nov 2013 22:11:26 -0200
Subject: Remove turbolinks when generating a new application based on a
 template that skips it.

It can be skipped adding `add_gem_entry_filter { |gem| gem.name != "turbolinks" }` to the template.
---
 railties/test/generators/app_generator_test.rb | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index e6cda07ae5..8b0dc39d92 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -182,7 +182,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
     template.unlink
   end
 
-  def test_application_html_checks_gems
+  def test_skip_turbolinks_when_it_is_not_on_gemfile
     template = Tempfile.open 'my_template'
     template.puts 'add_gem_entry_filter { |gem| gem.name != "turbolinks" }'
     template.flush
@@ -191,11 +191,18 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_file "Gemfile" do |contents|
       assert_no_match 'turbolinks', contents
     end
-    assert_file "Gemfile" do |contents|
+
+    assert_file "app/views/layouts/application.html.erb" do |contents|
       assert_no_match 'turbolinks', contents
     end
+
     assert_file "app/views/layouts/application.html.erb" do |contents|
-      assert_no_match 'turbolinks', contents
+      assert_no_match(/stylesheet_link_tag\s+"application", media: "all", "data-turbolinks-track" => true/, contents)
+      assert_no_match(/javascript_include_tag\s+"application", "data-turbolinks-track" => true/, contents)
+    end
+
+    assert_file "app/assets/javascripts/application.js" do |contents|
+      assert_no_match %r{^//=\s+turbolinks\s}, contents
     end
   ensure
     template.close
-- 
cgit v1.2.3


From a6c06217a55a75c33056cf7113cc189cb2134686 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Fri, 22 Nov 2013 08:51:12 +0100
Subject: Build fix for new routing inspector changes

Broken by

6701b4cf41f6f3d9cfc6a93715acbf852d1e468e
---
 railties/test/application/rake_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index b91856e2a4..08316d80e6 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -111,7 +111,7 @@ module ApplicationTests
       RUBY
 
       output = Dir.chdir(app_path){ `rake routes` }
-      assert_equal "Prefix Verb URI Pattern     Controller#Action\ncart   GET  /cart(.:format) cart#show\n", output
+      assert_equal "Prefix Verb URI Pattern     Controller#Action\n  cart GET  /cart(.:format) cart#show\n", output
     end
 
     def test_rake_routes_with_controller_environment
@@ -124,7 +124,7 @@ module ApplicationTests
 
       ENV['CONTROLLER'] = 'cart'
       output = Dir.chdir(app_path){ `rake routes` }
-      assert_equal "Prefix Verb URI Pattern     Controller#Action\ncart   GET  /cart(.:format) cart#show\n", output
+      assert_equal "Prefix Verb URI Pattern     Controller#Action\n  cart GET  /cart(.:format) cart#show\n", output
     end
 
     def test_rake_routes_displays_message_when_no_routes_are_defined
-- 
cgit v1.2.3


From 5ba606e1c6aa719fc25e7d10a4d460aae3c8e22c Mon Sep 17 00:00:00 2001
From: Lauro Caetano <laurocaetano1@gmail.com>
Date: Fri, 22 Nov 2013 10:32:52 -0200
Subject: Fix the assertion for not inclusion of turbolinks on application.js.

We were asserting if `//= turbolinks` was not present while the correct is
asserting that `//= require turbolinks` is not present.
---
 railties/test/generators/app_generator_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/test')

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 8b0dc39d92..6fccd1b399 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -202,7 +202,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
 
     assert_file "app/assets/javascripts/application.js" do |contents|
-      assert_no_match %r{^//=\s+turbolinks\s}, contents
+      assert_no_match %r{^//= require turbolinks}, contents
     end
   ensure
     template.close
-- 
cgit v1.2.3


From 34c08d2ead9360e1d9577dbc491d221ab66a2151 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Fri, 22 Nov 2013 14:53:31 -0200
Subject: Use a more generic assertion to make sure this tests will be useful.

Since we are using assert_no_match, if we change the code before
changing the tests, the tests will still pass and the assertion will
become useless
---
 railties/test/generators/app_generator_test.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 6fccd1b399..843b4da970 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -197,12 +197,11 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
 
     assert_file "app/views/layouts/application.html.erb" do |contents|
-      assert_no_match(/stylesheet_link_tag\s+"application", media: "all", "data-turbolinks-track" => true/, contents)
-      assert_no_match(/javascript_include_tag\s+"application", "data-turbolinks-track" => true/, contents)
+      assert_no_match('data-turbolinks-track', contents)
     end
 
     assert_file "app/assets/javascripts/application.js" do |contents|
-      assert_no_match %r{^//= require turbolinks}, contents
+      assert_no_match 'turbolinks', contents
     end
   ensure
     template.close
-- 
cgit v1.2.3


From 9725bff2f696b09be61455d7323452723905f7f1 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sat, 23 Nov 2013 10:36:25 +0100
Subject: Cleaned up app generator test

---
 railties/test/generators/app_generator_test.rb | 27 ++++++--------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 843b4da970..6f03cf3083 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -29,6 +29,7 @@ DEFAULT_APP_FILES = %w(
   lib/tasks
   lib/assets
   log
+  test/test_helper.rb
   test/fixtures
   test/controllers
   test/models
@@ -37,6 +38,8 @@ DEFAULT_APP_FILES = %w(
   test/integration
   vendor
   vendor/assets
+  vendor/assets/stylesheets
+  vendor/assets/javascripts
   tmp/cache
   tmp/cache/assets
 )
@@ -58,6 +61,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_file("app/views/layouts/application.html.erb", /stylesheet_link_tag\s+"application", media: "all", "data-turbolinks-track" => true/)
     assert_file("app/views/layouts/application.html.erb", /javascript_include_tag\s+"application", "data-turbolinks-track" => true/)
     assert_file("app/assets/stylesheets/application.css")
+    assert_file("app/assets/javascripts/application.js")
   end
 
   def test_invalid_application_name_raises_an_error
@@ -318,33 +322,13 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
-  def test_creation_of_a_test_directory
-    run_generator
-    assert_file 'test'
-  end
-
-  def test_creation_of_app_assets_images_directory
-    run_generator
-    assert_file "app/assets/images"
-  end
-
-  def test_creation_of_vendor_assets_javascripts_directory
-    run_generator
-    assert_file "vendor/assets/javascripts"
-  end
-
-  def test_creation_of_vendor_assets_stylesheets_directory
-    run_generator
-    assert_file "vendor/assets/stylesheets"
-  end
-
   def test_jquery_is_the_default_javascript_library
     run_generator
     assert_file "app/assets/javascripts/application.js" do |contents|
       assert_match %r{^//= require jquery}, contents
       assert_match %r{^//= require jquery_ujs}, contents
     end
-    assert_file "Gemfile", /^gem 'jquery-rails'/
+    assert_gem "jquery-rails"
   end
 
   def test_other_javascript_libraries
@@ -369,6 +353,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
 
     assert_file "Gemfile" do |content|
       assert_no_match(/coffee-rails/, content)
+      assert_no_match(/jquery-rails/, content)
     end
   end
 
-- 
cgit v1.2.3


From ee4ab3fe522f0c4c3da8463c0154aa206f15a830 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sat, 23 Nov 2013 11:38:54 +0100
Subject: Using activerecord-jdbcsqlite3-adapter

PluginGeneratorTest needs to have
activerecord-jdbcsqlite3-adapter to pass under JRuby
---
 railties/test/generators/plugin_generator_test.rb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index 068eb66bc6..c6b91e7cba 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -293,7 +293,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase
     assert_file "Gemfile" do |contents|
       assert_no_match('gemspec', contents)
       assert_match(/gem "rails", "~> #{Rails.version}"/, contents)
-      assert_match(/group :development do\n  gem "sqlite3"\nend/, contents)
+      assert_match_sqlite3(contents)
       assert_no_match(/# gem "jquery-rails"/, contents)
     end
   end
@@ -304,7 +304,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase
     assert_file "Gemfile" do |contents|
       assert_no_match('gemspec', contents)
       assert_match(/gem "rails", "~> #{Rails.version}"/, contents)
-      assert_match(/group :development do\n  gem "sqlite3"\nend/, contents)
+      assert_match_sqlite3(contents)
     end
   end
 
@@ -347,4 +347,12 @@ protected
   def default_files
     ::DEFAULT_PLUGIN_FILES
   end
+
+  def assert_match_sqlite3(contents)
+    unless defined?(JRUBY_VERSION)
+      assert_match(/group :development do\n  gem "sqlite3"\nend/, contents)
+    else
+      assert_match(/group :development do\n  gem "activerecord-jdbcsqlite3-adapter"\nend/, contents)
+    end
+  end
 end
-- 
cgit v1.2.3


From d4265021d0ec4becbbf7ae4ee00bb815a05f868a Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sat, 23 Nov 2013 16:48:19 +0100
Subject: Added test when task generator called on revoke

---
 railties/test/generators/task_generator_test.rb | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'railties/test')

diff --git a/railties/test/generators/task_generator_test.rb b/railties/test/generators/task_generator_test.rb
index 9399be9510..d5bd44b9db 100644
--- a/railties/test/generators/task_generator_test.rb
+++ b/railties/test/generators/task_generator_test.rb
@@ -7,6 +7,18 @@ class TaskGeneratorTest < Rails::Generators::TestCase
 
   def test_task_is_created
     run_generator
-    assert_file "lib/tasks/feeds.rake", /namespace :feeds/
+    assert_file "lib/tasks/feeds.rake" do |content|
+      assert_match(/namespace :feeds/, content)
+      assert_match(/task foo:/, content)
+      assert_match(/task bar:/, content)
+    end
+  end
+
+  def test_task_on_revoke
+    task_path = 'lib/tasks/feeds.rake'
+    run_generator
+    assert_file task_path
+    run_generator ['feeds'], behavior: :revoke
+    assert_no_file task_path
   end
 end
-- 
cgit v1.2.3


From bd00feec4f8d64635e9c23bb073e4ad7c4704202 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sat, 23 Nov 2013 17:17:18 +0100
Subject: Test for when controller with skip-assets

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

(limited to 'railties/test')

diff --git a/railties/test/generators/controller_generator_test.rb b/railties/test/generators/controller_generator_test.rb
index 9c664a903a..2268f04839 100644
--- a/railties/test/generators/controller_generator_test.rb
+++ b/railties/test/generators/controller_generator_test.rb
@@ -43,6 +43,12 @@ class ControllerGeneratorTest < Rails::Generators::TestCase
     assert_file "app/assets/stylesheets/account.css"
   end
 
+  def test_does_not_invoke_assets_if_required
+    run_generator ["account", "--skip-assets"]
+    assert_no_file "app/assets/javascripts/account.js"
+    assert_no_file "app/assets/stylesheets/account.css"
+  end
+
   def test_invokes_default_test_framework
     run_generator
     assert_file "test/controllers/account_controller_test.rb"
-- 
cgit v1.2.3