mirror of
https://github.com/MontFerret/ferret.git
synced 2025-07-03 00:46:51 +02:00
Feature/new selector type (#657)
* Added remote type reference resolver * Added support of XPath query selector * Added CDP e2e testss covering XPath integration * Added additional CDP e2e tests covering XPath integration * Added type check to QuerySelector casting function * Fixed XPath e2e tests * Fixed vuln issue * Added support of XPath selectors to http driver * Added e2e tests for XPAth
This commit is contained in:
@ -6,7 +6,6 @@ import (
|
||||
"github.com/MontFerret/ferret/pkg/drivers"
|
||||
"github.com/MontFerret/ferret/pkg/runtime/core"
|
||||
"github.com/MontFerret/ferret/pkg/runtime/values"
|
||||
"github.com/MontFerret/ferret/pkg/runtime/values/types"
|
||||
)
|
||||
|
||||
// ELEMENT finds an element by a given CSS selector.
|
||||
@ -24,24 +23,24 @@ func Element(ctx context.Context, args ...core.Value) (core.Value, error) {
|
||||
return el.QuerySelector(ctx, selector)
|
||||
}
|
||||
|
||||
func queryArgs(args []core.Value) (drivers.HTMLElement, values.String, error) {
|
||||
func queryArgs(args []core.Value) (drivers.HTMLElement, drivers.QuerySelector, error) {
|
||||
err := core.ValidateArgs(args, 2, 2)
|
||||
|
||||
if err != nil {
|
||||
return nil, values.EmptyString, err
|
||||
return nil, drivers.QuerySelector{}, err
|
||||
}
|
||||
|
||||
el, err := drivers.ToElement(args[0])
|
||||
|
||||
if err != nil {
|
||||
return nil, values.EmptyString, err
|
||||
return nil, drivers.QuerySelector{}, err
|
||||
}
|
||||
|
||||
err = core.ValidateType(args[1], types.String)
|
||||
selector, err := drivers.ToQuerySelector(args[1])
|
||||
|
||||
if err != nil {
|
||||
return nil, values.EmptyString, err
|
||||
return nil, drivers.QuerySelector{}, err
|
||||
}
|
||||
|
||||
return el, args[1].(values.String), nil
|
||||
return el, selector, nil
|
||||
}
|
||||
|
Reference in New Issue
Block a user