Merge pull request #1456 from Earlopain/timestamp-numblock

koic · web-flow · commit 9254ef6d6467 · 2025-02-28T00:53:21.000+09:00
Fix a false positive for `Rails/CreateTableWithTimestamps` with numblocks
diff --git a/changelog/fix_false_positive_table_timestamp_numblock.md b/changelog/fix_false_positive_table_timestamp_numblock.md
@@ -0,0 +1 @@
+* [#1456](https://github.com/rubocop/rubocop-rails/pull/1456): Fix a false positive for `Rails/CreateTableWithTimestamps` with numblocks. ([@earlopain][])
diff --git a/lib/rubocop/cop/mixin/active_record_migrations_helper.rb b/lib/rubocop/cop/mixin/active_record_migrations_helper.rb
@@ -22,9 +22,9 @@ module ActiveRecordMigrationsHelper
       ].freeze
 
       def_node_matcher :create_table_with_block?, <<~PATTERN
-        (block
+        (any_block
           (send nil? :create_table ...)
-          (args (arg _var))
+          { _ | (args (arg _var)) }
           _)
       PATTERN
     end
diff --git a/spec/rubocop/cop/rails/create_table_with_timestamps_spec.rb b/spec/rubocop/cop/rails/create_table_with_timestamps_spec.rb
@@ -35,7 +35,7 @@
     RUBY
   end
 
-  it 'registers an offense when not including timestampswith `to_proc` syntax' do
+  it 'registers an offense when not including timestamps with `to_proc` syntax' do
     expect_offense <<~RUBY
       create_table :users, &:extension_columns
       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Add timestamps when creating a new table.
@@ -53,13 +53,24 @@
     RUBY
   end
 
-  it 'does not register an offense when including timestampswith `to_proc` syntax' do
+  it 'does not register an offense when including timestamps in numblock' do
+    expect_no_offenses <<~RUBY
+      create_table :users do
+        _1.string :name
+        _1.string :email
+
+        _1.timestamps
+      end
+    RUBY
+  end
+
+  it 'does not register an offense when including timestamps with `to_proc` syntax' do
     expect_no_offenses <<~RUBY
       create_table :users, &:timestamps
     RUBY
   end
 
-  it 'does not register an offense when including timestampswith options and `to_proc` syntax' do
+  it 'does not register an offense when including timestamps with options and `to_proc` syntax' do
     expect_no_offenses <<~RUBY
       create_table :users, id: :string, limit: 42, &:timestamps
     RUBY

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+* [#1456](https://github.com/rubocop/rubocop-rails/pull/1456): Fix a false positive for `Rails/CreateTableWithTimestamps` with numblocks. ([@earlopain][])