diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-11-23 02:59:27 -0800 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-11-23 02:59:27 -0800 |
| commit | 8461b6eda4fa685eb9ca0668eb541c7b20705e0c (patch) | |
| tree | 961b43a12e8144c7312b6a43b3f9d535cb0e2381 /railties/test | |
| parent | 845b944b907a182f0bc1f4a25e849c3df5218b94 (diff) | |
| parent | ee4ab3fe522f0c4c3da8463c0154aa206f15a830 (diff) | |
| download | rails-8461b6eda4fa685eb9ca0668eb541c7b20705e0c.tar.gz rails-8461b6eda4fa685eb9ca0668eb541c7b20705e0c.tar.bz2 rails-8461b6eda4fa685eb9ca0668eb541c7b20705e0c.zip | |
Merge pull request #13011 from arunagw/jruby-fixes
Using activerecord-jdbcsqlite3-adapter
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/generators/plugin_generator_test.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb index 068eb66bc6..c6b91e7cba 100644 --- a/railties/test/generators/plugin_generator_test.rb +++ b/railties/test/generators/plugin_generator_test.rb @@ -293,7 +293,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase assert_file "Gemfile" do |contents| assert_no_match('gemspec', contents) assert_match(/gem "rails", "~> #{Rails.version}"/, contents) - assert_match(/group :development do\n gem "sqlite3"\nend/, contents) + assert_match_sqlite3(contents) assert_no_match(/# gem "jquery-rails"/, contents) end end @@ -304,7 +304,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase assert_file "Gemfile" do |contents| assert_no_match('gemspec', contents) assert_match(/gem "rails", "~> #{Rails.version}"/, contents) - assert_match(/group :development do\n gem "sqlite3"\nend/, contents) + assert_match_sqlite3(contents) end end @@ -347,4 +347,12 @@ protected def default_files ::DEFAULT_PLUGIN_FILES end + + def assert_match_sqlite3(contents) + unless defined?(JRUBY_VERSION) + assert_match(/group :development do\n gem "sqlite3"\nend/, contents) + else + assert_match(/group :development do\n gem "activerecord-jdbcsqlite3-adapter"\nend/, contents) + end + end end |