aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2017-07-17 17:36:18 +0930
committerGitHub <noreply@github.com>2017-07-17 17:36:18 +0930
commitfbade51248ea48db87703ba7418badbd3ed85e36 (patch)
tree57b9b95a9eef8fa397532992fc277f31019d2815 /activerecord/test/cases
parenta0ff5b57246f0b1439dc9b5ffbdd880e70fab93d (diff)
parent4183d5dfa1d6d651232a4db44a1fcf71d220af4e (diff)
downloadrails-fbade51248ea48db87703ba7418badbd3ed85e36.tar.gz
rails-fbade51248ea48db87703ba7418badbd3ed85e36.tar.bz2
rails-fbade51248ea48db87703ba7418badbd3ed85e36.zip
Merge pull request #29810 from kamipo/add_first_parameter_indentation
Enable `Layout/FirstParameterIndentation` cop
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/scoping/default_scoping_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/scoping/default_scoping_test.rb b/activerecord/test/cases/scoping/default_scoping_test.rb
index e310739f7b..bd05cb4787 100644
--- a/activerecord/test/cases/scoping/default_scoping_test.rb
+++ b/activerecord/test/cases/scoping/default_scoping_test.rb
@@ -332,7 +332,7 @@ class DefaultScopingTest < ActiveRecord::TestCase
def test_create_with_merge
aaron = PoorDeveloperCalledJamis.create_with(name: "foo", salary: 20).merge(
- PoorDeveloperCalledJamis.create_with(name: "Aaron")).new
+ PoorDeveloperCalledJamis.create_with(name: "Aaron")).new
assert_equal 20, aaron.salary
assert_equal "Aaron", aaron.name