From 8d3cd530c4d165b1bbd2e551d491dd81e2c3bff0 Mon Sep 17 00:00:00 2001
From: Robert Glaser <mail@robert-glaser.de>
Date: Tue, 18 Oct 2011 15:29:16 +0200
Subject: Fixed DataMapper namings in symbols and constants.

---
 railties/test/application/generators_test.rb | 18 +++++++++---------
 railties/test/railties/engine_test.rb        |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/application/generators_test.rb b/railties/test/application/generators_test.rb
index 4365d00b1f..8718f27de1 100644
--- a/railties/test/application/generators_test.rb
+++ b/railties/test/application/generators_test.rb
@@ -45,10 +45,10 @@ module ApplicationTests
 
     test "generators set rails options" do
       with_bare_config do |c|
-        c.generators.orm            = :datamapper
+        c.generators.orm            = :data_mapper
         c.generators.test_framework = :rspec
         c.generators.helper         = false
-        expected = { :rails => { :orm => :datamapper, :test_framework => :rspec, :helper => false } }
+        expected = { :rails => { :orm => :data_mapper, :test_framework => :rspec, :helper => false } }
         assert_equal(expected, c.generators.options)
       end
     end
@@ -64,7 +64,7 @@ module ApplicationTests
     test "generators aliases, options, templates and fallbacks on initialization" do
       add_to_config <<-RUBY
         config.generators.rails :aliases => { :test_framework => "-w" }
-        config.generators.orm :datamapper
+        config.generators.orm :data_mapper
         config.generators.test_framework :rspec
         config.generators.fallbacks[:shoulda] = :test_unit
         config.generators.templates << "some/where"
@@ -95,15 +95,15 @@ module ApplicationTests
     test "generators with hashes for options and aliases" do
       with_bare_config do |c|
         c.generators do |g|
-          g.orm    :datamapper, :migration => false
+          g.orm    :data_mapper, :migration => false
           g.plugin :aliases => { :generator => "-g" },
                    :generator => true
         end
 
         expected = {
-          :rails => { :orm => :datamapper },
+          :rails => { :orm => :data_mapper },
           :plugin => { :generator => true },
-          :datamapper => { :migration => false }
+          :data_mapper => { :migration => false }
         }
 
         assert_equal expected, c.generators.options
@@ -114,12 +114,12 @@ module ApplicationTests
     test "generators with string and hash for options should generate symbol keys" do
       with_bare_config do |c|
         c.generators do |g|
-          g.orm    'datamapper', :migration => false
+          g.orm    'data_mapper', :migration => false
         end
 
         expected = {
-          :rails => { :orm => :datamapper },
-          :datamapper => { :migration => false }
+          :rails => { :orm => :data_mapper },
+          :data_mapper => { :migration => false }
         }
 
         assert_equal expected, c.generators.options
diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index 06a60cd858..f8b84e49c9 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -524,7 +524,7 @@ module RailtiesTest
         module Bukkits
           class Engine < ::Rails::Engine
             config.generators do |g|
-              g.orm             :datamapper
+              g.orm             :data_mapper
               g.template_engine :haml
               g.test_framework  :rspec
             end
@@ -553,7 +553,7 @@ module RailtiesTest
       assert_equal :test_unit, app_generators[:test_framework]
 
       generators = Bukkits::Engine.config.generators.options[:rails]
-      assert_equal :datamapper, generators[:orm]
+      assert_equal :data_mapper, generators[:orm]
       assert_equal :haml      , generators[:template_engine]
       assert_equal :rspec     , generators[:test_framework]
     end
-- 
cgit v1.2.3


From 7c95be54b4c3f8ad2273eea39afa233f8f8b31c1 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Sun, 20 May 2012 16:19:11 -0700
Subject: Fix generators to help with ambiguous `ApplicationController` issue

In development mode, dependencies are loaded dynamically at runtime,
using `const_missing`. Because of that, when one of the constants is
already loaded and `const_missing` is not triggered, user can end up
with unexpected results.

Given such file in an Engine:

```ruby
module Blog
  class PostsController < ApplicationController
  end
end
```

If you load it first, before loading any application files, it will
correctly load `Blog::ApplicationController`, because second line will
hit `const_missing`. However if you load `ApplicationController` first,
the constant will be loaded already, `const_missing` hook will not be
fired and in result `PostsController` will inherit from
`ApplicationController` instead of `Blog::ApplicationController`.

Since it can't be fixed in `AS::Dependencies`, the easiest fix is to
just explicitly load application controller.

closes #6413
---
 railties/test/generators/namespaced_generators_test.rb | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb
index c495258343..903465392d 100644
--- a/railties/test/generators/namespaced_generators_test.rb
+++ b/railties/test/generators/namespaced_generators_test.rb
@@ -20,8 +20,14 @@ class NamespacedControllerGeneratorTest < NamespacedGeneratorTestCase
 
   def test_namespaced_controller_skeleton_is_created
     run_generator
-    assert_file "app/controllers/test_app/account_controller.rb", /module TestApp/, /  class AccountController < ApplicationController/
-    assert_file "test/functional/test_app/account_controller_test.rb", /module TestApp/, /  class AccountControllerTest/
+    assert_file "app/controllers/test_app/account_controller.rb",
+                /require "test_app\/application_controller"/,
+                /module TestApp/,
+                /  class AccountController < ApplicationController/
+
+    assert_file "test/functional/test_app/account_controller_test.rb",
+                /module TestApp/,
+                /  class AccountControllerTest/
   end
 
   def test_skipping_namespace
@@ -227,9 +233,10 @@ class NamespacedScaffoldGeneratorTest < NamespacedGeneratorTestCase
     end
 
     # Controller
-    assert_file "app/controllers/test_app/product_lines_controller.rb" do |content|
-      assert_match(/module TestApp\n  class ProductLinesController < ApplicationController/, content)
-    end
+    assert_file "app/controllers/test_app/product_lines_controller.rb",
+                /require "test_app\/application_controller"/,
+                /module TestApp/,
+                /class ProductLinesController < ApplicationController/
 
     assert_file "test/functional/test_app/product_lines_controller_test.rb",
                 /module TestApp\n  class ProductLinesControllerTest < ActionController::TestCase/
-- 
cgit v1.2.3


From edb87b19d42b2a47708a78e0762a9e761aaf1277 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 21 May 2012 16:20:18 -0700
Subject: using __method__ for the command method calls

---
 .../configuration/middleware_stack_proxy_test.rb   | 59 ++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 railties/test/configuration/middleware_stack_proxy_test.rb

(limited to 'railties/test')

diff --git a/railties/test/configuration/middleware_stack_proxy_test.rb b/railties/test/configuration/middleware_stack_proxy_test.rb
new file mode 100644
index 0000000000..5984c0b425
--- /dev/null
+++ b/railties/test/configuration/middleware_stack_proxy_test.rb
@@ -0,0 +1,59 @@
+require 'minitest/autorun'
+require 'rails/configuration'
+require 'active_support/test_case'
+
+module Rails
+  module Configuration
+    class MiddlewareStackProxyTest < ActiveSupport::TestCase
+      def setup
+        @stack = MiddlewareStackProxy.new
+      end
+
+      def test_playback_insert_before
+        @stack.insert_before :foo
+        assert_playback :insert_before, :foo
+      end
+
+      def test_playback_insert_after
+        @stack.insert_after :foo
+        assert_playback :insert_after, :foo
+      end
+
+      def test_playback_swap
+        @stack.swap :foo
+        assert_playback :swap, :foo
+      end
+
+      def test_playback_use
+        @stack.use :foo
+        assert_playback :use, :foo
+      end
+
+      def test_playback_delete
+        @stack.delete :foo
+        assert_playback :delete, :foo
+      end
+
+      def test_order
+        @stack.swap :foo
+        @stack.delete :foo
+
+        mock = MiniTest::Mock.new
+        mock.expect :send, nil, [:swap, :foo]
+        mock.expect :send, nil, [:delete, :foo]
+
+        @stack.merge_into mock
+        mock.verify
+      end
+
+      private
+
+      def assert_playback(msg_name, args)
+        mock = MiniTest::Mock.new
+        mock.expect :send, nil, [msg_name, args]
+        @stack.merge_into(mock)
+        mock.verify
+      end
+    end
+  end
+end
-- 
cgit v1.2.3


From a060c41ef77cf3a0e4d236a70f3fef260ff9a261 Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Fri, 4 May 2012 12:54:20 +0400
Subject: Use relative path to sqlite3 db in `rails db` command

Rails uses sqlit3 db file with a path relative to the rails root. It
allows to execute server not from rails root only. For example you
can fire `./spec/dummy/script/rails s` to start dummy application
server if you develop some engine gem.

Now the `rails db` command uses relative paths also and you can explore
your dummy db via `./spec/dummy/script/rails db` command.
---
 railties/test/commands/dbconsole_test.rb | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/commands/dbconsole_test.rb b/railties/test/commands/dbconsole_test.rb
index 85a7edfacd..57074cd0ad 100644
--- a/railties/test/commands/dbconsole_test.rb
+++ b/railties/test/commands/dbconsole_test.rb
@@ -92,20 +92,25 @@ class Rails::DBConsoleTest < ActiveSupport::TestCase
   end
 
   def test_sqlite3
-    dbconsole.expects(:find_cmd_and_exec).with('sqlite3', 'db')
-    start(adapter: 'sqlite3', database: 'db')
+    dbconsole.expects(:find_cmd_and_exec).with('sqlite3', Rails.root.join('db.sqlite3').to_s)
+    start(adapter: 'sqlite3', database: 'db.sqlite3')
     assert !aborted
   end
 
   def test_sqlite3_mode
-    dbconsole.expects(:find_cmd_and_exec).with('sqlite3', '-html', 'db')
-    start({adapter: 'sqlite3', database: 'db'}, ['--mode', 'html'])
+    dbconsole.expects(:find_cmd_and_exec).with('sqlite3', '-html', Rails.root.join('db.sqlite3').to_s)
+    start({adapter: 'sqlite3', database: 'db.sqlite3'}, ['--mode', 'html'])
     assert !aborted
   end
 
   def test_sqlite3_header
-    dbconsole.expects(:find_cmd_and_exec).with('sqlite3', '-header', 'db')
-    start({adapter: 'sqlite3', database: 'db'}, ['--header'])
+    dbconsole.expects(:find_cmd_and_exec).with('sqlite3', '-header', Rails.root.join('db.sqlite3').to_s)
+    start({adapter: 'sqlite3', database: 'db.sqlite3'}, ['--header'])
+  end
+
+  def test_sqlite3_db_absolute_path
+    dbconsole.expects(:find_cmd_and_exec).with('sqlite3', '/tmp/db.sqlite3')
+    start(adapter: 'sqlite3', database: '/tmp/db.sqlite3')
     assert !aborted
   end
 
-- 
cgit v1.2.3


From 1fed1f14fc0ecb375d8a7c542669dad96541582d Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Fri, 4 May 2012 22:04:53 +0400
Subject: Fix `rails db -h` and cosmetic fixes in usage banners

Ruby tries to use '-h' as short version of '--header' by default
https://github.com/ruby/ruby/blob/trunk/lib/optparse.rb#L1372-1381.
To force `rails db -h` prints an usage message we should add the `-h`
options explicitly.
---
 railties/test/commands/dbconsole_test.rb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'railties/test')

diff --git a/railties/test/commands/dbconsole_test.rb b/railties/test/commands/dbconsole_test.rb
index 57074cd0ad..6d0f5ca073 100644
--- a/railties/test/commands/dbconsole_test.rb
+++ b/railties/test/commands/dbconsole_test.rb
@@ -132,6 +132,24 @@ class Rails::DBConsoleTest < ActiveSupport::TestCase
     assert_match /Unknown command-line client for db/, output
   end
 
+  def test_print_help_short
+    stdout = capture(:stdout) do
+      start({}, ['-h'])
+    end
+    assert aborted
+    assert_equal '', output
+    assert_match /Usage:.*dbconsole/, stdout
+  end
+
+  def test_print_help_long
+    stdout = capture(:stdout) do
+      start({}, ['--help'])
+    end
+    assert aborted
+    assert_equal '', output
+    assert_match /Usage:.*dbconsole/, stdout
+  end
+
   private
   attr_reader :aborted, :output
 
-- 
cgit v1.2.3


From 29d17d3ab65633695babc9123463c78248e41a67 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Tue, 22 May 2012 01:40:51 -0700
Subject: Use require_dependency in generated controllers

Using require in development mode will prevent required files from
reloading, even if they're changed. In order to keep namespaced
application_controller reloadable, we need to use require_dependency
instead of require.
---
 railties/test/generators/namespaced_generators_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb
index 903465392d..09169ef2d2 100644
--- a/railties/test/generators/namespaced_generators_test.rb
+++ b/railties/test/generators/namespaced_generators_test.rb
@@ -21,7 +21,7 @@ class NamespacedControllerGeneratorTest < NamespacedGeneratorTestCase
   def test_namespaced_controller_skeleton_is_created
     run_generator
     assert_file "app/controllers/test_app/account_controller.rb",
-                /require "test_app\/application_controller"/,
+                /require_dependency "test_app\/application_controller"/,
                 /module TestApp/,
                 /  class AccountController < ApplicationController/
 
@@ -234,7 +234,7 @@ class NamespacedScaffoldGeneratorTest < NamespacedGeneratorTestCase
 
     # Controller
     assert_file "app/controllers/test_app/product_lines_controller.rb",
-                /require "test_app\/application_controller"/,
+                /require_dependency "test_app\/application_controller"/,
                 /module TestApp/,
                 /class ProductLinesController < ApplicationController/
 
-- 
cgit v1.2.3


From fe7038eac8c1a4df57a0aacf4dd77da5ef87f6df Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Tue, 22 May 2012 13:26:06 +0400
Subject: Use new hash syntax for generators gem method

The Gemfile of new application uses ruby 1.9 hashes. Gem method of
generators should use them too. It prevents from mixing two kinds of
syntax in one file.
---
 railties/test/generators/actions_test.rb              | 8 ++++++++
 railties/test/generators/plugin_new_generator_test.rb | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb
index a8c8fcd5b7..bc086c5986 100644
--- a/railties/test/generators/actions_test.rb
+++ b/railties/test/generators/actions_test.rb
@@ -67,6 +67,14 @@ class ActionsTest < Rails::Generators::TestCase
     assert_file 'Gemfile', /^gem "rspec-rails"$/
   end
 
+  def test_gem_should_include_options
+    run_generator
+
+    action :gem, 'rspec', github: 'dchelimsky/rspec', tag: '1.2.9.rc1'
+
+    assert_file 'Gemfile', /gem "rspec", github: "dchelimsky\/rspec", tag: "1\.2\.9\.rc1"/
+  end
+
   def test_gem_group_should_wrap_gems_in_a_group
     run_generator
 
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb
index 51374e5f3f..58740978aa 100644
--- a/railties/test/generators/plugin_new_generator_test.rb
+++ b/railties/test/generators/plugin_new_generator_test.rb
@@ -279,7 +279,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
 
     run_generator [destination_root]
 
-    assert_file gemfile_path, /gem 'bukkits', :path => 'tmp\/bukkits'/
+    assert_file gemfile_path, /gem 'bukkits', path: 'tmp\/bukkits'/
   ensure
     Object.send(:remove_const, 'APP_PATH')
     FileUtils.rm gemfile_path
@@ -294,7 +294,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
     run_generator [destination_root, "--skip-gemfile-entry"]
 
     assert_file gemfile_path do |contents|
-      assert_no_match(/gem 'bukkits', :path => 'tmp\/bukkits'/, contents)
+      assert_no_match(/gem 'bukkits', path: 'tmp\/bukkits'/, contents)
     end
   ensure
     Object.send(:remove_const, 'APP_PATH')
-- 
cgit v1.2.3


From bd9953f11e8e72f8a8a507182d7328f3c8802e27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?U=C4=A3is=20Ozols?= <ugis.ozolss@gmail.com>
Date: Wed, 23 May 2012 11:45:08 +0300
Subject: Remove unnecessary comment.

---
 railties/test/generators/assets_generator_test.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'railties/test')

diff --git a/railties/test/generators/assets_generator_test.rb b/railties/test/generators/assets_generator_test.rb
index d6338bd3da..a2b94f2e50 100644
--- a/railties/test/generators/assets_generator_test.rb
+++ b/railties/test/generators/assets_generator_test.rb
@@ -1,7 +1,6 @@
 require 'generators/generators_test_helper'
 require 'rails/generators/rails/assets/assets_generator'
 
-# FIXME: Silence the 'Could not find task "using_coffee?"' message in tests due to the public stub
 class AssetsGeneratorTest < Rails::Generators::TestCase
   include GeneratorsTestHelper
   arguments %w(posts)
-- 
cgit v1.2.3


From c3e3102904c98a6e05bee33616288323278692b8 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Wed, 23 May 2012 14:42:28 -0500
Subject: Rails::InfoController tests passing

This includes new tests for /rails/info/routes
---
 railties/test/application/route_inspect_test.rb |  9 +++++++++
 railties/test/application/routing_test.rb       | 12 ++++++++++++
 railties/test/rails_info_controller_test.rb     | 17 +++++++++++------
 3 files changed, 32 insertions(+), 6 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/application/route_inspect_test.rb b/railties/test/application/route_inspect_test.rb
index 3b8c874b5b..e453cdb074 100644
--- a/railties/test/application/route_inspect_test.rb
+++ b/railties/test/application/route_inspect_test.rb
@@ -164,5 +164,14 @@ module ApplicationTests
       assert_equal "   bar GET /bar(.:format)    redirect(307, path: /foo/bar)", output[1]
       assert_equal "foobar GET /foobar(.:format) redirect(301)", output[2]
     end
+
+    def test_presenter
+      output = draw do
+        get "/foo"    => redirect("/foo/bar"), :constraints => { :subdomain => "admin" }
+        get "/bar"    => redirect(path: "/foo/bar", status: 307)
+        get "/foobar" => redirect{ "/foo/bar" }
+      end
+      assert_equal output.join("\n"), Rails::Application::RoutePresenter.display_routes(@set.routes)
+    end
   end
 end
diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb
index 977a5fc7e8..d1373ba202 100644
--- a/railties/test/application/routing_test.rb
+++ b/railties/test/application/routing_test.rb
@@ -15,12 +15,24 @@ module ApplicationTests
       teardown_app
     end
 
+    test "rails/info/routes in development" do
+      app("development")
+      get "/rails/info/routes"
+      assert_equal 200, last_response.status
+    end
+
     test "rails/info/properties in development" do
       app("development")
       get "/rails/info/properties"
       assert_equal 200, last_response.status
     end
 
+    test "rails/info/routes in production" do
+      app("production")
+      get "/rails/info/routes"
+      assert_equal 404, last_response.status
+    end
+
     test "rails/info/properties in production" do
       app("production")
       get "/rails/info/properties"
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb
index f7a30a16d2..cfb32b7d35 100644
--- a/railties/test/rails_info_controller_test.rb
+++ b/railties/test/rails_info_controller_test.rb
@@ -12,29 +12,28 @@ class InfoControllerTest < ActionController::TestCase
   def setup
     Rails.application.routes.draw do
       get '/rails/info/properties' => "rails/info#properties"
+      get '/rails/info/routes'     => "rails/info#routes"
     end
-    @request.stubs(:local? => true)
-    @controller.stubs(:consider_all_requests_local? => false)
+    @controller.stubs(:local_request? => true)
     @routes = Rails.application.routes
 
     Rails::InfoController.send(:include, @routes.url_helpers)
   end
 
   test "info controller does not allow remote requests" do
-    @request.stubs(:local? => false)
+    @controller.stubs(:local_request? => false)
     get :properties
     assert_response :forbidden
   end
 
   test "info controller renders an error message when request was forbidden" do
-    @request.stubs(:local? => false)
+    @controller.stubs(:local_request? => false)
     get :properties
     assert_select 'p'
   end
 
   test "info controller allows requests when all requests are considered local" do
-    @request.stubs(:local? => false)
-    @controller.stubs(:consider_all_requests_local? => true)
+    @controller.stubs(:local_request? => true)
     get :properties
     assert_response :success
   end
@@ -48,4 +47,10 @@ class InfoControllerTest < ActionController::TestCase
     get :properties
     assert_select 'table'
   end
+
+  test "info controller renders with routes" do
+    get :routes
+    assert_select 'pre'
+  end
+
 end
-- 
cgit v1.2.3


From 44591250189fd2dadc8303d094b72552d7d06543 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Thu, 24 May 2012 21:31:09 -0500
Subject: remove unnecessary test from route_inspect_test

---
 railties/test/application/route_inspect_test.rb | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/application/route_inspect_test.rb b/railties/test/application/route_inspect_test.rb
index e453cdb074..3b8c874b5b 100644
--- a/railties/test/application/route_inspect_test.rb
+++ b/railties/test/application/route_inspect_test.rb
@@ -164,14 +164,5 @@ module ApplicationTests
       assert_equal "   bar GET /bar(.:format)    redirect(307, path: /foo/bar)", output[1]
       assert_equal "foobar GET /foobar(.:format) redirect(301)", output[2]
     end
-
-    def test_presenter
-      output = draw do
-        get "/foo"    => redirect("/foo/bar"), :constraints => { :subdomain => "admin" }
-        get "/bar"    => redirect(path: "/foo/bar", status: 307)
-        get "/foobar" => redirect{ "/foo/bar" }
-      end
-      assert_equal output.join("\n"), Rails::Application::RoutePresenter.display_routes(@set.routes)
-    end
   end
 end
-- 
cgit v1.2.3


From baa336364da932ccaee6bb724ab615145e63c4d3 Mon Sep 17 00:00:00 2001
From: Waseem Ahmad <talk.to.waseem@gmail.com>
Date: Fri, 25 May 2012 09:49:34 +0530
Subject: Fixes build 4008.1

This fixex build 4008.1[1] because of the changes made in

4001835db00ce44cb75bca33ec02cd76b8ccc790

[1] http://travis-ci.org/#!/rails/rails/jobs/1429671
---
 railties/test/paths_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/paths_test.rb b/railties/test/paths_test.rb
index aa04cad033..5d6b6f9f72 100644
--- a/railties/test/paths_test.rb
+++ b/railties/test/paths_test.rb
@@ -29,7 +29,7 @@ class PathsTest < ActiveSupport::TestCase
   test "creating a root level path" do
     @root.add "app"
     assert_equal ["/foo/bar/app"], @root["app"].to_a
-    assert_equal [Pathname.new("/foo/bar/app")], @root["app"].paths
+    assert_equal ["/foo/bar/app"], @root["app"].paths
   end
 
   test "creating a root level path with options" do
@@ -192,7 +192,7 @@ class PathsTest < ActiveSupport::TestCase
     @root["app"] = "/app"
     @root["app"].glob = "*.rb"
     assert_equal "*.rb", @root["app"].glob
-    assert_equal [Pathname.new("/app")], @root["app"].paths
+    assert_equal ["/foo/bar/app"], @root["app"].paths
   end
 
   test "it should be possible to override a path's default glob without assignment" do
-- 
cgit v1.2.3


From cf992fba95eb5d6282b0d04a52a3595f1c089512 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Sun, 27 May 2012 12:28:26 +0200
Subject: Fix railties_order when application object is passed

railites_order method, introduced in 40b19e0, had a bug that was causing
loading application instance twice in initializers if railties_order
already included application instance. So for example

    railties_order = [Foo::Engine, :main_app, Bar::Engine]

would result in such railties array:

    [MyApp::Application, Foo::Engine, MyAppApplication, Bar::Engine]

In order to fix it, we need to check for existence of application in
both railties_order and railties arrays.
---
 railties/test/railties/engine_test.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/test')

diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index 7a047ef93a..4437e2c8af 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -1098,6 +1098,10 @@ YAML
 
       get("/assets/bar.js")
       assert_equal "// App's bar js\n;", last_response.body.strip
+
+      # ensure that railties are not added twice
+      railties = Rails.application.ordered_railties.map(&:class)
+      assert_equal railties, railties.uniq
     end
 
     test "railties_order adds :all with lowest priority if not given" do
-- 
cgit v1.2.3