go/ferret
1
0
Fork 0
mirror of https://github.com/MontFerret/ferret.git synced 2025-08-15 20:02:56 +02:00
Code Issues Releases Activity

Fixed element not found error (#724)

Browse Source
This commit is contained in:
Tim Voronov
2022-01-17 10:24:27 -05:00
committed by GitHub
parent 64f086a4a6
commit 8d8afed51f
6 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e2e/tests/dynamic/element/query/element_not_found_by_css.fql Normal file
View File

@@ -0,0 +1,8 @@
LET url = @lab.cdn.dynamic
LET doc = DOCUMENT(url, { driver: "cdp" })
LET el = ELEMENT(doc, "#do-not-exist")
T::NONE(el)
RETURN TRUE

8
e2e/tests/dynamic/element/query/element_not_found_by_xpath.fql Normal file
View File

@@ -0,0 +1,8 @@
LET url = @lab.cdn.dynamic
LET doc = DOCUMENT(url, true)
LET el = ELEMENT(doc, X("//*[@id='do-not-exist']"))?
T::NONE(el)
RETURN TRUE

8
e2e/tests/dynamic/element/siblings/next_not_found.fql Normal file
View File

@@ -0,0 +1,8 @@
LET doc = DOCUMENT(@lab.cdn.dynamic + "/#/lists", { driver:"cdp" })
LET current = ELEMENT(doc, "body")
T::NOT::NONE(current)
LET next = current.nextElementSibling
T::NONE(next)
RETURN NONE

8
e2e/tests/dynamic/element/siblings/prev_not_found.fql Normal file
View File

@@ -0,0 +1,8 @@
LET doc = DOCUMENT(@lab.cdn.dynamic + "/#/lists", { driver:"cdp" })
LET current = ELEMENT(doc, 'head')
T::NOT::NONE(current)
LET prev = current.previousElementSibling
T::NONE(prev)
RETURN NONE

6
pkg/drivers/cdp/eval/runtime.go
View File

@@ -98,13 +98,17 @@ func (rt *Runtime) EvalValue(ctx context.Context, fn *Function) (core.Value, err
return rt.resolver.ToValue(ctx, out)
}
func (rt *Runtime) EvalElement(ctx context.Context, fn *Function) (drivers.HTMLElement, error) {
func (rt *Runtime) EvalElement(ctx context.Context, fn *Function) (core.Value, error) {
ref, err := rt.EvalRef(ctx, fn)
if err != nil {
return nil, err
}
if ref.ObjectID == nil {
return values.None, nil
}
return rt.resolver.ToElement(ctx, ref)
}

12
pkg/drivers/cdp/templates/query.go
View File

@@ -14,27 +14,21 @@ const (
)
var (
queryCSSSelector = fmt.Sprintf(`
queryCSSSelector = `
(el, selector) => {
const found = el.querySelector(selector);
%s
return found;
}
`,
notFoundErrorFragment,
)
`
queryXPathSelector = fmt.Sprintf(`
(el, selector) => {
%s
%s
return found;
}
`,
xpathAsElementFragment, notFoundErrorFragment,
xpathAsElementFragment,
)
)