diff options
| -rw-r--r-- | Gemfile | 8 | ||||
| -rw-r--r-- | activeresource/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | railties/test/generators/plugin_new_generator_test.rb | 5 |
3 files changed, 8 insertions, 7 deletions
@@ -17,10 +17,12 @@ else gem 'journey' end +gem 'i18n', '~> 0.6.11' +gem 'test-unit', '~> 3.0' + if RUBY_VERSION < '1.9.3' - gem 'i18n', '~> 0.6.11' + gem 'rack-cache', '~> 1.2.0' end -gem 'test-unit', '~> 3.0' # This needs to be with require false to avoid # it being automatically loaded by sprockets @@ -73,7 +75,7 @@ platforms :ruby do gem 'pg', '>= 0.11.0' end gem 'mysql', '>= 2.8.1' - gem 'mysql2', '>= 0.3.10' + gem 'mysql2', '~> 0.3.10' end end diff --git a/activeresource/CHANGELOG.md b/activeresource/CHANGELOG.md index e88d9982b9..801ac581d9 100644 --- a/activeresource/CHANGELOG.md +++ b/activeresource/CHANGELOG.md @@ -1,4 +1,4 @@ -## Rails 3.2.19 (Jun 16, 2015) ## +## Rails 3.2.22 (Jun 16, 2015) ## * No changes. diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb index a33c6b096c..7fc53ceb27 100644 --- a/railties/test/generators/plugin_new_generator_test.rb +++ b/railties/test/generators/plugin_new_generator_test.rb @@ -121,7 +121,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase def test_generation_runs_bundle_install_with_full_and_mountable result = run_generator [destination_root, "--mountable", "--full"] - assert_equal 1, result.scan("Your bundle is complete").size + assert_equal 1, result.scan("Bundle complete!").size end def test_skipping_javascripts_without_mountable_option @@ -263,7 +263,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase assert_file "spec/dummy/config/application.rb" assert_no_file "test" end - + def test_ensure_that_gitignore_can_be_generated_from_a_template_for_dummy_path FileUtils.cd(Rails.root) run_generator([destination_root, "--dummy_path", "spec/dummy" "--skip-test-unit"]) @@ -329,4 +329,3 @@ protected silence(:stdout){ generator.send(*args, &block) } end end - |