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.0
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.1
Choose a head ref
  • 6 commits
  • 10 files changed
  • 5 contributors

Commits on Feb 10, 2021

  1. reporters/junit: Use system-out element instead of passed (#769) 

    In #586, the JUnit reporter was extended to capture the output of passing tests
when the -reportPassing flag is used.

However, the passed element is not in the JUnit XML schema. While that alone
might a theoretical problem, it is also a practical problem, because some
parsers, e.g., the TeamCity XML Reporting Plugin JUnit parser, conform to that
schema, ignore the element, and show no output for passing tests.

The fix seems to be to use the system-out element instead. I have confirmed
that, when using the system-out attribute, the TeamCity XML Reporting Plugin
Junit parser shows output for a passing test.
    @dlipovetsky
    dlipovetsky authored Feb 10, 2021
    Copy the full SHA
    9eda305 View commit details

Commits on Feb 16, 2021

  1. chore: Go 1.16 - update tested versions (#770)

    @blgm
    blgm authored Feb 16, 2021
    Copy the full SHA
    6174e31 View commit details

Commits on Feb 17, 2021

  1. chore: add Dependabot config file

    @blgm
    blgm committed Feb 17, 2021
    Copy the full SHA
    7c8faca View commit details

  2. Bump github.com/nxadm/tail from 1.4.4 to 1.4.8 (#772) 

    * Bump github.com/nxadm/tail from 1.4.4 to 1.4.8

Bumps [github.com/nxadm/tail](https://github.com/nxadm/tail) from 1.4.4 to 1.4.8.
- [Release notes](https://github.com/nxadm/tail/releases)
- [Changelog](https://github.com/nxadm/tail/blob/master/CHANGES.md)
- [Commits](nxadm/tail@v1.4.4...v1.4.8)

Signed-off-by: dependabot[bot] <support@github.com>

* chore: update go.sum to be compatible with Go 1.16

Running `go mod tidy` with Go 1.16 makes a backwards-compatible change
to go.mod. Also updated go.mod to allow Go 1.15 features.

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: George Blue <gblue@pivotal.io>
    @dependabot @blgm
    dependabot[bot] and blgm authored Feb 17, 2021
    Copy the full SHA
    102778a View commit details

  3. chore: use GitHub actions for test 

    This is in addition to TravisCI for the purpose of comparing them
    @blgm
    blgm committed Feb 17, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dbafd0c View commit details

Commits on Mar 7, 2021

  1. v1.15.1

    @blgm
    blgm committed Mar 7, 2021
    Copy the full SHA
    85bd7c8 View commit details
Showing with 43 additions and 17 deletions.
  1. +8 −0 .github/dependabot.yml
  2. +19 −0 .github/workflows/test.yml
  3. +2 −2 .travis.yml
  4. +5 −0 CHANGELOG.md
  5. +1 −0 README.md
  6. +1 −1 config/config.go
  7. +3 −4 go.mod
  8. +2 −1 go.sum
  9. +1 −8 reporters/junit_reporter.go
  10. +1 −1 reporters/junit_reporter_test.go
8 changes: 8 additions & 0 deletions .github/dependabot.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: 2
updates:
- package-ecosystem: gomod
directory: "/"
schedule:
interval: daily
time: '01:00'
open-pull-requests-limit: 5
19 changes: 19 additions & 0 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: test

on: [push, pull_request]

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
version: [ '1.15', '1.16' ]
name: Go ${{ matrix.version }}
steps:
- uses: actions/setup-go@v2
with:
go-version: ${{ matrix.version }}
- uses: actions/checkout@v2
- run: go mod tidy && git diff --exit-code go.mod go.sum
- run: go vet ./...
- run: go run ./ginkgo -r --randomizeAllSpecs --randomizeSuites --race --trace
4 changes: 2 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: go
go:
- 1.14.x
- 1.15.x
- tip
- 1.16.x
- 1.15.x

cache:
directories:
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 1.15.1

### Fixes
- reporters/junit: Use `system-out` element instead of `passed` (#769) [9eda305]

## 1.15.0

### Features
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
![Ginkgo: A Go BDD Testing Framework](https://onsi.github.io/ginkgo/images/ginkgo.png)

[![Build Status](https://travis-ci.org/onsi/ginkgo.svg?branch=master)](https://travis-ci.org/onsi/ginkgo)
[![test](https://github.com/onsi/ginkgo/workflows/test/badge.svg?branch=master)](https://github.com/onsi/ginkgo/actions?query=workflow%3Atest+branch%3Amaster)

Jump to the [docs](https://onsi.github.io/ginkgo/) | [中文文档](https://ke-chain.github.io/ginkgodoc) to learn more. To start rolling your Ginkgo tests *now* [keep reading](#set-me-up)!

2 changes: 1 addition & 1 deletion config/config.go
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ import (
"fmt"
)

const VERSION = "1.15.0"
const VERSION = "1.15.1"

type GinkgoConfigType struct {
RandomSeed int64
7 changes: 3 additions & 4 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
module github.com/onsi/ginkgo

go 1.15

require (
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/nxadm/tail v1.4.4
github.com/nxadm/tail v1.4.8
github.com/onsi/gomega v1.10.1
golang.org/x/sys v0.0.0-20210112080510-489259a85091
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e
)

go 1.13
3 changes: 2 additions & 1 deletion go.sum
View file
Original file line number Diff line number Diff line change
@@ -14,8 +14,9 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
9 changes: 1 addition & 8 deletions reporters/junit_reporter.go
View file
Original file line number Diff line number Diff line change
@@ -33,17 +33,12 @@ type JUnitTestSuite struct {
type JUnitTestCase struct {
Name string `xml:"name,attr"`
ClassName string `xml:"classname,attr"`
PassedMessage *JUnitPassedMessage `xml:"passed,omitempty"`
FailureMessage *JUnitFailureMessage `xml:"failure,omitempty"`
Skipped *JUnitSkipped `xml:"skipped,omitempty"`
Time float64 `xml:"time,attr"`
SystemOut string `xml:"system-out,omitempty"`
}

type JUnitPassedMessage struct {
Message string `xml:",chardata"`
}

type JUnitFailureMessage struct {
Type string `xml:"type,attr"`
Message string `xml:",chardata"`
@@ -114,9 +109,7 @@ func (reporter *JUnitReporter) SpecDidComplete(specSummary *types.SpecSummary) {
ClassName: reporter.testSuiteName,
}
if reporter.ReporterConfig.ReportPassed && specSummary.State == types.SpecStatePassed {
testCase.PassedMessage = &JUnitPassedMessage{
Message: specSummary.CapturedOutput,
}
testCase.SystemOut = specSummary.CapturedOutput
}
if specSummary.State == types.SpecStateFailed || specSummary.State == types.SpecStateTimedOut || specSummary.State == types.SpecStatePanicked {
testCase.FailureMessage = &JUnitFailureMessage{
2 changes: 1 addition & 1 deletion reporters/junit_reporter_test.go
View file
Original file line number Diff line number Diff line change
@@ -93,7 +93,7 @@ var _ = Describe("JUnit Reporter", func() {
Expect(output.TestCases[0].FailureMessage).To(BeNil())
Expect(output.TestCases[0].Skipped).To(BeNil())
Expect(output.TestCases[0].Time).To(Equal(5.0))
Expect(output.TestCases[0].PassedMessage.Message).To(ContainSubstring("Test scenario"))
Expect(output.TestCases[0].SystemOut).To(ContainSubstring("Test scenario"))
})
})