diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-23 18:51:16 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-23 18:51:16 -0700 |
| commit | e600384515dc06db2c56ff5be5c18779f7b379a5 (patch) | |
| tree | fc9938962c6872f06d7afbb765eca41302829636 /railties/test | |
| parent | e96fa8987b0a2c21604c0b5aeb78bedfac5e1faa (diff) | |
| parent | 8f05fee1ff26247d6fec8f06f711a60a3c4e48fc (diff) | |
| download | rails-e600384515dc06db2c56ff5be5c18779f7b379a5.tar.gz rails-e600384515dc06db2c56ff5be5c18779f7b379a5.tar.bz2 rails-e600384515dc06db2c56ff5be5c18779f7b379a5.zip | |
Merge pull request #8501 from charliesome/version-to-s
Add #to_s method to VERSION modules
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/generators/plugin_new_generator_test.rb | 4 | ||||
| -rw-r--r-- | railties/test/rails_info_test.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb index 34441ef679..48425cbf81 100644 --- a/railties/test/generators/plugin_new_generator_test.rb +++ b/railties/test/generators/plugin_new_generator_test.rb @@ -292,7 +292,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase assert_no_file "bukkits.gemspec" assert_file "Gemfile" do |contents| assert_no_match('gemspec', contents) - assert_match(/gem "rails", "~> #{Rails::VERSION::STRING}"/, contents) + assert_match(/gem "rails", "~> #{Rails.version}"/, contents) assert_match(/group :development do\n gem "sqlite3"\nend/, contents) assert_no_match(/# gem "jquery-rails"/, contents) end @@ -303,7 +303,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase assert_no_file "bukkits.gemspec" assert_file "Gemfile" do |contents| assert_no_match('gemspec', contents) - assert_match(/gem "rails", "~> #{Rails::VERSION::STRING}"/, contents) + assert_match(/gem "rails", "~> #{Rails.version}"/, contents) assert_match(/group :development do\n gem "sqlite3"\nend/, contents) end end diff --git a/railties/test/rails_info_test.rb b/railties/test/rails_info_test.rb index b9fb071d23..47a58a7ab6 100644 --- a/railties/test/rails_info_test.rb +++ b/railties/test/rails_info_test.rb @@ -38,7 +38,7 @@ class InfoTest < ActiveSupport::TestCase end def test_framework_version - assert_property 'Active Support version', ActiveSupport::VERSION::STRING + assert_property 'Active Support version', ActiveSupport.version end def test_frameworks_exist |