File tree 3 files changed +18
-9
lines changed
3 files changed +18
-9
lines changed Original file line number Diff line number Diff line change 1
1
// @flow
2
2
3
3
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
+ }
4
18
5
19
export default class ErrorWrapper implements BaseWrapper {
6
20
selectorString : string
7
21
8
- constructor ( selectorString : string ) {
9
- this . selectorString = selectorString
22
+ constructor ( selector : Selector ) {
23
+ this . selectorString = buildSelectorString ( selector )
10
24
}
11
25
12
26
at ( ) : void {
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ import {
15
15
INVALID_SELECTOR
16
16
} from 'shared/consts'
17
17
18
- function getSelectorType ( selector : Selector ) : string {
18
+ export function getSelectorType ( selector : Selector ) : string {
19
19
if ( isDomSelector ( selector ) ) return DOM_SELECTOR
20
20
if ( isVueComponent ( selector ) ) return COMPONENT_SELECTOR
21
21
if ( isNameSelector ( selector ) ) return NAME_SELECTOR
Original file line number Diff line number Diff line change @@ -193,12 +193,7 @@ export default class Wrapper implements BaseWrapper {
193
193
const node = find ( this . rootNode , this . vm , selector ) [ 0 ]
194
194
195
195
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 )
202
197
}
203
198
204
199
return createWrapper ( node , this . options )
You can’t perform that action at this time.
0 commit comments