@@ -82,17 +82,17 @@ def on_send(node) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
82
82
end
83
83
84
84
minitest_includes ( node ) do |collection , expected , failure_message |
85
- on_assertion ( node , IncludesAssertion . new ( collection , expected ,
85
+ on_assertion ( node , IncludesAssertion . new ( expected , collection ,
86
86
failure_message . first ) )
87
87
end
88
88
89
89
minitest_nil ( node ) do |actual , failure_message |
90
- on_assertion ( node , NilAssertion . new ( actual ,
90
+ on_assertion ( node , NilAssertion . new ( nil , actual ,
91
91
failure_message . first ) )
92
92
end
93
93
94
94
minitest_empty ( node ) do |actual , failure_message |
95
- on_assertion ( node , EmptyAssertion . new ( actual ,
95
+ on_assertion ( node , EmptyAssertion . new ( nil , actual ,
96
96
failure_message . first ) )
97
97
end
98
98
end
@@ -109,99 +109,75 @@ def message(preferred)
109
109
end
110
110
111
111
# :nodoc:
112
- class EqualAssertion
112
+ class BasicAssertion
113
113
def initialize ( expected , actual , fail_message )
114
- @expected = expected
115
- @actual = actual
116
- @fail_message = fail_message
114
+ @expected = expected &. source
115
+ @actual = actual . source
116
+ @fail_message = fail_message &. source
117
117
end
118
118
119
119
def replaced ( node )
120
- runner = node . method? ( :assert_equal ) ? 'to ' : 'not_to '
120
+ runner = negated? ( node ) ? 'not_to ' : 'to '
121
121
if @fail_message . nil?
122
- "expect(#{ @actual . source } ).#{ runner } eq( #{ @expected . source } ) "
122
+ "expect(#{ @actual } ).#{ runner } #{ assertion } "
123
123
else
124
- "expect(#{ @actual . source } ).#{ runner } (eq(#{ @expected . source } )," \
125
- " #{ @fail_message . source } )"
124
+ "expect(#{ @actual } ).#{ runner } (#{ assertion } , #{ @fail_message } )"
126
125
end
127
126
end
128
127
end
129
128
130
129
# :nodoc:
131
- class InstanceOfAssertion
132
- def initialize ( expected , actual , fail_message )
133
- @expected = expected
134
- @actual = actual
135
- @fail_message = fail_message
130
+ class EqualAssertion < BasicAssertion
131
+ def negated? ( node )
132
+ !node . method? ( :assert_equal )
136
133
end
137
134
138
- def replaced ( node )
139
- runner = node . method? ( :assert_instance_of ) ? 'to' : 'not_to'
140
- if @fail_message . nil?
141
- "expect(#{ @actual . source } ).#{ runner } be_an_instance_of" \
142
- "(#{ @expected . source } )"
143
- else
144
- "expect(#{ @actual . source } ).#{ runner } (be_an_instance_of" \
145
- "(#{ @expected . source } ), #{ @fail_message . source } )"
146
- end
135
+ def assertion
136
+ "eq(#{ @expected } )"
147
137
end
148
138
end
149
139
150
140
# :nodoc:
151
- class IncludesAssertion
152
- def initialize ( collection , expected , fail_message )
153
- @collection = collection
154
- @expected = expected
155
- @fail_message = fail_message
141
+ class InstanceOfAssertion < BasicAssertion
142
+ def negated? ( node )
143
+ !node . method? ( :assert_instance_of )
156
144
end
157
145
158
- def replaced ( node )
159
- a_source = @collection . source
160
- b_source = @expected . source
146
+ def assertion
147
+ "be_an_instance_of(#{ @expected } )"
148
+ end
149
+ end
161
150
162
- runner = node . method? ( :assert_includes ) ? 'to' : 'not_to'
163
- if @fail_message . nil?
164
- "expect(#{ a_source } ).#{ runner } include(#{ b_source } )"
165
- else
166
- "expect(#{ a_source } ).#{ runner } (include(#{ b_source } )," \
167
- " #{ @fail_message . source } )"
168
- end
151
+ # :nodoc:
152
+ class IncludesAssertion < BasicAssertion
153
+ def negated? ( node )
154
+ !node . method? ( :assert_includes )
155
+ end
156
+
157
+ def assertion
158
+ "include(#{ @expected } )"
169
159
end
170
160
end
171
161
172
162
# :nodoc:
173
- class NilAssertion
174
- def initialize ( actual , fail_message )
175
- @actual = actual
176
- @fail_message = fail_message
163
+ class NilAssertion < BasicAssertion
164
+ def negated? ( node )
165
+ !node . method? ( :assert_nil )
177
166
end
178
167
179
- def replaced ( node )
180
- runner = node . method? ( :assert_nil ) ? 'to' : 'not_to'
181
- if @fail_message . nil?
182
- "expect(#{ @actual . source } ).#{ runner } eq(nil)"
183
- else
184
- "expect(#{ @actual . source } ).#{ runner } (eq(nil), " \
185
- "#{ @fail_message . source } )"
186
- end
168
+ def assertion
169
+ 'eq(nil)'
187
170
end
188
171
end
189
172
190
173
# :nodoc:
191
- class EmptyAssertion
192
- def initialize ( actual , fail_message )
193
- @actual = actual
194
- @fail_message = fail_message
174
+ class EmptyAssertion < BasicAssertion
175
+ def negated? ( node )
176
+ !node . method? ( :assert_empty )
195
177
end
196
178
197
- def replaced ( node )
198
- runner = node . method? ( :assert_empty ) ? 'to' : 'not_to'
199
- if @fail_message . nil?
200
- "expect(#{ @actual . source } ).#{ runner } be_empty"
201
- else
202
- "expect(#{ @actual . source } ).#{ runner } (be_empty, " \
203
- "#{ @fail_message . source } )"
204
- end
179
+ def assertion
180
+ 'be_empty'
205
181
end
206
182
end
207
183
end
0 commit comments