From fe0a731352d890376b0570a746c7b3c8f8ef9ebd Mon Sep 17 00:00:00 2001 From: Yad Smood Date: Fri, 8 Jul 2022 14:02:23 +0800 Subject: [PATCH] simplify the Element.Wait code --- element.go | 13 +------------ element_test.go | 2 +- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/element.go b/element.go index 4a5bec17..f7ece196 100644 --- a/element.go +++ b/element.go @@ -574,18 +574,7 @@ func (el *Element) WaitInteractable() (pt *proto.Point, err error) { // Wait until the js returns true func (el *Element) Wait(opts *EvalOptions) error { - return utils.Retry(el.ctx, el.sleeper(), func() (bool, error) { - res, err := el.Evaluate(opts.This(el.Object)) - if err != nil { - return true, err - } - - if res.Value.Bool() { - return true, nil - } - - return false, nil - }) + return el.page.Context(el.ctx).Sleeper(el.sleeper).Wait(opts.This(el.Object)) } // WaitVisible until the element is visible diff --git a/element_test.go b/element_test.go index 5e2afa5b..d96efdb0 100644 --- a/element_test.go +++ b/element_test.go @@ -781,7 +781,7 @@ func TestElementEqual(t *testing.T) { g.False(el1.MustEqual(el3)) } -func TestElementMustWait(t *testing.T) { +func TestElementWait(t *testing.T) { g := setup(t) p := g.page.MustNavigate(g.srcFile("fixtures/describe.html"))