Skip to content

Commit

Permalink
Fix integration tests on Travis
Browse files Browse the repository at this point in the history
The new approach for running integration test fixtures within the integration test directory itself vs a tmp direcotry were tripping up on the guard in `ginkgo watch` that prevents `ginkgo watch` from pulling ginkgo itself in as part of the dependency tree.
  • Loading branch information
onsi committed Jun 18, 2020
1 parent d44dedf commit 8d18e87
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion ginkgo/watch/dependencies.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
)

var ginkgoAndGomegaFilter = regexp.MustCompile(`github\.com/onsi/ginkgo|github\.com/onsi/gomega`)
var ginkgoIntegrationTestFilter = regexp.MustCompile(`github\.com/onsi/ginkgo/integration`) //allow us to integration test this thing

type Dependencies struct {
deps map[string]int
Expand Down Expand Up @@ -77,7 +78,7 @@ func (d Dependencies) resolveAndAdd(deps []string, depth int) {
if err != nil {
continue
}
if !pkg.Goroot && !ginkgoAndGomegaFilter.Match([]byte(pkg.Dir)) {
if !pkg.Goroot && (!ginkgoAndGomegaFilter.Match([]byte(pkg.Dir)) || ginkgoIntegrationTestFilter.Match([]byte(pkg.Dir))) {
d.addDepIfNotPresent(pkg.Dir, depth)
}
}
Expand Down

0 comments on commit 8d18e87

Please sign in to comment.