@@ -30,22 +30,24 @@ class MinitestAssertions < Base
30
30
class BasicAssertion
31
31
extend NodePattern ::Macros
32
32
33
+ attr_reader :expected , :actual , :failure_message
34
+
33
35
def self . minitest_assertion
34
36
raise NotImplementedError
35
37
end
36
38
37
- def initialize ( expected , actual , fail_message )
39
+ def initialize ( expected , actual , failure_message )
38
40
@expected = expected &.source
39
41
@actual = actual . source
40
- @fail_message = fail_message &.source
42
+ @failure_message = failure_message &.source
41
43
end
42
44
43
45
def replaced ( node )
44
46
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 } "
47
49
else
48
- "expect(#{ @ actual} ).#{ runner } (#{ assertion } , #{ @fail_message } )"
50
+ "expect(#{ actual } ).#{ runner } (#{ assertion } , #{ failure_message } )"
49
51
end
50
52
end
51
53
@@ -76,7 +78,7 @@ def self.match(expected, actual, failure_message)
76
78
end
77
79
78
80
def assertion
79
- "eq(#{ @ expected} )"
81
+ "eq(#{ expected } )"
80
82
end
81
83
end
82
84
@@ -98,7 +100,7 @@ def self.match(expected, actual, failure_message)
98
100
end
99
101
100
102
def assertion
101
- "be_an_instance_of(#{ @ expected} )"
103
+ "be_an_instance_of(#{ expected } )"
102
104
end
103
105
end
104
106
@@ -120,7 +122,7 @@ def self.match(collection, expected, failure_message)
120
122
end
121
123
122
124
def assertion
123
- "include(#{ @ expected} )"
125
+ "include(#{ expected } )"
124
126
end
125
127
end
126
128
@@ -144,7 +146,7 @@ def self.match(subject, predicate, failure_message)
144
146
end
145
147
146
148
def assertion
147
- "be_#{ @ expected. delete_prefix ( ':' ) . delete_suffix ( '?' ) } "
149
+ "be_#{ expected . delete_prefix ( ':' ) . delete_suffix ( '?' ) } "
148
150
end
149
151
end
150
152
@@ -165,7 +167,7 @@ def self.match(matcher, actual, failure_message)
165
167
end
166
168
167
169
def assertion
168
- "match(#{ @ expected} )"
170
+ "match(#{ expected } )"
169
171
end
170
172
end
171
173
0 commit comments