Migrated to github.com/cucumber/gherkin-go - v9.2.0

.circleci/config.yml

@@ -23,7 +23,6 @@ commands:
     description: "Run go vet"
     steps:
       - run: go vet github.com/cucumber/godog
-      - run: go vet github.com/cucumber/godog/gherkin
       - run: go vet github.com/cucumber/godog/colors
   fmt:
     description: "Run go fmt"

_examples/api/README.md

@@ -56,8 +56,8 @@ need to store state within steps (a response), we should introduce a structure w
 package main
 
 import (
+	"github.com/cucumber/gherkin-go/v9"
 	"github.com/cucumber/godog"
-	"github.com/cucumber/godog/gherkin"
 )
 
 type apiFeature struct {
@@ -71,7 +71,7 @@ func (a *apiFeature) theResponseCodeShouldBe(code int) error {
 	return godog.ErrPending
 }
 
-func (a *apiFeature) theResponseShouldMatchJSON(body *gherkin.DocString) error {
+func (a *apiFeature) theResponseShouldMatchJSON(body *messages.PickleStepArgument_PickleDocString) error {
 	return godog.ErrPending
 }
 
@@ -98,8 +98,8 @@ import (
 	"net/http"
 	"net/http/httptest"
 
+	"github.com/cucumber/gherkin-go/v9"
 	"github.com/cucumber/godog"
-	"github.com/cucumber/godog/gherkin"
 )
 
 type apiFeature struct {
@@ -142,7 +142,7 @@ func (a *apiFeature) theResponseCodeShouldBe(code int) error {
 	return nil
 }
 
-func (a *apiFeature) theResponseShouldMatchJSON(body *gherkin.DocString) (err error) {
+func (a *apiFeature) theResponseShouldMatchJSON(body *messages.PickleStepArgument_PickleDocString) error {
 	var expected, actual []byte
 	var data interface{}
 	if err = json.Unmarshal([]byte(body.Content), &data); err != nil {

_examples/api/api_test.go

@@ -8,14 +8,14 @@ import (
 	"reflect"
 
 	"github.com/cucumber/godog"
-	"github.com/cucumber/godog/gherkin"
+	"github.com/cucumber/messages-go/v9"
 )
 
 type apiFeature struct {
 	resp *httptest.ResponseRecorder
 }
 
-func (a *apiFeature) resetResponse(interface{}) {
+func (a *apiFeature) resetResponse(*messages.Pickle) {
 	a.resp = httptest.NewRecorder()
 }
 
@@ -51,7 +51,7 @@ func (a *apiFeature) theResponseCodeShouldBe(code int) error {
 	return nil
 }
 
-func (a *apiFeature) theResponseShouldMatchJSON(body *gherkin.DocString) (err error) {
+func (a *apiFeature) theResponseShouldMatchJSON(body *messages.PickleStepArgument_PickleDocString) (err error) {
 	var expected, actual interface{}
 
 	// re-encode expected response

_examples/db/api_test.go

@@ -11,7 +11,7 @@ import (
 
 	txdb "github.com/DATA-DOG/go-txdb"
 	"github.com/cucumber/godog"
-	"github.com/cucumber/godog/gherkin"
+	"github.com/cucumber/messages-go/v9"
 )
 
 func init() {
@@ -71,7 +71,7 @@ func (a *apiFeature) theResponseCodeShouldBe(code int) error {
 	return nil
 }
 
-func (a *apiFeature) theResponseShouldMatchJSON(body *gherkin.DocString) (err error) {
+func (a *apiFeature) theResponseShouldMatchJSON(body *messages.PickleStepArgument_PickleDocString) (err error) {
 	var expected, actual interface{}
 
 	// re-encode expected response
@@ -91,7 +91,7 @@ func (a *apiFeature) theResponseShouldMatchJSON(body *gherkin.DocString) (err er
 	return nil
 }
 
-func (a *apiFeature) thereAreUsers(users *gherkin.DataTable) error {
+func (a *apiFeature) thereAreUsers(users *messages.PickleStepArgument_PickleTable) error {
 	var fields []string
 	var marks []string
 	head := users.Rows[0].Cells

_examples/godogs/godogs_test.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/cucumber/godog"
 	"github.com/cucumber/godog/colors"
+	messages "github.com/cucumber/messages-go/v9"
 )
 
 var opt = godog.Options{Output: colors.Colored(os.Stdout)}
@@ -56,7 +57,7 @@ func FeatureContext(s *godog.Suite) {
 	s.Step(`^I eat (\d+)$`, iEat)
 	s.Step(`^there should be (\d+) remaining$`, thereShouldBeRemaining)
 
-	s.BeforeScenario(func(interface{}) {
+	s.BeforeScenario(func(*messages.Pickle) {
 		Godogs = 0 // clean the state before every scenario
 	})
 }

builder_go112_test.go

@@ -0,0 +1,60 @@
+// +build go1.12
+// +build !go1.13
+
+package godog
+
+import (
+	"bytes"
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+func TestGodogBuildWithVendoredGodogAndMod(t *testing.T) {
+	gopath := filepath.Join(os.TempDir(), "_gpc")
+	dir := filepath.Join(gopath, "src", "godogs")
+	err := buildTestPackage(dir, map[string]string{
+		"godogs.feature": builderFeatureFile,
+		"godogs.go":      builderMainCodeFile,
+		"godogs_test.go": builderTestFile,
+		"go.mod":         builderModFile,
+	})
+	if err != nil {
+		os.RemoveAll(gopath)
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(gopath)
+
+	pkg := filepath.Join(dir, "vendor", "github.com", "cucumber")
+	if err := os.MkdirAll(pkg, 0755); err != nil {
+		t.Fatal(err)
+	}
+
+	prevDir, err := os.Getwd()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// symlink godog package
+	if err := os.Symlink(prevDir, filepath.Join(pkg, "godog")); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := os.Chdir(dir); err != nil {
+		t.Fatal(err)
+	}
+	defer os.Chdir(prevDir)
+
+	cmd := buildTestCommand(t, "godogs.feature")
+
+	var stdout, stderr bytes.Buffer
+	cmd.Stdout = &stdout
+	cmd.Stderr = &stderr
+	cmd.Env = append(envVarsWithoutGopath(), "GOPATH="+gopath)
+
+	if err := cmd.Run(); err != nil {
+		t.Log(stdout.String())
+		t.Log(stderr.String())
+		t.Fatal(err)
+	}
+}

builder_go113_test.go

@@ -0,0 +1,54 @@
+// +build go1.13
+
+package godog
+
+import (
+	"bytes"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"testing"
+)
+
+func TestGodogBuildWithVendoredGodogAndMod(t *testing.T) {
+	gopath := filepath.Join(os.TempDir(), "_gpc")
+	dir := filepath.Join(gopath, "src", "godogs")
+	err := buildTestPackage(dir, map[string]string{
+		"godogs.feature": builderFeatureFile,
+		"godogs.go":      builderMainCodeFile,
+		"godogs_test.go": builderTestFile,
+		"go.mod":         builderModFile,
+	})
+	if err != nil {
+		os.RemoveAll(gopath)
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(gopath)
+
+	prevDir, err := os.Getwd()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if err = exec.Command("go", "mod", "vendor").Run(); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := os.Chdir(dir); err != nil {
+		t.Fatal(err)
+	}
+	defer os.Chdir(prevDir)
+
+	cmd := buildTestCommand(t, "godogs.feature")
+
+	var stdout, stderr bytes.Buffer
+	cmd.Stdout = &stdout
+	cmd.Stderr = &stderr
+	cmd.Env = append(envVarsWithoutGopath(), "GOPATH="+gopath)
+
+	if err := cmd.Run(); err != nil {
+		t.Log(stdout.String())
+		t.Log(stderr.String())
+		t.Fatal(err)
+	}
+}

builder_test.go

@@ -310,55 +310,6 @@ func TestGodogBuildWithinGopath(t *testing.T) {
 	}
 }
 
-func TestGodogBuildWithVendoredGodogAndMod(t *testing.T) {
-	gopath := filepath.Join(os.TempDir(), "_gpc")
-	dir := filepath.Join(gopath, "src", "godogs")
-	err := buildTestPackage(dir, map[string]string{
-		"godogs.feature": builderFeatureFile,
-		"godogs.go":      builderMainCodeFile,
-		"godogs_test.go": builderTestFile,
-		"go.mod":         builderModFile,
-	})
-	if err != nil {
-		os.RemoveAll(gopath)
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(gopath)
-
-	pkg := filepath.Join(dir, "vendor", "github.com", "cucumber")
-	if err := os.MkdirAll(pkg, 0755); err != nil {
-		t.Fatal(err)
-	}
-
-	prevDir, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// symlink godog package
-	if err := os.Symlink(prevDir, filepath.Join(pkg, "godog")); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Chdir(dir); err != nil {
-		t.Fatal(err)
-	}
-	defer os.Chdir(prevDir)
-
-	cmd := buildTestCommand(t, "godogs.feature")
-
-	var stdout, stderr bytes.Buffer
-	cmd.Stdout = &stdout
-	cmd.Stderr = &stderr
-	cmd.Env = append(envVarsWithoutGopath(), "GOPATH="+gopath)
-
-	if err := cmd.Run(); err != nil {
-		t.Log(stdout.String())
-		t.Log(stderr.String())
-		t.Fatal(err)
-	}
-}
-
 func TestGodogBuildWithVendoredGodogWithoutModule(t *testing.T) {
 	gopath := filepath.Join(os.TempDir(), "_gp")
 	dir := filepath.Join(gopath, "src", "godogs")

color_tag_test.go

@@ -181,7 +181,7 @@ func (cw *tagColorWriter) Write(p []byte) (int, error) {
 	}
 
 	if cw.state == outsideCsiCode {
-		nw, err = cw.w.Write(p[first:len(p)])
+		nw, err = cw.w.Write(p[first:])
 		r += nw
 	}
 

colors/ansi_windows.go

@@ -409,7 +409,7 @@ func (cw *ansiColorWriter) Write(p []byte) (int, error) {
 	}
 
 	if cw.mode != discardNonColorEscSeq || cw.state == outsideCsiCode {
-		nw, err = cw.w.Write(p[first:len(p)])
+		nw, err = cw.w.Write(p[first:])
 		r += nw
 	}
 

features/formatter/cucumber.feature

@@ -257,7 +257,7 @@ Feature: cucumber json formatter
                   "name": "passing step",
                   "line": 7,
                   "match": {
-                    "location": "suite_context.go:64"
+                    "location": "suite_context.go:0"
                   },
                   "result": {
                     "status": "passed",
@@ -269,7 +269,7 @@ Feature: cucumber json formatter
                   "name": "a failing step",
                   "line": 8,
                   "match": {
-                    "location": "suite_context.go:47"
+                    "location": "suite_context.go:0"
                   },
                   "result": {
                     "status": "failed",
@@ -325,7 +325,7 @@ Feature: cucumber json formatter
                   "name": "passing step",
                   "line": 11,
                   "match": {
-                    "location": "suite_context.go:64"
+                    "location": "suite_context.go:0"
                   },
                   "result": {
                     "status": "passed",
@@ -347,7 +347,7 @@ Feature: cucumber json formatter
                   "name": "failing step",
                   "line": 12,
                   "match": {
-                    "location": "suite_context.go:47"
+                    "location": "suite_context.go:0"
                   },
                   "result": {
                     "status": "failed",
@@ -448,7 +448,7 @@ Feature: cucumber json formatter
                   "line": 8
                 },
                 "match": {
-                  "location": "suite_context.go:64"
+                  "location": "suite_context.go:0"
                 },
                 "result": {
                   "status": "passed",
@@ -501,7 +501,7 @@ Feature: cucumber json formatter
                   "name": "passing step",
                   "line": 7,
                   "match": {
-                    "location": "suite_context.go:64"
+                    "location": "suite_context.go:0"
                   },
                   "result": {
                     "status": "passed",
@@ -535,7 +535,7 @@ Feature: cucumber json formatter
                   "name": "passing step",
                   "line": 10,
                   "match": {
-                    "location": "suite_context.go:64"
+                    "location": "suite_context.go:0"
                   },
                   "result": {
                     "status": "skipped"

features/load.feature

@@ -40,7 +40,7 @@ Feature: load features
       | feature                 | number |
       | features/load.feature:3 | 0      |
       | features/load.feature:6 | 1      |
-      | features/load.feature   | 4      |
+      | features/load.feature   | 6      |
 
   Scenario: load a number of feature files
     Given a feature path "features/load.feature"

features/snippets.feature

@@ -48,7 +48,7 @@ Feature: undefined step snippets
     When I run feature suite
     Then the undefined step snippets should be:
       """
-      func iSendRequestToWith(arg1, arg2 string, arg3 *gherkin.DataTable) error {
+      func iSendRequestToWith(arg1, arg2 string, arg3 *messages.PickleStepArgument_PickleTable) error {
               return godog.ErrPending
       }