Merge pull request #28621 from koic/fix_failed_test_when_running_with…

…_oracle Fix a failed AR test when running with OracleAdapter
rails · Mar 31, 2017 · fb084e2 · fb084e2
2 parents 85d4b2a + bd7a302
commit fb084e2
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/activerecord/test/cases/scoping/default_scoping_test.rb b/activerecord/test/cases/scoping/default_scoping_test.rb
@@ -462,6 +462,8 @@ def test_sti_conditions_are_not_carried_in_default_scope
   def test_with_abstract_class_scope_should_be_executed_in_correct_context
     vegetarian_pattern, gender_pattern = if current_adapter?(:Mysql2Adapter)
       [/`lions`.`is_vegetarian`/, /`lions`.`gender`/]
+    elsif current_adapter?(:OracleAdapter)
+      [/"LIONS"."IS_VEGETARIAN"/, /"LIONS"."GENDER"/]
     else
       [/"lions"."is_vegetarian"/, /"lions"."gender"/]
     end