Feature/#265 dom manipulations (#329)

* Added SetInnerHTML method

* Added E2E tests

* Refactored GetInnerText* methods

* Updated e2e tests

* Moved related E2E tests to folders

* Added error message

* Added E2E tests

* Added E2E for static driver

Makefile

@@ -31,6 +31,7 @@ cover:
 
 e2e:
 	go run ${DIR_E2E}/main.go --tests ${DIR_E2E}/tests --pages ${DIR_E2E}/pages
+	# --filter=e2e/tests/dynamic/**/inner_text/*.fql
 
 bench:
 	go test -run=XXX -bench=. ${DIR_PKG}/...

e2e/runner/runner.go

@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"strings"
 	"time"
 
 	"github.com/MontFerret/ferret/pkg/compiler"
@@ -185,6 +186,8 @@ func (r *Runner) runQuery(ctx context.Context, c *compiler.FqlCompiler, name, sc
 		}
 	}
 
+	mustFail := r.mustFail(name)
+
 	out, err := p.Run(
 		ctx,
 		runtime.WithLog(zerolog.ConsoleWriter{Out: os.Stdout}),
@@ -195,13 +198,28 @@ func (r *Runner) runQuery(ctx context.Context, c *compiler.FqlCompiler, name, sc
 	duration := time.Since(start)
 
 	if err != nil {
+		if mustFail {
+			return Result{
+				name:     name,
+				duration: duration,
+			}
+		}
+
 		return Result{
 			name:     name,
 			duration: duration,
 			err:      errors.Wrap(err, "failed to execute query"),
 		}
 	}
 
+	if mustFail {
+		return Result{
+			name:     name,
+			duration: duration,
+			err:      errors.New("expected to fail"),
+		}
+	}
+
 	var result string
 
 	if err := json.Unmarshal(out, &result); err != nil {
@@ -281,3 +299,7 @@ func (r *Runner) traverseDir(ctx context.Context, dir string, iteratee func(name
 
 	return nil
 }
+
+func (r *Runner) mustFail(name string) bool {
+	return strings.HasSuffix(name, ".fail.fql")
+}

e2e/tests/dynamic/doc/inner_html/set.fql

@@ -0,0 +1,13 @@
+LET url = @dynamic
+LET doc = DOCUMENT(url, true)
+
+LET expected = `<span>Hello</span>`
+
+INNER_HTML_SET(doc, "body", "<span>Hello</span>")
+
+LET actual = INNER_HTML(doc, "body")
+
+LET r1 = '(\s|\")'
+LET r2 = '(\n|\s|\")'
+
+RETURN EXPECT(REGEXP_REPLACE(expected, r1, ''), REGEXP_REPLACE(TRIM(actual), r2, ''))

e2e/tests/dynamic/doc/inner_text/set.fql

@@ -0,0 +1,13 @@
+LET url = @dynamic
+LET doc = DOCUMENT(url, true)
+
+LET expected = `Hello`
+
+INNER_TEXT_SET(doc, "body", expected)
+
+LET actual = INNER_TEXT(doc, "body")
+
+LET r1 = '(\s|\")'
+LET r2 = '(\n|\s|\")'
+
+RETURN EXPECT(REGEXP_REPLACE(expected, r1, ''), REGEXP_REPLACE(TRIM(actual), r2, ''))

e2e/tests/dynamic/element/inner_html/get_by_selector.fql

@@ -0,0 +1,11 @@
+LET url = @dynamic
+LET doc = DOCUMENT(url, true)
+LET el = ELEMENT(doc, ".jumbotron")
+
+LET expected = `Welcome to Ferret E2E test page!`
+LET actual = INNER_HTML(el, "h1")
+
+LET r1 = '(\n|\s)'
+LET r2 = '(\n|\s)'
+
+RETURN EXPECT(REGEXP_REPLACE(expected, r1, ''), REGEXP_REPLACE(TRIM(actual), r2, ''))

e2e/tests/dynamic/element/inner_html/get_by_selector_not_found.fail.fql

@@ -0,0 +1,5 @@
+LET url = @dynamic
+LET doc = DOCUMENT(url, true)
+LET el = ELEMENT(doc, ".jumbotron")
+
+RETURN INNER_HTML(el, "h5")

e2e/tests/dynamic/element/inner_html/set.fql

@@ -0,0 +1,14 @@
+LET url = @dynamic
+LET doc = DOCUMENT(url, true)
+LET el = ELEMENT(doc, "#index")
+
+LET expected = "<span>This node was injected by Ferret</span>"
+INNER_HTML_SET(el, "<span>This node was injected by Ferret</span>")
+LET actual = INNER_HTML(el)
+
+WAIT(100)
+
+LET r1 = '(\s|\")'
+LET r2 = '(\n|\s|\")'
+
+RETURN EXPECT(REGEXP_REPLACE(expected, r1, ''), REGEXP_REPLACE(TRIM(actual), r2, ''))

e2e/tests/dynamic/element/inner_text/get_by_selector.fql

@@ -0,0 +1,11 @@
+LET url = @dynamic
+LET doc = DOCUMENT(url, true)
+LET el = ELEMENT(doc, ".jumbotron")
+
+LET expected = `Welcome to Ferret E2E test page!`
+LET actual = INNER_TEXT(el, "h1")
+
+LET r1 = '(\n|\s)'
+LET r2 = '(\n|\s)'
+
+RETURN EXPECT(REGEXP_REPLACE(expected, r1, ''), REGEXP_REPLACE(TRIM(actual), r2, ''))

e2e/tests/dynamic/element/inner_text/get_by_selector_not_found.fail.fql

@@ -0,0 +1,5 @@
+LET url = @dynamic
+LET doc = DOCUMENT(url, true)
+LET el = ELEMENT(doc, ".jumbotron")
+
+RETURN INNER_TEXT(el, "h5")

e2e/tests/dynamic/element/inner_text/set.fql

@@ -0,0 +1,13 @@
+LET url = @dynamic
+LET doc = DOCUMENT(url, true)
+LET el = ELEMENT(doc, ".jumbotron")
+
+LET expected = `Foobar`
+INNER_TEXT_SET(el, expected)
+WAIT(100)
+LET actual = INNER_TEXT(el)
+
+LET r1 = '(\n|\s)'
+LET r2 = '(\n|\s)'
+
+RETURN EXPECT(REGEXP_REPLACE(expected, r1, ''), REGEXP_REPLACE(TRIM(actual), r2, ''))

e2e/tests/dynamic/element/inner_text/set_by_selector.fail.fql

@@ -0,0 +1,5 @@
+LET url = @dynamic
+LET doc = DOCUMENT(url, true)
+LET el = ELEMENT(doc, ".jumbotron")
+
+RETURN INNER_TEXT_SET(el, "h4", "foobar")

e2e/tests/static/element/inner_html/set.fql

@@ -0,0 +1,14 @@
+LET url = @static + '/simple.html'
+LET doc = DOCUMENT(url)
+LET el = ELEMENT(doc, "body")
+
+LET expected = `<div><h1>Injected by Ferret</h1></div>`
+
+INNER_HTML_SET(el, expected)
+
+LET actual = INNER_HTML(el)
+
+LET r1 = '(\s|\")'
+LET r2 = '(\n|\s|\")'
+
+RETURN EXPECT(REGEXP_REPLACE(expected, r1, ''), REGEXP_REPLACE(TRIM(actual), r2, ''))

e2e/tests/static/element/inner_text/set.fql

@@ -0,0 +1,14 @@
+LET url = @static + '/simple.html'
+LET doc = DOCUMENT(url)
+LET el = ELEMENT(doc, "body")
+
+LET expected = `Injected by Ferret`
+
+INNER_TEXT_SET(el, expected)
+
+LET actual = INNER_TEXT(el)
+
+LET r1 = '(\s|\")'
+LET r2 = '(\n|\s|\")'
+
+RETURN EXPECT(REGEXP_REPLACE(expected, r1, ''), REGEXP_REPLACE(TRIM(actual), r2, ''))

pkg/drivers/cdp/document.go

@@ -22,8 +22,6 @@ import (
 	"github.com/MontFerret/ferret/pkg/runtime/values"
 )
 
-const BlankPageURL = "about:blank"
-
 type HTMLDocument struct {
 	logger   *zerolog.Logger
 	client   *cdp.Client

pkg/drivers/cdp/driver.go

@@ -3,6 +3,7 @@ package cdp
 import (
 	"context"
 	"sync"
+	"time"
 
 	"github.com/mafredri/cdp"
 	"github.com/mafredri/cdp/devtool"
@@ -16,6 +17,8 @@ import (
 )
 
 const DriverName = "cdp"
+const BlankPageURL = "about:blank"
+const DefaultTimeout = 5000 * time.Millisecond
 
 type Driver struct {
 	mu        sync.Mutex