Skip to content

Commit d26f48a

Browse files
authored
Merge pull request rails#32648 from bogdanvlviv/improve-pattern-filenames-to-catch-more-style-offences
Allow rubocop check more files
2 parents cddcc1d + 1a42d87 commit d26f48a

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

.rubocop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ AllCops:
1414
# Prefer assert_not_x over refute_x
1515
CustomCops/RefuteNot:
1616
Include:
17-
- '**/*_test.rb'
17+
- '**/test/**/*'
1818

1919
# Prefer assert_not over assert !
2020
CustomCops/AssertNot:
2121
Include:
22-
- '**/*_test.rb'
22+
- '**/test/**/*'
2323

2424
# Prefer &&/|| over and/or.
2525
Style/AndOr:

activesupport/test/cache/behaviors/cache_delete_matched_behavior.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ def test_delete_matched
77
@cache.write("foo/bar", "baz")
88
@cache.write("fu/baz", "bar")
99
@cache.delete_matched(/oo/)
10-
assert !@cache.exist?("foo")
10+
assert_not @cache.exist?("foo")
1111
assert @cache.exist?("fu")
12-
assert !@cache.exist?("foo/bar")
12+
assert_not @cache.exist?("foo/bar")
1313
assert @cache.exist?("fu/baz")
1414
end
1515
end

activesupport/test/cache/behaviors/cache_store_behavior.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def test_fetch_with_cache_miss_passes_key_to_block
3333

3434
cache_miss = false
3535
assert_equal 3, @cache.fetch("foo") { |key| cache_miss = true; key.length }
36-
assert !cache_miss
36+
assert_not cache_miss
3737
end
3838

3939
def test_fetch_with_forced_cache_miss
@@ -308,7 +308,7 @@ def test_delete
308308
@cache.write("foo", "bar")
309309
assert @cache.exist?("foo")
310310
assert @cache.delete("foo")
311-
assert !@cache.exist?("foo")
311+
assert_not @cache.exist?("foo")
312312
end
313313

314314
def test_original_store_objects_should_not_be_immutable

activesupport/test/cache/behaviors/cache_store_version_behavior.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def test_exist_with_right_version_should_be_true
3030

3131
def test_exist_with_wrong_version_should_be_false
3232
@cache.write("foo", "bar", version: 1)
33-
assert !@cache.exist?("foo", version: 2)
33+
assert_not @cache.exist?("foo", version: 2)
3434
end
3535

3636
def test_reading_and_writing_with_model_supporting_cache_version

activesupport/test/cache/behaviors/failure_safety_behavior.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def test_exist_failure_returns_false
6363
@cache.write("foo", "bar")
6464

6565
emulating_unavailability do |cache|
66-
assert !cache.exist?("foo")
66+
assert_not cache.exist?("foo")
6767
end
6868
end
6969

activesupport/test/file_update_checker_shared_tests.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def run(*args)
3030

3131
checker = new_checker { i += 1 }
3232

33-
assert !checker.execute_if_updated
33+
assert_not checker.execute_if_updated
3434
assert_equal 0, i
3535
end
3636

@@ -41,7 +41,7 @@ def run(*args)
4141

4242
checker = new_checker(tmpfiles) { i += 1 }
4343

44-
assert !checker.execute_if_updated
44+
assert_not checker.execute_if_updated
4545
assert_equal 0, i
4646
end
4747

@@ -212,7 +212,7 @@ def run(*args)
212212
touch(tmpfile("foo.rb"))
213213
wait
214214

215-
assert !checker.execute_if_updated
215+
assert_not checker.execute_if_updated
216216
assert_equal 0, i
217217
end
218218

@@ -238,7 +238,7 @@ def run(*args)
238238
mkdir(subdir)
239239
wait
240240

241-
assert !checker.execute_if_updated
241+
assert_not checker.execute_if_updated
242242
assert_equal 0, i
243243

244244
touch(File.join(subdir, "nested.rb"))
@@ -259,7 +259,7 @@ def run(*args)
259259
touch(tmpfile("new.txt"))
260260
wait
261261

262-
assert !checker.execute_if_updated
262+
assert_not checker.execute_if_updated
263263
assert_equal 0, i
264264

265265
# subdir does not look for Ruby files, but its parent tmpdir does.

0 commit comments

Comments
 (0)