Skip to content

Commit 96ed567

Browse files
committed
Use getter methods instead of instance variables
1 parent 1a0bdbb commit 96ed567

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

lib/rubocop/cop/rspec_rails/minitest_assertions.rb

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,24 @@ class MinitestAssertions < Base
3030
class BasicAssertion
3131
extend NodePattern::Macros
3232

33+
attr_reader :expected, :actual, :failure_message
34+
3335
def self.minitest_assertion
3436
raise NotImplementedError
3537
end
3638

37-
def initialize(expected, actual, fail_message)
39+
def initialize(expected, actual, failure_message)
3840
@expected = expected&.source
3941
@actual = actual.source
40-
@fail_message = fail_message&.source
42+
@failure_message = failure_message&.source
4143
end
4244

4345
def replaced(node)
4446
runner = negated?(node) ? 'not_to' : 'to'
45-
if @fail_message.nil?
46-
"expect(#{@actual}).#{runner} #{assertion}"
47+
if failure_message.nil?
48+
"expect(#{actual}).#{runner} #{assertion}"
4749
else
48-
"expect(#{@actual}).#{runner}(#{assertion}, #{@fail_message})"
50+
"expect(#{actual}).#{runner}(#{assertion}, #{failure_message})"
4951
end
5052
end
5153

@@ -76,7 +78,7 @@ def self.match(expected, actual, failure_message)
7678
end
7779

7880
def assertion
79-
"eq(#{@expected})"
81+
"eq(#{expected})"
8082
end
8183
end
8284

@@ -98,7 +100,7 @@ def self.match(expected, actual, failure_message)
98100
end
99101

100102
def assertion
101-
"be_an_instance_of(#{@expected})"
103+
"be_an_instance_of(#{expected})"
102104
end
103105
end
104106

@@ -120,7 +122,7 @@ def self.match(collection, expected, failure_message)
120122
end
121123

122124
def assertion
123-
"include(#{@expected})"
125+
"include(#{expected})"
124126
end
125127
end
126128

@@ -144,7 +146,7 @@ def self.match(subject, predicate, failure_message)
144146
end
145147

146148
def assertion
147-
"be_#{@expected.delete_prefix(':').delete_suffix('?')}"
149+
"be_#{expected.delete_prefix(':').delete_suffix('?')}"
148150
end
149151
end
150152

@@ -165,7 +167,7 @@ def self.match(matcher, actual, failure_message)
165167
end
166168

167169
def assertion
168-
"match(#{@expected})"
170+
"match(#{expected})"
169171
end
170172
end
171173

0 commit comments

Comments
 (0)