Skip to content

Commit 342e99d

Browse files
committed
RSpec/SubjectStub. Code review fixes.
1 parent 7a0a6b6 commit 342e99d

File tree

3 files changed

+12
-955
lines changed

3 files changed

+12
-955
lines changed

lib/rubocop/rspec/top_level_group.rb

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ module RuboCop
44
module RSpec
55
# Helper methods for top level example group cops
66
module TopLevelGroup
7-
extend NodePattern::Macros
7+
extend RuboCop::NodePattern::Macros
8+
include RuboCop::RSpec::Language
89

910
def_node_matcher :example_or_shared_group?,
10-
(
11-
Language::ExampleGroups::ALL +
12-
Language::SharedGroups::ALL
13-
).block_pattern
11+
(ExampleGroups::ALL + SharedGroups::ALL).block_pattern
1412

1513
def on_block(node)
1614
return unless respond_to?(:on_top_level_group)
@@ -26,12 +24,12 @@ def top_level_group?(node)
2624
end
2725

2826
def top_level_groups
29-
@top_level_groups ||= \
27+
@top_level_groups ||=
3028
top_level_nodes.select { |n| example_or_shared_group?(n) }
3129
end
3230

3331
def top_level_nodes
34-
@top_level_nodes ||= \
32+
@top_level_nodes ||=
3533
if root_node.begin_type?
3634
root_node.children
3735
else

spec/rubocop/cop/rspec/subject_stub_spec.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -324,20 +324,20 @@
324324

325325
it 'flags when there are several top level example groups' do
326326
expect_offense(<<-RUBY)
327-
describe Foo do
327+
RSpec.describe Foo do
328328
subject(:foo) { described_class.new }
329329
330330
specify do
331331
expect(foo).to eq(foo)
332332
end
333333
end
334334
335-
describe Bar do
335+
RSpec.describe Bar do
336336
subject(:bar) { described_class.new }
337337
338338
specify do
339-
allow(bar).to receive(:bar).and_return(baz)
340-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Do not stub methods of the object under test.
339+
allow(bar).to receive(:bar)
340+
^^^^^^^^^^^^^^^^^^^^^^^^^^^ Do not stub methods of the object under test.
341341
end
342342
end
343343
RUBY
@@ -353,10 +353,10 @@
353353
].each do |method|
354354
it "flags in top level #{method}" do
355355
expect_offense(<<-RUBY)
356-
#{method} '#{method}' do
356+
RSpec.#{method} '#{method}' do
357357
it 'uses an implicit subject' do
358-
expect(subject).to receive(:bar).and_return(baz)
359-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Do not stub methods of the object under test.
358+
expect(subject).to receive(:bar)
359+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Do not stub methods of the object under test.
360360
end
361361
end
362362
RUBY

0 commit comments

Comments
 (0)