refac(gherkins): Fixed comparison of dispatched events. (#144)

Author: yasirfolio3

tests/integration/support/steps.go

@@ -17,14 +17,15 @@
 package support
 
 import (
+	"encoding/json"
 	"fmt"
 	"strconv"
 
 	"github.com/DATA-DOG/godog/gherkin"
-	"github.com/facebookarchive/subset"
 	"github.com/optimizely/go-sdk/pkg/entities"
 	"github.com/optimizely/go-sdk/tests/integration/models"
 	"github.com/optimizely/go-sdk/tests/integration/optlyplugins"
+	"github.com/optimizely/subset"
 	"gopkg.in/yaml.v3"
 )
 
@@ -206,12 +207,21 @@ func (c *ScenarioCtx) DispatchedEventsPayloadsInclude(value *gherkin.DocString)
 	if err != nil {
 		return fmt.Errorf("Invalid Project Config")
 	}
-	requestedBatchEvents, err := getDispatchedEventsFromYaml(value.Content, config)
+	expectedBatchEvents, err := getDispatchedEventsMapFromYaml(value.Content, config)
 	if err != nil {
 		return fmt.Errorf("Invalid request for dispatched Events")
 	}
-	dispatchedEvents := c.clientWrapper.EventDispatcher.(optlyplugins.EventReceiver).GetEvents()
-	if subset.Check(requestedBatchEvents, dispatchedEvents) {
+
+	eventsReceived := c.clientWrapper.EventDispatcher.(optlyplugins.EventReceiver).GetEvents()
+	eventsReceivedJSON, err := json.Marshal(eventsReceived)
+	if err != nil {
+		return fmt.Errorf("Invalid response for dispatched Events")
+	}
+	var actualBatchEvents []map[string]interface{}
+	if err := json.Unmarshal(eventsReceivedJSON, &actualBatchEvents); err != nil {
+		return fmt.Errorf("Invalid response for dispatched Events")
+	}
+	if subset.Check(expectedBatchEvents, actualBatchEvents) {
 		return nil
 	}
 	return fmt.Errorf("DispatchedEvents not equal")

tests/integration/support/utils.go

@@ -17,31 +17,21 @@
 package support
 
 import (
-	"encoding/json"
 	"regexp"
 	"strings"
 
 	"github.com/optimizely/go-sdk/pkg"
 
-	"github.com/optimizely/go-sdk/pkg/event"
 	"gopkg.in/yaml.v3"
 )
 
-func getDispatchedEventsFromYaml(s string, config pkg.ProjectConfig) ([]event.Batch, error) {
+func getDispatchedEventsMapFromYaml(s string, config pkg.ProjectConfig) ([]map[string]interface{}, error) {
 	var eventsArray []map[string]interface{}
 	parsedString := parseTemplate(s, config)
 	if err := yaml.Unmarshal([]byte(parsedString), &eventsArray); err != nil {
 		return nil, err
 	}
-	jsonString, err := json.Marshal(eventsArray)
-	if err != nil {
-		return nil, err
-	}
-	requestedBatchEvents := []event.Batch{}
-	if err := json.Unmarshal([]byte(jsonString), &requestedBatchEvents); err != nil {
-		return nil, err
-	}
-	return requestedBatchEvents, nil
+	return eventsArray, nil
 }
 
 func parseTemplate(s string, config pkg.ProjectConfig) string {