Skip to content

Commit 92fe065

Browse files
authored
Merge pull request #970 from rubocop-hq/rubocop-performance
Use rubocop-performance
2 parents a560e69 + ed35958 commit 92fe065

File tree

6 files changed

+11
-8
lines changed

6 files changed

+11
-8
lines changed

.rubocop.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
inherit_from: .rubocop_todo.yml
2+
23
require:
4+
- rubocop-performance
35
- rubocop-rspec
46
- rubocop/cop/internal_affairs
57

lib/rubocop/cop/rspec/cop.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def relevant_file?(file)
4141
private
4242

4343
def relevant_rubocop_rspec_file?(file)
44-
rspec_pattern =~ file
44+
rspec_pattern.match?(file)
4545
end
4646

4747
def rspec_pattern

lib/rubocop/cop/rspec/describe_class.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def on_top_level_describe(node, (described_value, _))
6464

6565
def string_constant_describe?(described_value)
6666
described_value.str_type? &&
67-
described_value.value =~ /^((::)?[A-Z]\w*)+$/
67+
described_value.value.match?(/^(?:(?:::)?[A-Z]\w*)+$/)
6868
end
6969
end
7070
end

lib/rubocop/cop/rspec/empty_line_after_final_let.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ class EmptyLineAfterFinalLet < Cop
2525
def on_block(node)
2626
return unless example_group_with_body?(node)
2727

28-
latest_let = node.body.child_nodes.select { |child| let?(child) }.last
28+
final_let = node.body.child_nodes.reverse.find { |child| let?(child) }
2929

30-
return if latest_let.nil?
30+
return if final_let.nil?
3131

32-
missing_separating_line_offense(latest_let) do |method|
32+
missing_separating_line_offense(final_let) do |method|
3333
format(MSG, let: method)
3434
end
3535
end

lib/rubocop/cop/rspec/example_wording.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ class ExampleWording < Cop
4747

4848
def on_block(node)
4949
it_description(node) do |description_node, message|
50-
if message =~ SHOULD_PREFIX
50+
if message.match?(SHOULD_PREFIX)
5151
add_wording_offense(description_node, MSG_SHOULD)
52-
elsif message =~ IT_PREFIX
52+
elsif message.match?(IT_PREFIX)
5353
add_wording_offense(description_node, MSG_IT)
5454
end
5555
end
@@ -77,7 +77,7 @@ def docstring(node)
7777
def replacement_text(node)
7878
text = text(node)
7979

80-
if text =~ SHOULD_PREFIX
80+
if text.match?(SHOULD_PREFIX)
8181
RuboCop::RSpec::Wording.new(
8282
text,
8383
ignore: ignored_words,

rubocop-rspec.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ Gem::Specification.new do |spec|
4141
spec.add_development_dependency 'rack'
4242
spec.add_development_dependency 'rake'
4343
spec.add_development_dependency 'rspec', '>= 3.4'
44+
spec.add_development_dependency 'rubocop-performance', '~> 1.7'
4445
# Workaround for cc-test-reporter with SimpleCov 0.18.
4546
# Stop upgrading SimpleCov until the following issue will be resolved.
4647
# https://github.com/codeclimate/test-reporter/issues/418

0 commit comments

Comments
 (0)