1
0
mirror of https://github.com/MontFerret/ferret.git synced 2025-07-15 01:25:00 +02:00

Feature/eval template (#651)

* Refactored use of eval

* Disable unstable unit test
This commit is contained in:
Tim Voronov
2021-09-07 16:33:30 -04:00
committed by GitHub
parent 5f361e9e1b
commit e4e98830a0
75 changed files with 1935 additions and 1778 deletions

View File

@ -70,7 +70,7 @@ func waitAttributeWhen(ctx context.Context, args []core.Value, when drivers.Wait
return values.None, err
}
doc, err := drivers.ToDocument(arg1)
el, err := drivers.ToElement(arg1)
if err != nil {
return values.None, err
@ -78,7 +78,7 @@ func waitAttributeWhen(ctx context.Context, args []core.Value, when drivers.Wait
selector := args[1].(values.String)
name := args[2].(values.String)
value := args[3]
value := values.ToString(args[3])
if len(args) == 5 {
err = core.ValidateType(args[4], types.Int)
@ -93,7 +93,7 @@ func waitAttributeWhen(ctx context.Context, args []core.Value, when drivers.Wait
ctx, fn := waitTimeout(ctx, timeout)
defer fn()
return values.None, doc.WaitForAttributeBySelector(ctx, selector, name, value, when)
return values.True, el.WaitForAttributeBySelector(ctx, selector, name, value, when)
}
el := arg1.(drivers.HTMLElement)
@ -113,5 +113,5 @@ func waitAttributeWhen(ctx context.Context, args []core.Value, when drivers.Wait
ctx, fn := waitTimeout(ctx, timeout)
defer fn()
return values.None, el.WaitForAttribute(ctx, name, value, when)
return values.True, el.WaitForAttribute(ctx, name, value, when)
}