aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-01-30 12:14:39 -0500
committerRafael França <rafaelmfranca@gmail.com>2016-01-30 12:14:39 -0500
commit92dcda5ca391d597fd93838bef58822299a785ae (patch)
tree92aa7cff1a2bd99a09aa94812ed1be00e966e9d9 /activerecord/test
parent2cf128438111097ce76ac753938a321db9615f51 (diff)
parente05d828b1f89f4a78e5eca67419275fb63cbeee2 (diff)
downloadrails-92dcda5ca391d597fd93838bef58822299a785ae.tar.gz
rails-92dcda5ca391d597fd93838bef58822299a785ae.tar.bz2
rails-92dcda5ca391d597fd93838bef58822299a785ae.zip
Merge pull request #23352 from yui-knk/move_test_conditions
There is no need to define test if a connection does not support prim…
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/primary_keys_test.rb20
1 files changed, 9 insertions, 11 deletions
diff --git a/activerecord/test/cases/primary_keys_test.rb b/activerecord/test/cases/primary_keys_test.rb
index 7e18313c00..8ce2b813bf 100644
--- a/activerecord/test/cases/primary_keys_test.rb
+++ b/activerecord/test/cases/primary_keys_test.rb
@@ -135,22 +135,20 @@ class PrimaryKeysTest < ActiveRecord::TestCase
end
end
- def test_primary_key_returns_value_if_it_exists
- klass = Class.new(ActiveRecord::Base) do
- self.table_name = 'developers'
- end
+ if ActiveRecord::Base.connection.supports_primary_key?
+ def test_primary_key_returns_value_if_it_exists
+ klass = Class.new(ActiveRecord::Base) do
+ self.table_name = 'developers'
+ end
- if ActiveRecord::Base.connection.supports_primary_key?
assert_equal 'id', klass.primary_key
end
- end
- def test_primary_key_returns_nil_if_it_does_not_exist
- klass = Class.new(ActiveRecord::Base) do
- self.table_name = 'developers_projects'
- end
+ def test_primary_key_returns_nil_if_it_does_not_exist
+ klass = Class.new(ActiveRecord::Base) do
+ self.table_name = 'developers_projects'
+ end
- if ActiveRecord::Base.connection.supports_primary_key?
assert_nil klass.primary_key
end
end