Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions sdk/internal/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

### Features Added

* Added `IgnoredQueryParameters` field to `SetDefaultMatcherOptions` for specifying query parameters to ignore during playback matching

### Breaking Changes

### Bugs Fixed
Expand Down
27 changes: 15 additions & 12 deletions sdk/internal/recording/matchers.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@ func SetBodilessMatcher(t *testing.T, options *MatcherOptions) error {
type SetDefaultMatcherOptions struct {
RecordingOptions

CompareBodies *bool
ExcludedHeaders []string
IgnoredHeaders []string
IgnoreQueryOrdering *bool
CompareBodies *bool
ExcludedHeaders []string
IgnoredHeaders []string
IgnoredQueryParameters []string
IgnoreQueryOrdering *bool
}

func (s *SetDefaultMatcherOptions) fillOptions() {
Expand Down Expand Up @@ -98,15 +99,17 @@ func SetDefaultMatcher(t *testing.T, options *SetDefaultMatcherOptions) error {
}

marshalled, err := json.MarshalIndent(struct {
CompareBodies *bool `json:"compareBodies,omitempty"`
ExcludedHeaders string `json:"excludedHeaders,omitempty"`
IncludedHeaders string `json:"includedHeaders,omitempty"`
IgnoreQueryOrdering *bool `json:"ignoreQueryOrdering,omitempty"`
CompareBodies *bool `json:"compareBodies,omitempty"`
ExcludedHeaders string `json:"excludedHeaders,omitempty"`
IncludedHeaders string `json:"includedHeaders,omitempty"`
IgnoredQueryParameters string `json:"ignoredQueryParameters,omitempty"`
IgnoreQueryOrdering *bool `json:"ignoreQueryOrdering,omitempty"`
}{
CompareBodies: options.CompareBodies,
ExcludedHeaders: strings.Join(addDefaults(options.ExcludedHeaders), ","),
IncludedHeaders: strings.Join(options.IgnoredHeaders, ","),
IgnoreQueryOrdering: options.IgnoreQueryOrdering,
CompareBodies: options.CompareBodies,
ExcludedHeaders: strings.Join(addDefaults(options.ExcludedHeaders), ","),
IncludedHeaders: strings.Join(options.IgnoredHeaders, ","),
IgnoredQueryParameters: strings.Join(options.IgnoredQueryParameters, ","),
IgnoreQueryOrdering: options.IgnoreQueryOrdering,
}, "", "")
if err != nil {
return err
Expand Down