2 files changed, 26 insertions, 4 deletions
diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb
index 8812685620..c2d4a0f2c8 100644
--- a/railties/test/application/initializers/frameworks_test.rb
+++ b/railties/test/application/initializers/frameworks_test.rb
@@ -1,4 +1,5 @@
 require "isolation/abstract_unit"
+require 'set'
 
 module ApplicationTests
   class FrameworksTest < ActiveSupport::TestCase
@@ -66,7 +67,7 @@ module ApplicationTests
       require "#{app_path}/config/environment"
       assert Foo.method_defined?(:foo_path)
       assert Foo.method_defined?(:main_app)
-      assert_equal ["notify"], Foo.action_methods
+      assert_equal Set.new(["notify"]), Foo.action_methods
     end
 
     test "allows to not load all helpers for controllers" do
@@ -115,7 +116,7 @@ module ApplicationTests
 
       app_file "config/routes.rb", <<-RUBY
         AppTemplate::Application.routes.draw do
-          match "/:controller(/:action)"
+          get "/:controller(/:action)"
         end
       RUBY
 
@@ -193,5 +194,26 @@ module ApplicationTests
       require "#{app_path}/config/environment"
       assert_nil defined?(ActiveRecord::Base)
     end
+
+    test "use schema cache dump" do
+      Dir.chdir(app_path) do
+        `rails generate model post title:string;
+         bundle exec rake db:migrate db:schema:cache:dump`
+      end
+      require "#{app_path}/config/environment"
+      ActiveRecord::Base.connection.drop_table("posts") # force drop posts table for test.
+      assert ActiveRecord::Base.connection.schema_cache.tables["posts"]
+    end
+
+    test "expire schema cache dump" do
+      Dir.chdir(app_path) do
+        `rails generate model post title:string;
+         bundle exec rake db:migrate db:schema:cache:dump db:rollback`
+      end
+      silence_warnings {
+        require "#{app_path}/config/environment"
+        assert !ActiveRecord::Base.connection.schema_cache.tables["posts"]
+      }
+    end
   end
 end
diff --git a/railties/test/application/initializers/i18n_test.rb b/railties/test/application/initializers/i18n_test.rb
index abb277dc1d..02d20bc150 100644
--- a/railties/test/application/initializers/i18n_test.rb
+++ b/railties/test/application/initializers/i18n_test.rb
@@ -85,7 +85,7 @@ en:
 
       app_file 'config/routes.rb', <<-RUBY
         AppTemplate::Application.routes.draw do
-          match '/i18n',   :to => lambda { |env| [200, {}, [Foo.instance_variable_get('@foo')]] }
+          get '/i18n',   :to => lambda { |env| [200, {}, [Foo.instance_variable_get('@foo')]] }
         end
       RUBY
 
@@ -109,7 +109,7 @@ en:
 
       app_file 'config/routes.rb', <<-RUBY
         AppTemplate::Application.routes.draw do
-          match '/i18n',   :to => lambda { |env| [200, {}, [I18n.t(:foo)]] }
+          get '/i18n',   :to => lambda { |env| [200, {}, [I18n.t(:foo)]] }
         end
       RUBY