softonik/godog
1
0
Ответвление 0
Код Задачи Слияния Проекты Выпуски Пакеты Вики Активность Действия

fix line numbers in test after rebase

Просмотр исходного кода
Этот коммит содержится в:
Matthew Rothenberg 2017-05-05 11:43:38 -04:00
родитель fe33ed6e75
коммит 43dd0a1df3
2 изменённых файлов: 10 добавлений и 10 удалений
Показать статистику Скачать .patch Скачать .diff Показать все файлы Свернуть все файлы

14
features/formatter/cucumber.feature
Просмотреть файл

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

6
suite_context.go
Просмотреть файл

@ -442,14 +442,14 @@ func (s *suiteContext) theseEventsHadToBeFiredForNumberOfTimes(tbl *gherkin.Data
} }
func (s *suiteContext) theRenderJSONWillBe(docstring *gherkin.DocString) error { func (s *suiteContext) theRenderJSONWillBe(docstring *gherkin.DocString) error {
loc := regexp.MustCompile(`"suite_test.go:\d+"`) loc := regexp.MustCompile(`"suite_context.go:\d+"`)
var expected []cukeFeatureJSON var expected []cukeFeatureJSON
if err := json.Unmarshal([]byte(loc.ReplaceAllString(docstring.Content, `"suite_test.go:0"`)), &expected); err != nil { if err := json.Unmarshal([]byte(loc.ReplaceAllString(docstring.Content, `"suite_context.go:0"`)), &expected); err != nil {
return err return err
} }
var actual []cukeFeatureJSON var actual []cukeFeatureJSON
replaced := loc.ReplaceAllString(s.out.String(), `"suite_test.go:0"`) replaced := loc.ReplaceAllString(s.out.String(), `"suite_context.go:0"`)
if err := json.Unmarshal([]byte(replaced), &actual); err != nil { if err := json.Unmarshal([]byte(replaced), &actual); err != nil {
return err return err
} }