Skip to content

Commit 46f884e

Browse files
committed
chore: Build selector string in ErrorWrapper
1 parent f156698 commit 46f884e

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

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

+16-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,26 @@
11
// @flow
22

33
import { throwError } from 'shared/util'
4+
import { REF_SELECTOR } from 'shared/consts'
5+
import { getSelectorType } from './get-selector'
6+
7+
const buildSelectorString = (selector: Selector) => {
8+
if (getSelectorType(selector) === REF_SELECTOR) {
9+
return `ref="${selector.value.ref}"`
10+
}
11+
12+
if (typeof selector === 'string') {
13+
return selector
14+
}
15+
16+
return 'Component'
17+
}
418

519
export default class ErrorWrapper implements BaseWrapper {
620
selectorString: string
721

8-
constructor(selectorString: string) {
9-
this.selectorString = selectorString
22+
constructor(selector: Selector) {
23+
this.selectorString = buildSelectorString(selector)
1024
}
1125

1226
at(): void {

Diff for: packages/test-utils/src/get-selector.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
INVALID_SELECTOR
1616
} from 'shared/consts'
1717

18-
function getSelectorType(selector: Selector): string {
18+
export function getSelectorType(selector: Selector): string {
1919
if (isDomSelector(selector)) return DOM_SELECTOR
2020
if (isVueComponent(selector)) return COMPONENT_SELECTOR
2121
if (isNameSelector(selector)) return NAME_SELECTOR

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

+1-6
Original file line numberDiff line numberDiff line change
@@ -193,12 +193,7 @@ export default class Wrapper implements BaseWrapper {
193193
const node = find(this.rootNode, this.vm, selector)[0]
194194

195195
if (!node) {
196-
if (selector.type === REF_SELECTOR) {
197-
return new ErrorWrapper(`ref="${selector.value.ref}"`)
198-
}
199-
return new ErrorWrapper(
200-
typeof selector.value === 'string' ? selector.value : 'Component'
201-
)
196+
return new ErrorWrapper(rawSelector)
202197
}
203198

204199
return createWrapper(node, this.options)

0 commit comments

Comments
 (0)