diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-19 18:37:19 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-19 18:37:19 -0700 |
| commit | acb1624f2732a4fcfa006c3e8694020635baba6b (patch) | |
| tree | a1bbf079477b906c8fa31dfbfb94b7647544ccb7 /railties/test/generators/app_generator_test.rb | |
| parent | 7ab30599a6c0ca44d68ca10383b07ba4a8bd75b4 (diff) | |
| parent | 1f9d234a6b567e68d97e71da6f19bd126e7f7058 (diff) | |
| download | rails-acb1624f2732a4fcfa006c3e8694020635baba6b.tar.gz rails-acb1624f2732a4fcfa006c3e8694020635baba6b.tar.bz2 rails-acb1624f2732a4fcfa006c3e8694020635baba6b.zip | |
Merge commit 'josevalim/fixes'
Conflicts:
railties/test/generators/app_generator_test.rb
Diffstat (limited to 'railties/test/generators/app_generator_test.rb')
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 3eefaf9b02..20f2a24e6d 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -114,7 +114,14 @@ 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' + + 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 |