aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/locking_test.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2016-08-07 11:48:29 +0200
committerGitHub <noreply@github.com>2016-08-07 11:48:29 +0200
commitfb98d2e57162876c0e1823a5357bc44a932d08b9 (patch)
tree2c3225f7698ef3f7b2556510136c64a58ecf7355 /activerecord/test/cases/locking_test.rb
parent0d12708f3967fe93c172b30bd3e98e4433761c36 (diff)
parent762e3f05f3d372cb32570db0deeef27232c4dd00 (diff)
downloadrails-fb98d2e57162876c0e1823a5357bc44a932d08b9.tar.gz
rails-fb98d2e57162876c0e1823a5357bc44a932d08b9.tar.bz2
rails-fb98d2e57162876c0e1823a5357bc44a932d08b9.zip
Merge pull request #26077 from kamipo/add_stype_empty_lines
Add `Style/EmptyLines` in `.rubocop.yml` and remove extra empty lines
Diffstat (limited to 'activerecord/test/cases/locking_test.rb')
-rw-r--r--activerecord/test/cases/locking_test.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb
index 84f252d5d1..5c55584ff7 100644
--- a/activerecord/test/cases/locking_test.rb
+++ b/activerecord/test/cases/locking_test.rb
@@ -374,7 +374,6 @@ class OptimisticLockingWithSchemaChangeTest < ActiveRecord::TestCase
end
end
-
# TODO: test against the generated SQL since testing locking behavior itself
# is so cumbersome. Will deadlock Ruby threads if the underlying db.execute
# blocks, so separate script called by Kernel#system is needed.