chore: Remove support for legacy postInteractionWait type

Author: martinnaj

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.14.0] - 2025-12-15
+
+### Removed
+- Support for legacy postInteractionWait type
+
 ## [0.13.0] - 2025-12-15
 
 ### Removed
@@ -95,6 +100,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Initial release
 
+[0.14.0]: https://github.com/gooddata/gooddata-neobackstop/compare/v0.13.0...v0.14.0
 [0.13.0]: https://github.com/gooddata/gooddata-neobackstop/compare/v0.12.0...v0.13.0
 [0.12.0]: https://github.com/gooddata/gooddata-neobackstop/compare/v0.11.1...v0.12.0
 [0.11.1]: https://github.com/gooddata/gooddata-neobackstop/compare/v0.11.0...v0.11.1

VERSION

@@ -1 +1 @@
-0.13.0
+0.14.0

converters/converters.go

@@ -1,52 +1,14 @@
 package converters
 
 import (
-	"fmt"
 	"sort"
-	"time"
 
 	"github.com/gooddata/gooddata-neobackstop/browser"
 	"github.com/gooddata/gooddata-neobackstop/internals"
 	"github.com/gooddata/gooddata-neobackstop/scenario"
 	"github.com/gooddata/gooddata-neobackstop/viewport"
 )
 
-func convertSelectorOrDelay(value interface{}) *internals.SelectorThenDelay {
-	if value == nil {
-		return nil
-	}
-
-	var sod internals.SelectorThenDelay
-	// check type
-	switch piw := value.(type) {
-	case string:
-		// legacy format: selector
-		sod = internals.SelectorThenDelay{
-			Selector: &piw,
-		}
-	case float64:
-		// legacy format: timeout
-		d := time.Duration(piw) * time.Millisecond
-		sod = internals.SelectorThenDelay{
-			Delay: &d,
-		}
-	case map[string]interface{}:
-		// new format: object with selector, delay
-		if v, ok := piw["selector"].(string); ok {
-			sod.Selector = &v
-		}
-		if v, ok := piw["delay"].(float64); ok {
-			d := time.Duration(v) * time.Millisecond
-			sod.Delay = &d
-		}
-	default:
-		fmt.Println(piw)
-		panic("Unknown PostInteractionWait type")
-	}
-
-	return &sod
-}
-
 func scenarioToInternal(b browser.Browser, v viewport.Viewport, s scenario.Scenario) internals.Scenario {
 	return internals.Scenario{
 		Browser:             b,
@@ -62,7 +24,7 @@ func scenarioToInternal(b browser.Browser, v viewport.Viewport, s scenario.Scena
 		HoverSelectors:      s.HoverSelectors,
 		ClickSelector:       s.ClickSelector,
 		ClickSelectors:      s.ClickSelectors,
-		PostInteractionWait: convertSelectorOrDelay(s.PostInteractionWait),
+		PostInteractionWait: s.PostInteractionWait,
 		ScrollToSelector:    s.ScrollToSelector,
 		MisMatchThreshold:   s.MisMatchThreshold,
 	}

internals/types.go

@@ -1,18 +1,11 @@
 package internals
 
 import (
-	"time"
-
 	"github.com/gooddata/gooddata-neobackstop/browser"
 	"github.com/gooddata/gooddata-neobackstop/scenario"
 	"github.com/gooddata/gooddata-neobackstop/viewport"
 )
 
-type SelectorThenDelay struct {
-	Selector *string        `json:"selector"`
-	Delay    *time.Duration `json:"delay"`
-}
-
 // Scenario - An internal scenario type, properties in order of processing, constructed from scenario.Scenario and config.Config
 // this type is exposed in ci-report so needs json keys
 type Scenario struct {
@@ -29,7 +22,7 @@ type Scenario struct {
 	HoverSelectors      []scenario.SelectorWithBeforeAfterDelay `json:"hoverSelectors"`
 	ClickSelector       *string                                 `json:"clickSelector"`
 	ClickSelectors      []scenario.SelectorWithBeforeAfterDelay `json:"clickSelectors"`
-	PostInteractionWait *SelectorThenDelay                      `json:"postInteractionWait"`
+	PostInteractionWait *scenario.SelectorThenDelay             `json:"postInteractionWait"`
 	ScrollToSelector    *string                                 `json:"scrollToSelector"`
 	MisMatchThreshold   *float64                                `json:"misMatchThreshold"`
 }

scenario/types.go

@@ -62,6 +62,29 @@ func (d *SelectorWithBeforeAfterDelay) UnmarshalJSON(data []byte) error {
 	return nil
 }
 
+type SelectorThenDelay struct {
+	Selector *string        `json:"selector"`
+	Delay    *time.Duration `json:"delay"`
+}
+
+func (d *SelectorThenDelay) UnmarshalJSON(data []byte) error {
+	var raw struct {
+		Selector *string  `json:"selector"`
+		Delay    *float64 `json:"delay"`
+	}
+
+	if err := json.Unmarshal(data, &raw); err != nil {
+		return err
+	}
+
+	d.Selector = raw.Selector
+	if raw.Delay != nil {
+		t := time.Duration(*raw.Delay) * time.Millisecond
+		d.Delay = &t
+	}
+	return nil
+}
+
 // Scenario - properties in order of processing, scenarios.json must be an array of Scenario
 type Scenario struct {
 	Browsers            []browser.Browser              `json:"browsers"`
@@ -77,7 +100,7 @@ type Scenario struct {
 	HoverSelectors      []SelectorWithBeforeAfterDelay `json:"hoverSelectors"`
 	ClickSelector       *string                        `json:"clickSelector"`
 	ClickSelectors      []SelectorWithBeforeAfterDelay `json:"clickSelectors"`
-	PostInteractionWait interface{}                    `json:"postInteractionWait"`
+	PostInteractionWait *SelectorThenDelay             `json:"postInteractionWait"`
 	ScrollToSelector    *string                        `json:"scrollToSelector"`
 	MisMatchThreshold   *float64                       `json:"misMatchThreshold"`
 }

screenshotter/operations/postInteractionWait.go

@@ -3,11 +3,11 @@ package operations
 import (
 	"time"
 
-	"github.com/gooddata/gooddata-neobackstop/internals"
+	"github.com/gooddata/gooddata-neobackstop/scenario"
 	"github.com/playwright-community/playwright-go"
 )
 
-func postInteractionWait(page playwright.Page, piw *internals.SelectorThenDelay) *string {
+func postInteractionWait(page playwright.Page, piw *scenario.SelectorThenDelay) *string {
 	if piw != nil {
 		if piw.Selector != nil {
 			// selector, wait for it