Change data-dog/godog references to cucumber/godog
* update makefile
Этот коммит содержится в:
родитель
37f5ec316c
коммит
b9b8a8cd4f
34 изменённых файлов: 53 добавлений и 55 удалений
6
Makefile
6
Makefile
|
@ -6,8 +6,8 @@ test:
|
|||
@echo "running all tests"
|
||||
@go install ./...
|
||||
@go fmt ./...
|
||||
@golint github.com/DATA-DOG/godog
|
||||
@golint github.com/DATA-DOG/godog/cmd/godog
|
||||
@golint github.com/cucumber/godog
|
||||
@golint github.com/cucumber/godog/cmd/godog
|
||||
go vet ./...
|
||||
go test -race
|
||||
godog -f progress -c 4
|
||||
|
@ -23,7 +23,7 @@ bump:
|
|||
@if [ -z "$(VERSION)" ]; then echo "Provide version like: 'VERSION=$(VERS) make bump'"; exit 1; fi
|
||||
@echo "bumping version from: $(VERS) to $(VERSION)"
|
||||
@sed -i.bak 's/$(VERS)/$(VERSION)/g' godog.go
|
||||
@sed -i.bak 's/$(VERS)/$(VERSION)/g' examples/api/version.feature
|
||||
@sed -i.bak 's/$(VERS)/$(VERSION)/g' examples/api/features/version.feature
|
||||
@find . -name '*.bak' | xargs rm
|
||||
|
||||
cover:
|
||||
|
|
|
@ -9,7 +9,7 @@ import (
|
|||
var astContextSrc = `package main
|
||||
|
||||
import (
|
||||
"github.com/DATA-DOG/godog"
|
||||
"github.com/cucumber/godog"
|
||||
)
|
||||
|
||||
func MyContext(s *godog.Suite) {
|
||||
|
@ -18,7 +18,7 @@ func MyContext(s *godog.Suite) {
|
|||
var astTwoContextSrc = `package lib
|
||||
|
||||
import (
|
||||
"github.com/DATA-DOG/godog"
|
||||
"github.com/cucumber/godog"
|
||||
)
|
||||
|
||||
func ApiContext(s *godog.Suite) {
|
||||
|
|
|
@ -26,11 +26,11 @@ var gopaths = filepath.SplitList(build.Default.GOPATH)
|
|||
var goarch = build.Default.GOARCH
|
||||
var goos = build.Default.GOOS
|
||||
|
||||
var godogImportPath = "github.com/DATA-DOG/godog"
|
||||
var godogImportPath = "github.com/cucumber/godog"
|
||||
var runnerTemplate = template.Must(template.New("testmain").Parse(`package main
|
||||
|
||||
import (
|
||||
"github.com/DATA-DOG/godog"
|
||||
"github.com/cucumber/godog"
|
||||
{{if .Contexts}}_test "{{.ImportPath}}"{{end}}
|
||||
"os"
|
||||
)
|
||||
|
|
|
@ -25,13 +25,13 @@ var (
|
|||
compiler = filepath.Join(tooldir, "compile")
|
||||
linker = filepath.Join(tooldir, "link")
|
||||
gopaths = filepath.SplitList(build.Default.GOPATH)
|
||||
godogImportPath = "github.com/DATA-DOG/godog"
|
||||
godogImportPath = "github.com/cucumber/godog"
|
||||
|
||||
// godep
|
||||
runnerTemplate = template.Must(template.New("testmain").Parse(`package main
|
||||
|
||||
import (
|
||||
"github.com/DATA-DOG/godog"
|
||||
"github.com/cucumber/godog"
|
||||
{{if .Contexts}}_test "{{.ImportPath}}"{{end}}
|
||||
{{if .XContexts}}_xtest "{{.ImportPath}}_test"{{end}}
|
||||
{{if .XContexts}}"testing/internal/testdeps"{{end}}
|
||||
|
@ -60,7 +60,7 @@ func main() {
|
|||
// temp file for import
|
||||
tempFileTemplate = template.Must(template.New("temp").Parse(`package {{.Name}}
|
||||
|
||||
import "github.com/DATA-DOG/godog"
|
||||
import "github.com/cucumber/godog"
|
||||
|
||||
var _ = godog.Version
|
||||
`))
|
||||
|
|
|
@ -36,7 +36,7 @@ func TestGodogBuildWithModuleOutsideGopathAndHavingOnlyFeature(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if out, err := exec.Command("go", "mod", "edit", "-require", "github.com/DATA-DOG/godog@v0.7.12").CombinedOutput(); err != nil {
|
||||
if out, err := exec.Command("go", "mod", "edit", "-require", "github.com/cucumber/godog@v0.7.12").CombinedOutput(); err != nil {
|
||||
t.Log(string(out))
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
|
|
@ -27,7 +27,7 @@ var builderTestFile = `package godogs
|
|||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/DATA-DOG/godog"
|
||||
"github.com/cucumber/godog"
|
||||
)
|
||||
|
||||
func thereAreGodogs(available int) error {
|
||||
|
@ -66,7 +66,7 @@ var builderXTestFile = `package godogs_test
|
|||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/DATA-DOG/godog"
|
||||
"github.com/cucumber/godog"
|
||||
"godogs"
|
||||
)
|
||||
|
||||
|
@ -275,7 +275,7 @@ func TestGodogBuildWithinGopath(t *testing.T) {
|
|||
}
|
||||
defer os.RemoveAll(gopath)
|
||||
|
||||
pkg := filepath.Join(gopath, "src", "github.com", "DATA-DOG")
|
||||
pkg := filepath.Join(gopath, "src", "github.com", "cucumber")
|
||||
if err := os.MkdirAll(pkg, 0755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
@ -325,7 +325,7 @@ func TestGodogBuildWithVendoredGodogAndMod(t *testing.T) {
|
|||
}
|
||||
defer os.RemoveAll(gopath)
|
||||
|
||||
pkg := filepath.Join(dir, "vendor", "github.com", "DATA-DOG")
|
||||
pkg := filepath.Join(dir, "vendor", "github.com", "cucumber")
|
||||
if err := os.MkdirAll(pkg, 0755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
@ -371,7 +371,7 @@ func TestGodogBuildWithVendoredGodogWithoutModule(t *testing.T) {
|
|||
}
|
||||
defer os.RemoveAll(gopath)
|
||||
|
||||
pkg := filepath.Join(dir, "vendor", "github.com", "DATA-DOG")
|
||||
pkg := filepath.Join(dir, "vendor", "github.com", "cucumber")
|
||||
if err := os.MkdirAll(pkg, 0755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
|
|
@ -8,8 +8,8 @@ import (
|
|||
"path/filepath"
|
||||
"syscall"
|
||||
|
||||
"github.com/DATA-DOG/godog"
|
||||
"github.com/DATA-DOG/godog/colors"
|
||||
"github.com/cucumber/godog"
|
||||
"github.com/cucumber/godog/colors"
|
||||
)
|
||||
|
||||
var parsedStatus int
|
||||
|
|
|
@ -7,7 +7,7 @@ import (
|
|||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/DATA-DOG/godog/colors"
|
||||
"github.com/cucumber/godog/colors"
|
||||
)
|
||||
|
||||
type csiState int
|
||||
|
|
|
@ -6,7 +6,7 @@ import (
|
|||
"fmt"
|
||||
"net/http"
|
||||
|
||||
"github.com/DATA-DOG/godog"
|
||||
"github.com/cucumber/godog"
|
||||
)
|
||||
|
||||
func getVersion(w http.ResponseWriter, r *http.Request) {
|
||||
|
|
|
@ -7,8 +7,8 @@ import (
|
|||
"net/http/httptest"
|
||||
"reflect"
|
||||
|
||||
"github.com/DATA-DOG/godog"
|
||||
"github.com/DATA-DOG/godog/gherkin"
|
||||
"github.com/cucumber/godog"
|
||||
"github.com/cucumber/godog/gherkin"
|
||||
)
|
||||
|
||||
type apiFeature struct {
|
||||
|
|
|
@ -10,8 +10,8 @@ import (
|
|||
"strings"
|
||||
|
||||
txdb "github.com/DATA-DOG/go-txdb"
|
||||
"github.com/DATA-DOG/godog"
|
||||
"github.com/DATA-DOG/godog/gherkin"
|
||||
"github.com/cucumber/godog"
|
||||
"github.com/cucumber/godog/gherkin"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
|
|
@ -7,8 +7,8 @@ import (
|
|||
"os"
|
||||
"testing"
|
||||
|
||||
"github.com/DATA-DOG/godog"
|
||||
"github.com/DATA-DOG/godog/colors"
|
||||
"github.com/cucumber/godog"
|
||||
"github.com/cucumber/godog/colors"
|
||||
)
|
||||
|
||||
var opt = godog.Options{Output: colors.Colored(os.Stdout)}
|
||||
|
|
2
flags.go
2
flags.go
|
@ -9,7 +9,7 @@ import (
|
|||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/DATA-DOG/godog/colors"
|
||||
"github.com/cucumber/godog/colors"
|
||||
)
|
||||
|
||||
var descFeaturesArgument = "Optional feature(s) to run. Can be:\n" +
|
||||
|
|
|
@ -7,7 +7,7 @@ import (
|
|||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/DATA-DOG/godog/colors"
|
||||
"github.com/cucumber/godog/colors"
|
||||
)
|
||||
|
||||
func TestFlagsShouldRandomizeAndGenerateSeed(t *testing.T) {
|
||||
|
|
4
fmt.go
4
fmt.go
|
@ -13,8 +13,8 @@ import (
|
|||
"time"
|
||||
"unicode"
|
||||
|
||||
"github.com/DATA-DOG/godog/colors"
|
||||
"github.com/DATA-DOG/godog/gherkin"
|
||||
"github.com/cucumber/godog/colors"
|
||||
"github.com/cucumber/godog/gherkin"
|
||||
)
|
||||
|
||||
// some snippet formatting regexps
|
||||
|
|
|
@ -19,7 +19,7 @@ import (
|
|||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/DATA-DOG/godog/gherkin"
|
||||
"github.com/cucumber/godog/gherkin"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
|
|
@ -5,7 +5,7 @@ import (
|
|||
"fmt"
|
||||
"io"
|
||||
|
||||
"github.com/DATA-DOG/godog/gherkin"
|
||||
"github.com/cucumber/godog/gherkin"
|
||||
)
|
||||
|
||||
const nanoSec = 1000000
|
||||
|
|
|
@ -9,7 +9,7 @@ import (
|
|||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/DATA-DOG/godog/gherkin"
|
||||
"github.com/cucumber/godog/gherkin"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
|
|
@ -9,8 +9,8 @@ import (
|
|||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/DATA-DOG/godog/colors"
|
||||
"github.com/DATA-DOG/godog/gherkin"
|
||||
"github.com/cucumber/godog/colors"
|
||||
"github.com/cucumber/godog/gherkin"
|
||||
)
|
||||
|
||||
var sampleGherkinFeature = `
|
||||
|
|
|
@ -8,8 +8,8 @@ import (
|
|||
"strings"
|
||||
"unicode/utf8"
|
||||
|
||||
"github.com/DATA-DOG/godog/colors"
|
||||
"github.com/DATA-DOG/godog/gherkin"
|
||||
"github.com/cucumber/godog/colors"
|
||||
"github.com/cucumber/godog/gherkin"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
|
|
@ -7,7 +7,7 @@ import (
|
|||
"strings"
|
||||
"sync"
|
||||
|
||||
"github.com/DATA-DOG/godog/gherkin"
|
||||
"github.com/cucumber/godog/gherkin"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
|
|
@ -7,8 +7,8 @@ import (
|
|||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/DATA-DOG/godog/colors"
|
||||
"github.com/DATA-DOG/godog/gherkin"
|
||||
"github.com/cucumber/godog/colors"
|
||||
"github.com/cucumber/godog/gherkin"
|
||||
)
|
||||
|
||||
func TestProgressFormatterOutput(t *testing.T) {
|
||||
|
|
|
@ -30,7 +30,7 @@ func TestPrintingFormatters(t *testing.T) {
|
|||
suite.Step(`^odd (\d+) and even (\d+) number$`, oddEvenStepDef)
|
||||
|
||||
pkg := os.Getenv("GODOG_TESTED_PACKAGE")
|
||||
os.Setenv("GODOG_TESTED_PACKAGE", "github.com/DATA-DOG/godog")
|
||||
os.Setenv("GODOG_TESTED_PACKAGE", "github.com/cucumber/godog")
|
||||
for _, feat := range features {
|
||||
for name := range AvailableFormatters() {
|
||||
expectOutputPath := strings.Replace(feat.Path, "features", name, 1)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package godog
|
||||
|
||||
import "github.com/DATA-DOG/godog/gherkin"
|
||||
import "github.com/cucumber/godog/gherkin"
|
||||
|
||||
// examples is a helper func to cast gherkin.Examples
|
||||
// or gherkin.BaseExamples if its empty
|
||||
|
|
5
go.mod
5
go.mod
|
@ -1,9 +1,8 @@
|
|||
module github.com/DATA-DOG/godog
|
||||
module github.com/cucumber/godog
|
||||
|
||||
go 1.12
|
||||
go 1.13
|
||||
|
||||
require (
|
||||
github.com/DATA-DOG/go-txdb v0.1.3
|
||||
github.com/go-sql-driver/mysql v1.5.0
|
||||
github.com/lib/pq v1.3.0 // indirect
|
||||
)
|
||||
|
|
1
go.sum
1
go.sum
|
@ -2,4 +2,3 @@ github.com/DATA-DOG/go-txdb v0.1.3 h1:R4v6OuOcy2O147e2zHxU0B4NDtF+INb5R9q/CV7AEM
|
|||
github.com/DATA-DOG/go-txdb v0.1.3/go.mod h1:DhAhxMXZpUJVGnT+p9IbzJoRKvlArO2pkHjnGX7o0n0=
|
||||
github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
|
||||
github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
|
||||
github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
|
||||
|
|
2
godog.go
2
godog.go
|
@ -39,4 +39,4 @@ Godog was inspired by Behat and Cucumber the above description is taken from it'
|
|||
package godog
|
||||
|
||||
// Version of package - based on Semantic Versioning 2.0.0 http://semver.org/
|
||||
const Version = "v0.7.14"
|
||||
const Version = "v0.8.0"
|
||||
|
|
2
run.go
2
run.go
|
@ -10,7 +10,7 @@ import (
|
|||
"strings"
|
||||
"sync"
|
||||
|
||||
"github.com/DATA-DOG/godog/colors"
|
||||
"github.com/cucumber/godog/colors"
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
|
@ -10,8 +10,8 @@ import (
|
|||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/DATA-DOG/godog/colors"
|
||||
"github.com/DATA-DOG/godog/gherkin"
|
||||
"github.com/cucumber/godog/colors"
|
||||
"github.com/cucumber/godog/gherkin"
|
||||
)
|
||||
|
||||
func okStep() error {
|
||||
|
|
|
@ -10,7 +10,7 @@ import (
|
|||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/DATA-DOG/godog/gherkin"
|
||||
"github.com/cucumber/godog/gherkin"
|
||||
)
|
||||
|
||||
var matchFuncDefRef = regexp.MustCompile(`\(([^\)]+)\)`)
|
||||
|
|
|
@ -5,7 +5,7 @@ import (
|
|||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/DATA-DOG/godog/gherkin"
|
||||
"github.com/cucumber/godog/gherkin"
|
||||
)
|
||||
|
||||
func TestShouldSupportIntTypes(t *testing.T) {
|
||||
|
|
2
suite.go
2
suite.go
|
@ -15,7 +15,7 @@ import (
|
|||
"time"
|
||||
"unicode/utf8"
|
||||
|
||||
"github.com/DATA-DOG/godog/gherkin"
|
||||
"github.com/cucumber/godog/gherkin"
|
||||
)
|
||||
|
||||
var errorInterface = reflect.TypeOf((*error)(nil)).Elem()
|
||||
|
|
|
@ -11,7 +11,7 @@ import (
|
|||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/DATA-DOG/godog/gherkin"
|
||||
"github.com/cucumber/godog/gherkin"
|
||||
)
|
||||
|
||||
// SuiteContext provides steps for godog suite execution and
|
||||
|
|
2
utils.go
2
utils.go
|
@ -4,7 +4,7 @@ import (
|
|||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/DATA-DOG/godog/colors"
|
||||
"github.com/cucumber/godog/colors"
|
||||
)
|
||||
|
||||
var (
|
||||
|
|
Загрузка…
Создание таблицы
Сослаться в новой задаче