From cbf88453f4adc06b23bb73de2a3b79bb1531e71a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 05:30:39 +0000 Subject: [PATCH] [gomod] Bump github.com/cucumber/godog from 0.13.0 to 0.14.0 in /backend Bumps [github.com/cucumber/godog](https://github.com/cucumber/godog) from 0.13.0 to 0.14.0. - [Release notes](https://github.com/cucumber/godog/releases) - [Changelog](https://github.com/cucumber/godog/blob/main/CHANGELOG.md) - [Commits](https://github.com/cucumber/godog/compare/v0.13.0...v0.14.0) --- updated-dependencies: - dependency-name: github.com/cucumber/godog dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- backend/go.mod | 2 +- backend/go.sum | 4 ++-- .../github.com/cucumber/godog/CHANGELOG.md | 4 +++- .../godog/internal/formatters/fmt_base.go | 1 - .../godog/internal/formatters/fmt_cucumber.go | 4 ---- .../vendor/github.com/cucumber/godog/suite.go | 19 ++++++++++++------- .../fasthttp/{coarseTime.go => coarsetime.go} | 0 .../vendor/gorm.io/gorm/{License => LICENSE} | 0 backend/vendor/modules.txt | 2 +- 9 files changed, 19 insertions(+), 17 deletions(-) rename backend/vendor/github.com/valyala/fasthttp/{coarseTime.go => coarsetime.go} (100%) rename backend/vendor/gorm.io/gorm/{License => LICENSE} (100%) diff --git a/backend/go.mod b/backend/go.mod index b8ca44fd..aedf1195 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/coreos/go-oidc/v3 v3.9.0 - github.com/cucumber/godog v0.13.0 + github.com/cucumber/godog v0.14.0 github.com/glebarez/sqlite v1.10.0 github.com/go-oauth2/oauth2/v4 v4.5.2 github.com/go-playground/validator/v10 v10.17.0 diff --git a/backend/go.sum b/backend/go.sum index 380841bb..2c388baf 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -51,8 +51,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cucumber/gherkin/go/v26 v26.2.0 h1:EgIjePLWiPeslwIWmNQ3XHcypPsWAHoMCz/YEBKP4GI= github.com/cucumber/gherkin/go/v26 v26.2.0/go.mod h1:t2GAPnB8maCT4lkHL99BDCVNzCh1d7dBhCLt150Nr/0= -github.com/cucumber/godog v0.13.0 h1:KvX9kNWmAJwp882HmObGOyBbNUP5SXQ+SDLNajsuV7A= -github.com/cucumber/godog v0.13.0/go.mod h1:FX3rzIDybWABU4kuIXLZ/qtqEe1Ac5RdXmqvACJOces= +github.com/cucumber/godog v0.14.0 h1:h/K4t7XBxsFBF+UJEahNqJ1/2VHVepRXCSq3WWWnehs= +github.com/cucumber/godog v0.14.0/go.mod h1:FX3rzIDybWABU4kuIXLZ/qtqEe1Ac5RdXmqvACJOces= github.com/cucumber/messages/go/v21 v21.0.1 h1:wzA0LxwjlWQYZd32VTlAVDTkW6inOFmSM+RuOwHZiMI= github.com/cucumber/messages/go/v21 v21.0.1/go.mod h1:zheH/2HS9JLVFukdrsPWoPdmUtmYQAQPLk7w5vWsk5s= github.com/cucumber/messages/go/v22 v22.0.0/go.mod h1:aZipXTKc0JnjCsXrJnuZpWhtay93k7Rn3Dee7iyPJjs= diff --git a/backend/vendor/github.com/cucumber/godog/CHANGELOG.md b/backend/vendor/github.com/cucumber/godog/CHANGELOG.md index d0718848..a08a0da7 100644 --- a/backend/vendor/github.com/cucumber/godog/CHANGELOG.md +++ b/backend/vendor/github.com/cucumber/godog/CHANGELOG.md @@ -7,7 +7,9 @@ This project adheres to [Semantic Versioning](http://semver.org). This document is formatted according to the principles of [Keep A CHANGELOG](http://keepachangelog.com). ## Unreleased - +### Fixed +- Remove line overwriting for scenario outlines in cucumber formatter ([605](https://github.com/cucumber/godog/pull/605) - [glibas](https://github.com/glibas)) + ## [v0.13.0] ### Added - Support for reading feature files from an `fs.FS` ([550](https://github.com/cucumber/godog/pull/550) - [tigh-latte](https://github.com/tigh-latte)) diff --git a/backend/vendor/github.com/cucumber/godog/internal/formatters/fmt_base.go b/backend/vendor/github.com/cucumber/godog/internal/formatters/fmt_base.go index 2166509e..e2dc9bad 100644 --- a/backend/vendor/github.com/cucumber/godog/internal/formatters/fmt_base.go +++ b/backend/vendor/github.com/cucumber/godog/internal/formatters/fmt_base.go @@ -106,7 +106,6 @@ func (f *Base) Summary() { switch sr.Status { case passed: - prStatus = passed passedSt++ case failed: prStatus = failed diff --git a/backend/vendor/github.com/cucumber/godog/internal/formatters/fmt_cucumber.go b/backend/vendor/github.com/cucumber/godog/internal/formatters/fmt_cucumber.go index 8adbfcba..545e3fa0 100644 --- a/backend/vendor/github.com/cucumber/godog/internal/formatters/fmt_cucumber.go +++ b/backend/vendor/github.com/cucumber/godog/internal/formatters/fmt_cucumber.go @@ -252,10 +252,6 @@ func (f *Cuke) buildCukeStep(pickle *messages.Pickle, stepResult models.PickleSt step := feature.FindStep(pickleStep.AstNodeIds[0]) line := step.Location.Line - if len(pickle.AstNodeIds) == 2 { - _, row := feature.FindExample(pickle.AstNodeIds[1]) - line = row.Location.Line - } cukeStep.Name = pickleStep.Text cukeStep.Line = int(line) diff --git a/backend/vendor/github.com/cucumber/godog/suite.go b/backend/vendor/github.com/cucumber/godog/suite.go index 16bfd15e..f6284c6a 100644 --- a/backend/vendor/github.com/cucumber/godog/suite.go +++ b/backend/vendor/github.com/cucumber/godog/suite.go @@ -101,12 +101,12 @@ func (s *suite) runStep(ctx context.Context, pickle *Scenario, step *Step, scena } } - earlyReturn := scenarioErr != nil || err == ErrUndefined + earlyReturn := scenarioErr != nil || errors.Is(err, ErrUndefined) switch { case errors.Is(err, ErrPending): sr.Status = StepPending - case errors.Is(err, ErrSkip) || (err == nil && scenarioErr != nil): + case errors.Is(err, ErrSkip), err == nil && scenarioErr != nil: sr.Status = StepSkipped case errors.Is(err, ErrUndefined): sr.Status = StepUndefined @@ -130,17 +130,22 @@ func (s *suite) runStep(ctx context.Context, pickle *Scenario, step *Step, scena return } - switch err { - case nil: + switch { + case err == nil: sr.Status = models.Passed s.storage.MustInsertPickleStepResult(sr) s.fmt.Passed(pickle, step, match.GetInternalStepDefinition()) - case ErrPending: + case errors.Is(err, ErrPending): sr.Status = models.Pending s.storage.MustInsertPickleStepResult(sr) s.fmt.Pending(pickle, step, match.GetInternalStepDefinition()) + case errors.Is(err, ErrSkip): + sr.Status = models.Skipped + s.storage.MustInsertPickleStepResult(sr) + + s.fmt.Skipped(pickle, step, match.GetInternalStepDefinition()) default: sr.Status = models.Failed sr.Err = err @@ -481,11 +486,11 @@ func (s *suite) runSteps(ctx context.Context, pickle *Scenario, steps []*Step) ( } func (s *suite) shouldFail(err error) bool { - if err == nil || err == ErrSkip { + if err == nil || errors.Is(err, ErrSkip) { return false } - if err == ErrUndefined || err == ErrPending { + if errors.Is(err, ErrUndefined) || errors.Is(err, ErrPending) { return s.strict } diff --git a/backend/vendor/github.com/valyala/fasthttp/coarseTime.go b/backend/vendor/github.com/valyala/fasthttp/coarsetime.go similarity index 100% rename from backend/vendor/github.com/valyala/fasthttp/coarseTime.go rename to backend/vendor/github.com/valyala/fasthttp/coarsetime.go diff --git a/backend/vendor/gorm.io/gorm/License b/backend/vendor/gorm.io/gorm/LICENSE similarity index 100% rename from backend/vendor/gorm.io/gorm/License rename to backend/vendor/gorm.io/gorm/LICENSE diff --git a/backend/vendor/modules.txt b/backend/vendor/modules.txt index f6547d56..86eee5ae 100644 --- a/backend/vendor/modules.txt +++ b/backend/vendor/modules.txt @@ -22,7 +22,7 @@ github.com/coreos/go-oidc/v3/oidc # github.com/cucumber/gherkin/go/v26 v26.2.0 ## explicit; go 1.19 github.com/cucumber/gherkin/go/v26 -# github.com/cucumber/godog v0.13.0 +# github.com/cucumber/godog v0.14.0 ## explicit; go 1.16 github.com/cucumber/godog github.com/cucumber/godog/colors