1 files changed, 9 insertions, 2 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 5d6a9f6de9..20f2a24e6d 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -114,11 +114,18 @@ class AppGeneratorTest < GeneratorsTestCase
     generator(:freeze => true, :database => "sqlite3").expects(:run).
               with("rake rails:freeze:edge", :verbose => false)
     silence(:stdout){ generator.invoke }
-    assert_file 'config/environment.rb', /# RAILS_GEM_VERSION/
+
+    assert_file 'Gemfile' do |content|
+      flag = %(gem "rails", "#{Rails::VERSION::STRING}", :git => "git://github.com/rails/rails.git")
+      assert_match /^#{Regexp.escape(flag)}$/, content
+
+      flag = %(# gem "rails", "#{Rails::VERSION::STRING}")
+      assert_match /^#{Regexp.escape(flag)}$/, content
+    end
   end
 
   def test_template_from_dir_pwd
-    FileUtils.cd(RAILS_ROOT)
+    FileUtils.cd(Rails.root)
     assert_match /It works from file!/, run_generator(["-m", "lib/template.rb"])
   end