Refactoring/externalized html (#234)

* Externalized HTML drivers

* Fixed unit tests

* Updated logging

* Added support to set default driver

* Updated GetIn and SetIn helpers

e2e/runner/lib.go

@@ -3,6 +3,7 @@ package runner
 import (
 	"context"
 	"fmt"
+
 	"github.com/MontFerret/ferret/pkg/runtime/core"
 	"github.com/MontFerret/ferret/pkg/runtime/values"
 )

e2e/runner/runner.go

@@ -3,6 +3,12 @@ package runner
 import (
 	"context"
 	"encoding/json"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"regexp"
+	"time"
+
 	"github.com/MontFerret/ferret/pkg/compiler"
 	"github.com/MontFerret/ferret/pkg/drivers"
 	"github.com/MontFerret/ferret/pkg/drivers/cdp"
@@ -10,11 +16,6 @@ import (
 	"github.com/MontFerret/ferret/pkg/runtime"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"regexp"
-	"time"
 )
 
 type (
@@ -145,16 +146,22 @@ func (r *Runner) runQuery(c *compiler.FqlCompiler, name, script string) Result {
 	}
 
 	ctx := context.Background()
-	ctx = drivers.WithDynamic(
+	ctx = drivers.WithContext(
 		ctx,
 		cdp.NewDriver(cdp.WithAddress(r.settings.CDPAddress)),
 	)
 
-	ctx = drivers.WithStatic(ctx, http.NewDriver())
+	ctx = drivers.WithContext(
+		ctx,
+		http.NewDriver(),
+		drivers.AsDefault(),
+	)
+
+	r.logger.Info().Timestamp().Str("name", name).Msg("Running test")
 
 	out, err := p.Run(
 		ctx,
-		runtime.WithLog(os.Stdout),
+		runtime.WithLog(zerolog.ConsoleWriter{Out: os.Stdout}),
 		runtime.WithParam("static", r.settings.StaticServerAddress),
 		runtime.WithParam("dynamic", r.settings.DynamicServerAddress),
 	)