aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorArthur Nogueira Neves <github@arthurnn.com>2016-11-03 12:22:56 -0400
committerGitHub <noreply@github.com>2016-11-03 12:22:56 -0400
commita8482138a4fb69e91a7e7c7184b296800d949d6e (patch)
treeca8dc43d81d4a142d4c470c66d76f43e0673aac6 /activerecord/test/cases
parent264566a1b56de4abace2444dff4c9535744855f0 (diff)
parentf7f66e2ba9340122fe98a85b99712e2d34ecb222 (diff)
downloadrails-a8482138a4fb69e91a7e7c7184b296800d949d6e.tar.gz
rails-a8482138a4fb69e91a7e7c7184b296800d949d6e.tar.bz2
rails-a8482138a4fb69e91a7e7c7184b296800d949d6e.zip
Merge pull request #26455 from kamipo/move_test_quoting_classes
Move `test_quoting_classes` into `test/cases/quoting_test.rb`
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/connection_adapters/quoting_test.rb13
-rw-r--r--activerecord/test/cases/quoting_test.rb4
2 files changed, 4 insertions, 13 deletions
diff --git a/activerecord/test/cases/connection_adapters/quoting_test.rb b/activerecord/test/cases/connection_adapters/quoting_test.rb
deleted file mode 100644
index 59dcb96ebc..0000000000
--- a/activerecord/test/cases/connection_adapters/quoting_test.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require "cases/helper"
-
-module ActiveRecord
- module ConnectionAdapters
- module Quoting
- class QuotingTest < ActiveRecord::TestCase
- def test_quoting_classes
- assert_equal "'Object'", AbstractAdapter.new(nil).quote(Object)
- end
- end
- end
- end
-end
diff --git a/activerecord/test/cases/quoting_test.rb b/activerecord/test/cases/quoting_test.rb
index 296dafacc2..05b71638c1 100644
--- a/activerecord/test/cases/quoting_test.rb
+++ b/activerecord/test/cases/quoting_test.rb
@@ -124,6 +124,10 @@ module ActiveRecord
assert_equal "'lol'", @quoter.quote(DateTime.now, nil)
end
+ def test_quoting_classes
+ assert_equal "'Object'", @quoter.quote(Object)
+ end
+
def test_crazy_object
crazy = Object.new
e = assert_raises(TypeError) do