Skip to content

Commit 752de62

Browse files
jhernandjhernand
committed
Update to Ginkgo 2.1.0
Signed-off-by: Juan Hernandez <[email protected]>
1 parent 973250b commit 752de62

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+77
-72
lines changed

‎.github/workflows/check-pull-request.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
- name: Setup Go tools
4444
run: |
45-
go install github.com/onsi/ginkgo/v2/ginkgo@v2.0.0
45+
go install github.com/onsi/ginkgo/v2/ginkgo@v2.1.0
4646
4747
- name: Run the tests
4848
run: make tests

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ examples:
3737

3838
.PHONY: test tests
3939
test tests:
40-
ginkgo -r
40+
ginkgo run -r
4141

4242
.PHONY: fmt
4343
fmt:

‎alternative_url_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"os"
2424
"time"
2525

26-
. "github.com/onsi/ginkgo/v2" // nolint
27-
. "github.com/onsi/gomega" // nolint
26+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
27+
. "github.com/onsi/gomega" // nolint
2828

2929
"github.com/onsi/gomega/ghttp"
3030

‎authentication/context_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ package authentication
2222
import (
2323
"context"
2424

25-
. "github.com/onsi/ginkgo/v2" // nolint
25+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
2626
. "github.com/onsi/gomega" // nolint
2727
. "github.com/openshift-online/ocm-sdk-go/testing" // nolint
2828
)

‎authentication/handler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727

2828
"github.com/golang-jwt/jwt/v4"
2929

30-
. "github.com/onsi/ginkgo/v2"
30+
. "github.com/onsi/ginkgo/v2/dsl/core"
3131
. "github.com/onsi/gomega" // nolint
3232
. "github.com/onsi/gomega/ghttp" // nolint
3333
. "github.com/openshift-online/ocm-sdk-go/testing" // nolint

‎authentication/main_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"github.com/openshift-online/ocm-sdk-go/logging"
2525

26-
. "github.com/onsi/ginkgo/v2" // nolint
26+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
2727
. "github.com/onsi/gomega" // nolint
2828
. "github.com/openshift-online/ocm-sdk-go/testing" // nolint
2929
)

‎authentication/transport_wrapper_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"github.com/golang-jwt/jwt/v4"
3232
"github.com/google/uuid"
3333

34-
. "github.com/onsi/ginkgo/v2" // nolint
34+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
3535
. "github.com/onsi/gomega" // nolint
3636
. "github.com/onsi/gomega/ghttp" // nolint
3737
. "github.com/openshift-online/ocm-sdk-go/testing" // nolint

‎compression_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"net/http"
2424
"time"
2525

26-
. "github.com/onsi/ginkgo/v2" // nolint
27-
. "github.com/onsi/gomega" // nolint
26+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
27+
. "github.com/onsi/gomega" // nolint
2828

2929
"github.com/onsi/gomega/ghttp"
3030

‎configuration/main_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package configuration
1919
import (
2020
"testing"
2121

22-
. "github.com/onsi/ginkgo/v2" // nolint
23-
. "github.com/onsi/gomega" // nolint
22+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
23+
. "github.com/onsi/gomega" // nolint
2424
)
2525

2626
func TestConfiguration(t *testing.T) {

‎configuration/object_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ import (
2626

2727
"gopkg.in/yaml.v3"
2828

29-
. "github.com/onsi/ginkgo/v2" // nolint
30-
. "github.com/onsi/gomega" // nolint
29+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
30+
. "github.com/onsi/ginkgo/v2/dsl/table" // nolint
31+
. "github.com/onsi/gomega" // nolint
3132
)
3233

3334
var _ = Describe("Object", func() {

‎connection_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import (
2626
"path/filepath"
2727
"time"
2828

29-
. "github.com/onsi/ginkgo/v2" // nolint
30-
. "github.com/onsi/gomega" // nolint
31-
. "github.com/onsi/gomega/gbytes" // nolint
29+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
30+
. "github.com/onsi/gomega" // nolint
31+
. "github.com/onsi/gomega/gbytes" // nolint
3232

3333
. "github.com/openshift-online/ocm-sdk-go/testing" // nolint
3434
)

‎data/digger_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ import (
2020
"context"
2121
"time"
2222

23-
. "github.com/onsi/ginkgo/v2" // nolint
24-
. "github.com/onsi/gomega" // nolint
23+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
24+
. "github.com/onsi/ginkgo/v2/dsl/table" // nolint
25+
. "github.com/onsi/gomega" // nolint
2526
)
2627

2728
var _ = Describe("Digger", func() {

‎data/main_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package data
1919
import (
2020
"testing"
2121

22-
. "github.com/onsi/ginkgo/v2" // nolint
23-
. "github.com/onsi/gomega" // nolint
22+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
23+
. "github.com/onsi/gomega" // nolint
2424
)
2525

2626
func TestData(t *testing.T) {

‎database/error_code_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package database
1919
import (
2020
"io"
2121

22-
. "github.com/onsi/ginkgo/v2" // nolint
23-
. "github.com/onsi/gomega" // nolint
22+
. "github.com/onsi/ginkgo/v2/dsl/table" // nolint
23+
. "github.com/onsi/gomega" // nolint
2424

2525
"github.com/jackc/pgconn"
2626
"github.com/lib/pq"

‎database/main_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package database
1919
import (
2020
"testing"
2121

22-
. "github.com/onsi/ginkgo/v2" // nolint
23-
. "github.com/onsi/gomega" // nolint
22+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
23+
. "github.com/onsi/gomega" // nolint
2424
)
2525

2626
func TestDatabase(t *testing.T) {

‎deprecated_logger_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
// Never import the logging package here, as that will defeat the purpuse of
2626
// these tests.
2727

28-
. "github.com/onsi/ginkgo/v2" // nolint
28+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
2929
. "github.com/onsi/gomega" // nolint
3030
. "github.com/openshift-online/ocm-sdk-go/testing" // nolint
3131
)

‎dump_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"bytes"
2121
"context"
2222

23-
. "github.com/onsi/ginkgo/v2" // nolint
24-
. "github.com/onsi/gomega" // nolint
23+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
24+
. "github.com/onsi/gomega" // nolint
2525
)
2626

2727
var _ = Describe("DumpRoundTripper", func() {

‎examples/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,8 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108
330330
github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
331331
github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
332332
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
333-
github.com/onsi/ginkgo/v2 v2.0.0 h1:CcuG/HvWNkkaqCUpJifQY8z7qEMBJya6aLPx6ftGyjQ=
334-
github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
333+
github.com/onsi/ginkgo/v2 v2.1.0 h1:Rj+Was8Gt/ICSZY/CihVKK2cGy3rDqBYKSxVnmOXZzI=
334+
github.com/onsi/ginkgo/v2 v2.1.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
335335
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
336336
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
337337
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/json-iterator/go v1.1.12
1515
github.com/lib/pq v1.10.4
1616
github.com/microcosm-cc/bluemonday v1.0.16
17-
github.com/onsi/ginkgo/v2 v2.0.0
17+
github.com/onsi/ginkgo/v2 v2.1.0
1818
github.com/onsi/gomega v1.17.0
1919
github.com/prometheus/client_golang v1.9.0
2020
golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e // indirect

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -299,8 +299,8 @@ github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
299299
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
300300
github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
301301
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
302-
github.com/onsi/ginkgo/v2 v2.0.0 h1:CcuG/HvWNkkaqCUpJifQY8z7qEMBJya6aLPx6ftGyjQ=
303-
github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
302+
github.com/onsi/ginkgo/v2 v2.1.0 h1:Rj+Was8Gt/ICSZY/CihVKK2cGy3rDqBYKSxVnmOXZzI=
303+
github.com/onsi/ginkgo/v2 v2.1.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
304304
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
305305
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
306306
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=

‎h2c_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727

2828
"github.com/onsi/gomega/ghttp"
2929

30-
. "github.com/onsi/ginkgo/v2" // nolint
30+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
3131
. "github.com/onsi/gomega" // nolint
3232
. "github.com/openshift-online/ocm-sdk-go/testing" // nolint
3333
)

‎internal/client_selector_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package internal
1919
import (
2020
"context"
2121

22-
. "github.com/onsi/ginkgo/v2" // nolint
23-
. "github.com/onsi/gomega" // nolint
22+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
23+
. "github.com/onsi/gomega" // nolint
2424
)
2525

2626
var _ = Describe("Create client selector", func() {

‎internal/main_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121

2222
"github.com/openshift-online/ocm-sdk-go/logging"
2323

24-
. "github.com/onsi/ginkgo/v2" // nolint
25-
. "github.com/onsi/gomega" // nolint
24+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
25+
. "github.com/onsi/gomega" // nolint
2626
)
2727

2828
func TestInternal(t *testing.T) {

‎internal/server_address_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"context"
2121
"net/url"
2222

23-
. "github.com/onsi/ginkgo/v2" // nolint
24-
. "github.com/onsi/gomega" // nolint
23+
. "github.com/onsi/ginkgo/v2/dsl/table" // nolint
24+
. "github.com/onsi/gomega" // nolint
2525
)
2626

2727
var _ = DescribeTable(

‎leadership/flag_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"database/sql"
2222
"time"
2323

24-
. "github.com/onsi/ginkgo/v2" // nolint
24+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
2525
. "github.com/onsi/gomega" // nolint
2626
. "github.com/openshift-online/ocm-sdk-go/testing" // nolint
2727
)

‎leadership/main_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121

2222
"github.com/openshift-online/ocm-sdk-go/logging"
2323

24-
. "github.com/onsi/ginkgo/v2" // nolint
25-
. "github.com/onsi/gomega" // nolint
24+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
25+
. "github.com/onsi/gomega" // nolint
2626

2727
. "github.com/openshift-online/ocm-sdk-go/testing" // nolint
2828

‎logging/list_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ limitations under the License.
1717
package logging
1818

1919
import (
20-
. "github.com/onsi/ginkgo/v2" // nolint
21-
. "github.com/onsi/gomega" // nolint
20+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
21+
. "github.com/onsi/ginkgo/v2/dsl/table" // nolint
22+
. "github.com/onsi/gomega" // nolint
2223
)
2324

2425
var _ = Describe("List", func() {

‎logging/main_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package logging
1919
import (
2020
"testing"
2121

22-
. "github.com/onsi/ginkgo/v2" // nolint
23-
. "github.com/onsi/gomega" // nolint
22+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
23+
. "github.com/onsi/gomega" // nolint
2424
)
2525

2626
func TestLogging(t *testing.T) {

‎main_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222

2323
"github.com/openshift-online/ocm-sdk-go/logging"
2424

25-
. "github.com/onsi/ginkgo/v2" // nolint
26-
. "github.com/onsi/gomega" // nolint
25+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
26+
. "github.com/onsi/gomega" // nolint
2727
)
2828

2929
func TestClient(t *testing.T) {

‎methods_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727

2828
"github.com/onsi/gomega/ghttp"
2929

30-
. "github.com/onsi/ginkgo/v2" // nolint
30+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
3131
. "github.com/onsi/gomega" // nolint
3232
. "github.com/openshift-online/ocm-sdk-go/testing" // nolint
3333
)

‎metrics/handler_wrapper_test.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ import (
2222
"net/http"
2323
"net/http/httptest"
2424

25-
. "github.com/onsi/ginkgo/v2" // nolint
26-
. "github.com/onsi/gomega" // nolint
27-
. "github.com/onsi/gomega/ghttp" // nolint
25+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
26+
. "github.com/onsi/ginkgo/v2/dsl/table" // nolint
27+
. "github.com/onsi/gomega" // nolint
28+
. "github.com/onsi/gomega/ghttp" // nolint
2829

2930
. "github.com/openshift-online/ocm-sdk-go/testing"
3031
)

‎metrics/main_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package metrics
1919
import (
2020
"testing"
2121

22-
. "github.com/onsi/ginkgo/v2" // nolint
23-
. "github.com/onsi/gomega" // nolint
22+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
23+
. "github.com/onsi/gomega" // nolint
2424
)
2525

2626
func TestMetrics(t *testing.T) {

‎metrics/path_tree_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ package metrics
2121
import (
2222
"encoding/json"
2323

24-
. "github.com/onsi/ginkgo/v2" // nolint
25-
. "github.com/onsi/gomega" // nolint
24+
. "github.com/onsi/ginkgo/v2/dsl/table" // nolint
25+
. "github.com/onsi/gomega" // nolint
2626
)
2727

2828
var _ = DescribeTable(

‎metrics/transport_wrapper_test.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ import (
2323
"io/ioutil"
2424
"net/http"
2525

26-
. "github.com/onsi/ginkgo/v2" // nolint
27-
. "github.com/onsi/gomega" // nolint
28-
. "github.com/onsi/gomega/ghttp" // nolint
26+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
27+
. "github.com/onsi/ginkgo/v2/dsl/table" // nolint
28+
. "github.com/onsi/gomega" // nolint
29+
. "github.com/onsi/gomega/ghttp" // nolint
2930

3031
. "github.com/openshift-online/ocm-sdk-go/testing"
3132
)
@@ -77,7 +78,7 @@ var _ = Describe("Metrics", func() {
7778
apiClient.CloseIdleConnections()
7879
})
7980

80-
// Get sends a GET request to the API server.
81+
// Send sends a GET request to the API server.
8182
var Send = func(method, path string) {
8283
request, err := http.NewRequest(method, apiServer.URL()+path, nil)
8384
Expect(err).ToNot(HaveOccurred())

‎metrics_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
"github.com/onsi/gomega/ghttp"
2626

27-
. "github.com/onsi/ginkgo/v2" // nolint
27+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
2828
. "github.com/onsi/gomega" // nolint
2929
. "github.com/openshift-online/ocm-sdk-go/testing" // nolint
3030
)

‎redirect_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626

2727
"github.com/onsi/gomega/ghttp"
2828

29-
. "github.com/onsi/ginkgo/v2" // nolint
29+
. "github.com/onsi/ginkgo/v2/dsl/core" // nolint
3030
. "github.com/onsi/gomega" // nolint
3131
. "github.com/openshift-online/ocm-sdk-go/testing" // nolint
3232
)

0 commit comments

Comments
 (0)