From c8c8fe98b333895a098310cf2bdde8d0e27e271a Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Wed, 30 Jul 2014 23:00:48 -0300
Subject: Invert unless..else conditions on JRuby checks

---
 railties/test/generators/app_generator_test.rb    | 18 +++++++++---------
 railties/test/generators/plugin_generator_test.rb |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'railties')

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index aff484f3eb..55691e373b 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -194,20 +194,20 @@ class AppGeneratorTest < Rails::Generators::TestCase
   def test_config_database_is_added_by_default
     run_generator
     assert_file "config/database.yml", /sqlite3/
-    unless defined?(JRUBY_VERSION)
-      assert_gem "sqlite3"
-    else
+    if defined?(JRUBY_VERSION)
       assert_gem "activerecord-jdbcsqlite3-adapter"
+    else
+      assert_gem "sqlite3"
     end
   end
 
   def test_config_another_database
     run_generator([destination_root, "-d", "mysql"])
     assert_file "config/database.yml", /mysql/
-    unless defined?(JRUBY_VERSION)
-      assert_gem "mysql2"
-    else
+    if defined?(JRUBY_VERSION)
       assert_gem "activerecord-jdbcmysql-adapter"
+    else
+      assert_gem "mysql2"
     end
   end
 
@@ -219,10 +219,10 @@ class AppGeneratorTest < Rails::Generators::TestCase
   def test_config_postgresql_database
     run_generator([destination_root, "-d", "postgresql"])
     assert_file "config/database.yml", /postgresql/
-    unless defined?(JRUBY_VERSION)
-      assert_gem "pg"
-    else
+    if defined?(JRUBY_VERSION)
       assert_gem "activerecord-jdbcpostgresql-adapter"
+    else
+      assert_gem "pg"
     end
   end
 
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index 0d01931daa..0486c22772 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -416,10 +416,10 @@ protected
   end
 
   def assert_match_sqlite3(contents)
-    unless defined?(JRUBY_VERSION)
-      assert_match(/group :development do\n  gem 'sqlite3'\nend/, contents)
-    else
+    if defined?(JRUBY_VERSION)
       assert_match(/group :development do\n  gem 'activerecord-jdbcsqlite3-adapter'\nend/, contents)
+    else
+      assert_match(/group :development do\n  gem 'sqlite3'\nend/, contents)
     end
   end
 end
-- 
cgit v1.2.3