Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: onsi/ginkgo
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.15.1
Choose a base ref
...
head repository: onsi/ginkgo
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.15.2
Choose a head ref
  • 3 commits
  • 4 files changed
  • 2 contributors

Commits on Mar 8, 2021

  1. Verified

    This commit was signed with the committer’s verified signature.
    alexanderniebuhr Alexander Niebuhr
    Copy the full SHA
    edb77f8 View commit details

Commits on Mar 16, 2021

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    e90a4a0 View commit details
  2. v1.15.2

    onsi committed Mar 16, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    95b1d5c View commit details
Showing with 23 additions and 3 deletions.
  1. +5 −0 CHANGELOG.md
  2. +2 −0 README.md
  3. +7 −3 config/config.go
  4. +9 −0 integration/flags_test.go
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 1.15.2

### Fixes
- ignore blank `-focus` and `-skip` flags (#780) [e90a4a0]

## 1.15.1

### Fixes
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -62,6 +62,8 @@ Describe("the strings package", func() {

- [Completions for VSCode](https://github.com/onsi/vscode-ginkgo): just use VSCode's extension installer to install `vscode-ginkgo`.

- [Ginkgo tools for VSCode](https://marketplace.visualstudio.com/items?itemName=joselitofilho.ginkgotestexplorer): just use VSCode's extension installer to install `ginkgoTestExplorer`.

- Straightforward support for third-party testing libraries such as [Gomock](https://code.google.com/p/gomock/) and [Testify](https://github.com/stretchr/testify). Check out the [docs](https://onsi.github.io/ginkgo/#third-party-integrations) for details.

- A modular architecture that lets you easily:
10 changes: 7 additions & 3 deletions config/config.go
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ import (
"fmt"
)

const VERSION = "1.15.1"
const VERSION = "1.15.2"

type GinkgoConfigType struct {
RandomSeed int64
@@ -219,10 +219,14 @@ func BuildFlagArgs(prefix string, ginkgo GinkgoConfigType, reporter DefaultRepor

// flagFocus implements the -focus flag.
func flagFocus(arg string) {
GinkgoConfig.FocusStrings = append(GinkgoConfig.FocusStrings, arg)
if arg != "" {
GinkgoConfig.FocusStrings = append(GinkgoConfig.FocusStrings, arg)
}
}

// flagSkip implements the -skip flag.
func flagSkip(arg string) {
GinkgoConfig.SkipStrings = append(GinkgoConfig.SkipStrings, arg)
if arg != "" {
GinkgoConfig.SkipStrings = append(GinkgoConfig.SkipStrings, arg)
}
}
9 changes: 9 additions & 0 deletions integration/flags_test.go
Original file line number Diff line number Diff line change
@@ -118,6 +118,15 @@ var _ = Describe("Flags Specs", func() {
Ω(output).Should(ContainSubstring("1 Pending"))
Ω(output).Should(ContainSubstring("3 Skipped"))
})

It("should ignore empty skip and focus variables", func() {
session := startGinkgo(pathToTest, "--noColor", "--skip=", "--focus=")
Eventually(session).Should(gexec.Exit(types.GINKGO_FOCUS_EXIT_CODE))
output := string(session.Out.Contents())
Ω(output).Should(ContainSubstring("marshmallow"))
Ω(output).Should(ContainSubstring("chocolate"))
})

It("should run the race detector when told to", func() {
if !raceDetectorSupported() {
Skip("race detection is not supported")