go/ferret
1
0
Fork 0
mirror of https://github.com/MontFerret/ferret.git synced 2025-11-06 08:39:09 +02:00
Code Issues Releases Activity

Feature/focus (#340)

Browse Source 
* Added and implemented Focus and FocusBySelector methods

* Added e2e tests

* Updated CHANGELOG

* Fixed linting errors
This commit is contained in:
Tim Voronov
2019-07-23 16:13:04 -04:00
committed by GitHub
parent 996d565191
commit 7e6b3bf15d
12 changed files with 154 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/drivers/cdp/document.go
View File

@@ -345,6 +345,10 @@ func (doc *HTMLDocument) SelectBySelector(ctx context.Context, selector values.S
return doc.input.SelectBySelector(ctx, doc.element.id.nodeID, selector, value)
}
func (doc *HTMLDocument) FocusBySelector(ctx context.Context, selector values.String) error {
return doc.input.FocusBySelector(ctx, doc.element.id.nodeID, selector)
}
func (doc *HTMLDocument) MoveMouseBySelector(ctx context.Context, selector values.String) error {
return doc.input.MoveMouseBySelector(ctx, doc.element.id.nodeID, selector)
}

4
pkg/drivers/cdp/element.go
View File

@@ -971,6 +971,10 @@ func (el *HTMLElement) ScrollIntoView(ctx context.Context) error {
return el.input.ScrollIntoView(ctx, el.id.objectID)
}
func (el *HTMLElement) Focus(ctx context.Context) error {
return el.input.Focus(ctx, el.id.objectID)
}
func (el *HTMLElement) Hover(ctx context.Context) error {
return el.input.MoveMouse(ctx, el.id.objectID)
}

4
pkg/drivers/http/document.go
View File

@@ -247,6 +247,10 @@ func (doc *HTMLDocument) ScrollByXY(_ context.Context, _, _ values.Float) error
return core.ErrNotSupported
}
func (doc *HTMLDocument) FocusBySelector(_ context.Context, _ values.String) error {
return core.ErrNotSupported
}
func (doc *HTMLDocument) MoveMouseBySelector(_ context.Context, _ values.String) error {
return core.ErrNotSupported
}

4
pkg/drivers/http/element.go
View File

@@ -505,6 +505,10 @@ func (el *HTMLElement) ScrollIntoView(_ context.Context) error {
return core.ErrNotSupported
}
func (el *HTMLElement) Focus(_ context.Context) error {
return core.ErrNotSupported
}
func (el *HTMLElement) Hover(_ context.Context) error {
return core.ErrNotSupported
}

4
pkg/drivers/value.go
View File

@@ -101,6 +101,8 @@ type (
ScrollIntoView(ctx context.Context) error
Focus(ctx context.Context) error
Hover(ctx context.Context) error
WaitForAttribute(ctx context.Context, name values.String, value core.Value, when WaitEvent) error
@@ -141,6 +143,8 @@ type (
ScrollByXY(ctx context.Context, x, y values.Float) error
FocusBySelector(ctx context.Context, selector values.String) error
MoveMouseByXY(ctx context.Context, x, y values.Float) error
MoveMouseBySelector(ctx context.Context, selector values.String) error

38
pkg/stdlib/html/focus.go Normal file
View File

@@ -0,0 +1,38 @@
package html
import (
"context"
"github.com/MontFerret/ferret/pkg/drivers"
"github.com/MontFerret/ferret/pkg/runtime/core"
"github.com/MontFerret/ferret/pkg/runtime/values"
)
// FOCUS Calls focus on the element.
// @param target (HTMLPage | HTMLDocument | HTMLElement) - Target node.
// @param selector (String, optional) - Optional CSS selector. Required when target is HTMLPage or HTMLDocument.
func Focus(ctx context.Context, args ...core.Value) (core.Value, error) {
err := core.ValidateArgs(args, 1, 2)
if err != nil {
return values.None, err
}
// Document with selector
if len(args) == 2 {
doc, err := drivers.ToDocument(args[0])
if err != nil {
return values.None, err
}
return values.None, doc.FocusBySelector(ctx, values.ToString(args[1]))
}
el, err := drivers.ToElement(args[0])
if err != nil {
return values.None, err
}
return values.None, el.Focus(ctx)
}

1
pkg/stdlib/html/lib.go
View File

@@ -28,6 +28,7 @@ func RegisterLib(ns core.Namespace) error {
"ELEMENT_EXISTS": ElementExists,
"ELEMENTS": Elements,
"ELEMENTS_COUNT": ElementsCount,
"FOCUS": Focus,
"HOVER": Hover,
"INNER_HTML": GetInnerHTML,
"INNER_HTML_SET": SetInnerHTML,