Skip to content

Commit a34e5b1

Browse files
lmiller1990lmiller1990
committed
chore: resolve conflict
1 parent a4ca2a1 commit a34e5b1

File tree

1 file changed

+9
-25
lines changed

1 file changed

+9
-25
lines changed

Diff for: ‎packages/test-utils/src/error-wrapper.js

+9-25
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,11 @@ export default class ErrorWrapper implements BaseWrapper {
5656
}
5757

5858
emitted(): void {
59+
throwError(
5960
`find did not return ${buildSelectorString(
6061
this.selector
6162
)}, cannot call emitted() on empty Wrapper`
62-
)
63+
)
6364
}
6465

6566
emittedByOrder(): void {
@@ -71,14 +72,15 @@ export default class ErrorWrapper implements BaseWrapper {
7172
}
7273

7374
exists(): boolean {
74-
)
75+
return false
7576
}
7677

7778
filter(): void {
79+
throwError(
7880
`find did not return ${buildSelectorString(
7981
this.selector
8082
)}, cannot call filter() on empty Wrapper`
81-
)
83+
)
8284
}
8385

8486
visible(): void {
@@ -90,22 +92,23 @@ export default class ErrorWrapper implements BaseWrapper {
9092
}
9193

9294
hasAttribute(): void {
95+
throwError(
9396
`find did not return ${buildSelectorString(
9497
this.selector
9598
)}, cannot call hasAttribute() on empty Wrapper`
96-
)
99+
)
97100
}
98101

99102
hasClass(): void {
103+
throwError(
100104
`find did not return ${buildSelectorString(
101105
this.selector
102106
)}, cannot call hasClass() on empty Wrapper`
103-
)
107+
)
104108
}
105109

106110
hasProp(): void {
107111
throwError(
108-
`find did not return ${this.selector}, cannot call hasProp() on empty Wrapper`
109112
`find did not return ${buildSelectorString(
110113
this.selector
111114
)}, cannot call hasProp() on empty Wrapper`
@@ -114,7 +117,6 @@ export default class ErrorWrapper implements BaseWrapper {
114117

115118
hasStyle(): void {
116119
throwError(
117-
`find did not return ${this.selector}, cannot call hasStyle() on empty Wrapper`
118120
`find did not return ${buildSelectorString(
119121
this.selector
120122
)}, cannot call hasStyle() on empty Wrapper`
@@ -123,7 +125,6 @@ export default class ErrorWrapper implements BaseWrapper {
123125

124126
findAll(): void {
125127
throwError(
126-
`find did not return ${this.selector}, cannot call findAll() on empty Wrapper`
127128
`find did not return ${buildSelectorString(
128129
this.selector
129130
)}, cannot call findAll() on empty Wrapper`
@@ -132,7 +133,6 @@ export default class ErrorWrapper implements BaseWrapper {
132133

133134
find(): void {
134135
throwError(
135-
`find did not return ${this.selector}, cannot call find() on empty Wrapper`
136136
`find did not return ${buildSelectorString(
137137
this.selector
138138
)}, cannot call find() on empty Wrapper`
@@ -141,7 +141,6 @@ export default class ErrorWrapper implements BaseWrapper {
141141

142142
html(): void {
143143
throwError(
144-
`find did not return ${this.selector}, cannot call html() on empty Wrapper`
145144
`find did not return ${buildSelectorString(
146145
this.selector
147146
)}, cannot call html() on empty Wrapper`
@@ -158,7 +157,6 @@ export default class ErrorWrapper implements BaseWrapper {
158157

159158
isEmpty(): void {
160159
throwError(
161-
`find did not return ${this.selector}, cannot call isEmpty() on empty Wrapper`
162160
`find did not return ${buildSelectorString(
163161
this.selector
164162
)}, cannot call isEmpty() on empty Wrapper`
@@ -167,7 +165,6 @@ export default class ErrorWrapper implements BaseWrapper {
167165

168166
isVisible(): void {
169167
throwError(
170-
`find did not return ${this.selector}, cannot call isVisible() on empty Wrapper`
171168
`find did not return ${buildSelectorString(
172169
this.selector
173170
)}, cannot call isVisible() on empty Wrapper`
@@ -176,7 +173,6 @@ export default class ErrorWrapper implements BaseWrapper {
176173

177174
isVueInstance(): void {
178175
throwError(
179-
`find did not return ${this.selector}, cannot call isVueInstance() on empty Wrapper`
180176
`find did not return ${buildSelectorString(
181177
this.selector
182178
)}, cannot call isVueInstance() on empty Wrapper`
@@ -185,7 +181,6 @@ export default class ErrorWrapper implements BaseWrapper {
185181

186182
name(): void {
187183
throwError(
188-
`find did not return ${this.selector}, cannot call name() on empty Wrapper`
189184
`find did not return ${buildSelectorString(
190185
this.selector
191186
)}, cannot call name() on empty Wrapper`
@@ -194,7 +189,6 @@ export default class ErrorWrapper implements BaseWrapper {
194189

195190
props(): void {
196191
throwError(
197-
`find did not return ${this.selector}, cannot call props() on empty Wrapper`
198192
`find did not return ${buildSelectorString(
199193
this.selector
200194
)}, cannot call props() on empty Wrapper`
@@ -203,7 +197,6 @@ export default class ErrorWrapper implements BaseWrapper {
203197

204198
text(): void {
205199
throwError(
206-
`find did not return ${this.selector}, cannot call text() on empty Wrapper`
207200
`find did not return ${buildSelectorString(
208201
this.selector
209202
)}, cannot call text() on empty Wrapper`
@@ -212,7 +205,6 @@ export default class ErrorWrapper implements BaseWrapper {
212205

213206
setComputed(): void {
214207
throwError(
215-
`find did not return ${this.selector}, cannot call setComputed() on empty Wrapper`
216208
`find did not return ${buildSelectorString(
217209
this.selector
218210
)}, cannot call setComputed() on empty Wrapper`
@@ -221,7 +213,6 @@ export default class ErrorWrapper implements BaseWrapper {
221213

222214
setData(): void {
223215
throwError(
224-
`find did not return ${this.selector}, cannot call setData() on empty Wrapper`
225216
`find did not return ${buildSelectorString(
226217
this.selector
227218
)}, cannot call setData() on empty Wrapper`
@@ -230,7 +221,6 @@ export default class ErrorWrapper implements BaseWrapper {
230221

231222
setMethods(): void {
232223
throwError(
233-
`find did not return ${this.selector}, cannot call setMethods() on empty Wrapper`
234224
`find did not return ${buildSelectorString(
235225
this.selector
236226
)}, cannot call setMethods() on empty Wrapper`
@@ -239,7 +229,6 @@ export default class ErrorWrapper implements BaseWrapper {
239229

240230
setProps(): void {
241231
throwError(
242-
`find did not return ${this.selector}, cannot call setProps() on empty Wrapper`
243232
`find did not return ${buildSelectorString(
244233
this.selector
245234
)}, cannot call setProps() on empty Wrapper`
@@ -248,7 +237,6 @@ export default class ErrorWrapper implements BaseWrapper {
248237

249238
setValue(): void {
250239
throwError(
251-
`find did not return ${this.selector}, cannot call setValue() on empty Wrapper`
252240
`find did not return ${buildSelectorString(
253241
this.selector
254242
)}, cannot call setValue() on empty Wrapper`
@@ -257,7 +245,6 @@ export default class ErrorWrapper implements BaseWrapper {
257245

258246
setChecked(): void {
259247
throwError(
260-
`find did not return ${this.selector}, cannot call setChecked() on empty Wrapper`
261248
`find did not return ${buildSelectorString(
262249
this.selector
263250
)}, cannot call setChecked() on empty Wrapper`
@@ -266,7 +253,6 @@ export default class ErrorWrapper implements BaseWrapper {
266253

267254
setSelected(): void {
268255
throwError(
269-
`find did not return ${this.selector}, cannot call setSelected() on empty Wrapper`
270256
`find did not return ${buildSelectorString(
271257
this.selector
272258
)}, cannot call setSelected() on empty Wrapper`
@@ -275,7 +261,6 @@ export default class ErrorWrapper implements BaseWrapper {
275261

276262
trigger(): void {
277263
throwError(
278-
`find did not return ${this.selector}, cannot call trigger() on empty Wrapper`
279264
`find did not return ${buildSelectorString(
280265
this.selector
281266
)}, cannot call trigger() on empty Wrapper`
@@ -284,7 +269,6 @@ export default class ErrorWrapper implements BaseWrapper {
284269

285270
destroy(): void {
286271
throwError(
287-
`find did not return ${this.selector}, cannot call destroy() on empty Wrapper`
288272
`find did not return ${buildSelectorString(
289273
this.selector
290274
)}, cannot call destroy() on empty Wrapper`

0 commit comments

Comments
 (0)