From bb2b59f129a658bb257170443275dbb2b8441a19 Mon Sep 17 00:00:00 2001 From: Simon Emms Date: Tue, 6 Dec 2022 21:51:01 +0000 Subject: [PATCH 1/8] ci(e2e): configure the tests against known database images --- .github/workflows/build.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 208d79d..8491949 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,8 +3,33 @@ on: - pull_request - push jobs: + e2e: + runs-on: ubuntu-latest + strategy: + fail-fast: true + max-parallel: 5 + matrix: + include: + - db: mongodb:4 + + - db: mongodb:5 + + - db: mongodb:6 + + - db: mongodb + steps: + - uses: actions/checkout@v3 + + - name: Set up Go + uses: actions/setup-go@v3 + + - name: Run e2e tests + run: go test -v ./... -tags e2e + build: runs-on: ubuntu-latest + needs: + - e2e steps: - uses: actions/checkout@v3 From a678fd45156fbab0e3a1196a2f1869a09e29fb05 Mon Sep 17 00:00:00 2001 From: Simon Emms Date: Sun, 11 Dec 2022 21:57:18 +0000 Subject: [PATCH 2/8] ci(build): run unit tests in ci/cd --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8491949..51159a1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,6 +42,9 @@ jobs: - name: Lint Go uses: golangci/golangci-lint-action@v3 + - name: Go test + run: go test -v ./... -tags unit + - name: Set up QEMU uses: docker/setup-qemu-action@v2 From 003602224acb6b5b5a3db70ee3927bd41620b461 Mon Sep 17 00:00:00 2001 From: Simon Emms Date: Sun, 11 Dec 2022 21:55:30 +0000 Subject: [PATCH 3/8] feat(test): add some unit tests --- go.mod | 3 ++ go.sum | 2 ++ pkg/gobblr/files_test.go | 61 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 pkg/gobblr/files_test.go diff --git a/go.mod b/go.mod index bef2af8..bb2e3d8 100644 --- a/go.mod +++ b/go.mod @@ -11,6 +11,7 @@ require ( github.com/rs/zerolog v1.28.0 github.com/spf13/cobra v1.6.1 github.com/spf13/viper v1.14.0 + github.com/stretchr/testify v1.8.1 go.mongodb.org/mongo-driver v1.11.0 gorm.io/driver/mysql v1.4.4 gorm.io/driver/postgres v1.4.5 @@ -20,6 +21,7 @@ require ( ) require ( + github.com/davecgh/go-spew v1.1.1 // indirect github.com/dlclark/regexp2 v1.7.0 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/gin-contrib/sse v0.1.0 // indirect @@ -60,6 +62,7 @@ require ( github.com/pelletier/go-toml v1.9.5 // indirect github.com/pelletier/go-toml/v2 v2.0.5 // indirect github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/afero v1.9.2 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect diff --git a/go.sum b/go.sum index cf8a90e..9848cd5 100644 --- a/go.sum +++ b/go.sum @@ -347,6 +347,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -356,6 +357,7 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= diff --git a/pkg/gobblr/files_test.go b/pkg/gobblr/files_test.go new file mode 100644 index 0000000..75891f3 --- /dev/null +++ b/pkg/gobblr/files_test.go @@ -0,0 +1,61 @@ +//go:build unit +// +build unit + +package gobblr + +import ( + "testing" + "time" + + "github.com/stretchr/testify/require" +) + +func TestParseDates(t *testing.T) { + testCases := []struct { + Name string + Input interface{} + Expected interface{} + }{ + { + Name: "boolean true", + Input: true, + Expected: true, + }, + { + Name: "boolean false", + Input: false, + Expected: false, + }, + { + Name: "rfc3339 date", + Input: "2022-12-23T10:20:30Z", + Expected: time.Date(2022, 12, 23, 10, 20, 30, 00, time.UTC), + }, + { + Name: "YYYY-MM-DD date", + Input: "2022-12-23", + Expected: time.Date(2022, 12, 23, 0, 0, 0, 0, time.UTC), + }, + { + Name: "string", + Input: "hello world", + Expected: "hello world", + }, + { + Name: "numeric string", + Input: "2022", + Expected: "2022", + }, + { + Name: "number", + Input: 2022, + Expected: 2022, + }, + } + + for _, testCase := range testCases { + t.Run(testCase.Name, func(t *testing.T) { + require.Equal(t, parseDates(testCase.Input), testCase.Expected) + }) + } +} From 18b2e9d0f751dd89c550057216aba2b0f9d6232c Mon Sep 17 00:00:00 2001 From: Simon Emms Date: Sun, 11 Dec 2022 22:20:28 +0000 Subject: [PATCH 4/8] chore: tests --- Makefile | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..e26cb9f --- /dev/null +++ b/Makefile @@ -0,0 +1,7 @@ +e2e: + go test -v ./... -tags e2e +.PHONY: e2e + +unit: + go test -v ./... -tags unit +.PHONY: unit From 6c5ddf09524727feab2a2b33bf66550cdad66a1e Mon Sep 17 00:00:00 2001 From: Simon Emms Date: Sun, 11 Dec 2022 22:21:35 +0000 Subject: [PATCH 5/8] chore: e2e --- test/e2e/main_test.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 test/e2e/main_test.go diff --git a/test/e2e/main_test.go b/test/e2e/main_test.go new file mode 100644 index 0000000..1e5730b --- /dev/null +++ b/test/e2e/main_test.go @@ -0,0 +1,15 @@ +//go:build e2e +// +build e2e + +package e2e_test + +import ( + "fmt" + "testing" +) + +func TestExample(t *testing.T) { + t.Run("hello", func(t *testing.T) { + fmt.Println(222) + }) +} From f9a03c28aa4ce8094f13da2567a63408da892909 Mon Sep 17 00:00:00 2001 From: Simon Emms Date: Sun, 11 Dec 2022 22:26:24 +0000 Subject: [PATCH 6/8] chore: add service to e2e ci --- .github/workflows/build.yml | 16 ++++++++++++---- .vscode/settings.json | 8 ++++++++ Makefile | 2 +- pkg/gobblr/files_test.go | 5 +---- 4 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 51159a1..6fb0056 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,13 +10,21 @@ jobs: max-parallel: 5 matrix: include: - - db: mongodb:4 + - db: mongo:4 + dbEnv: {} - - db: mongodb:5 + - db: mongo:5 + dbEnv: {} - - db: mongodb:6 + - db: mongo:6 + dbEnv: {} - - db: mongodb + - db: mongo + dbEnv: {} + services: + db: + image: ${{ matrix.db }} + env: ${{ matrix.dbEnv }} steps: - uses: actions/checkout@v3 diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..606d46d --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,8 @@ +{ + "go.buildFlags": [ + "-tags=e2e" + ], + "go.testFlags": [ + "-tags=e2e" + ] +} diff --git a/Makefile b/Makefile index e26cb9f..b1cfcc5 100644 --- a/Makefile +++ b/Makefile @@ -3,5 +3,5 @@ e2e: .PHONY: e2e unit: - go test -v ./... -tags unit + go test -v ./... .PHONY: unit diff --git a/pkg/gobblr/files_test.go b/pkg/gobblr/files_test.go index 75891f3..9c652b6 100644 --- a/pkg/gobblr/files_test.go +++ b/pkg/gobblr/files_test.go @@ -1,6 +1,3 @@ -//go:build unit -// +build unit - package gobblr import ( @@ -29,7 +26,7 @@ func TestParseDates(t *testing.T) { { Name: "rfc3339 date", Input: "2022-12-23T10:20:30Z", - Expected: time.Date(2022, 12, 23, 10, 20, 30, 00, time.UTC), + Expected: time.Date(2022, 12, 23, 10, 20, 30, 0, time.UTC), }, { Name: "YYYY-MM-DD date", From 84b568e83ac714c79de1a76995fd0962ba47f8c8 Mon Sep 17 00:00:00 2001 From: Simon Emms Date: Thu, 22 Dec 2022 17:02:39 +0000 Subject: [PATCH 7/8] chore: stuff --- .github/workflows/build.yml | 4 ++-- pkg/gobblr/files_test.go | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6fb0056..fb2833c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ jobs: uses: actions/setup-go@v3 - name: Run e2e tests - run: go test -v ./... -tags e2e + run: make e2e build: runs-on: ubuntu-latest @@ -51,7 +51,7 @@ jobs: uses: golangci/golangci-lint-action@v3 - name: Go test - run: go test -v ./... -tags unit + run: make unit - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/pkg/gobblr/files_test.go b/pkg/gobblr/files_test.go index 9c652b6..da768e6 100644 --- a/pkg/gobblr/files_test.go +++ b/pkg/gobblr/files_test.go @@ -1,3 +1,6 @@ +//go:build !e2e +// +build !e2e + package gobblr import ( From e4367a2bb780bb358ac033a89e3851801a5b3eee Mon Sep 17 00:00:00 2001 From: Simon Emms Date: Sat, 24 Dec 2022 11:44:23 +0000 Subject: [PATCH 8/8] chore: ginkgo playing --- e2e_test.go | 10 ++++++++++ go.mod | 14 +++++++++++--- go.sum | 17 +++++++++++++++++ go.work.sum | 20 +++++++++++++------- gobblr_suite_test.go | 13 +++++++++++++ test/e2e/main_test.go | 33 +++++++++++++++++++++++++-------- 6 files changed, 89 insertions(+), 18 deletions(-) create mode 100644 e2e_test.go create mode 100644 gobblr_suite_test.go diff --git a/e2e_test.go b/e2e_test.go new file mode 100644 index 0000000..68226ef --- /dev/null +++ b/e2e_test.go @@ -0,0 +1,10 @@ +package main_test + +import ( + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" +) + +var _ = Describe("E2e", func() { + +}) diff --git a/go.mod b/go.mod index bb2e3d8..87d12d4 100644 --- a/go.mod +++ b/go.mod @@ -20,6 +20,12 @@ require ( gorm.io/gorm v1.24.2 ) +require ( + github.com/go-logr/logr v1.2.3 // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/go-cmp v0.5.9 // indirect +) + require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/dlclark/regexp2 v1.7.0 // indirect @@ -59,6 +65,8 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/montanaflynn/stats v0.6.6 // indirect + github.com/onsi/ginkgo/v2 v2.6.1 + github.com/onsi/gomega v1.24.2 github.com/pelletier/go-toml v1.9.5 // indirect github.com/pelletier/go-toml/v2 v2.0.5 // indirect github.com/pkg/errors v0.9.1 // indirect @@ -74,10 +82,10 @@ require ( github.com/xdg-go/stringprep v1.0.3 // indirect github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b // indirect - golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect + golang.org/x/net v0.4.0 // indirect golang.org/x/sync v0.1.0 // indirect - golang.org/x/sys v0.0.0-20220908164124-27713097b956 // indirect - golang.org/x/text v0.4.0 // indirect + golang.org/x/sys v0.3.0 // indirect + golang.org/x/text v0.5.0 // indirect google.golang.org/protobuf v1.28.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index 9848cd5..4adde9e 100644 --- a/go.sum +++ b/go.sum @@ -95,6 +95,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= +github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= @@ -147,6 +149,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -162,6 +166,7 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -299,6 +304,10 @@ github.com/montanaflynn/stats v0.6.6 h1:Duep6KMIDpY4Yo11iFsvyqJDyfzLF9+sndUKT+v6 github.com/montanaflynn/stats v0.6.6/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= github.com/mrsimonemms/gin-structured-logger v0.1.0 h1:2bPolxDw+Fd+FKpZpzfzRPR2dTEDRsAbPMOS1Q6aAhs= github.com/mrsimonemms/gin-structured-logger v0.1.0/go.mod h1:NFJ0CpPs2aDFtAuktQa3GRpgeAqBqDilT/0VLPW42PU= +github.com/onsi/ginkgo/v2 v2.6.1 h1:1xQPCjcqYw/J5LchOcp4/2q/jzJFjiAOc25chhnDw+Q= +github.com/onsi/ginkgo/v2 v2.6.1/go.mod h1:yjiuMwPokqY1XauOgju45q3sJt6VzQ/Fict1LFVcsAo= +github.com/onsi/gomega v1.24.2 h1:J/tulyYK6JwBldPViHJReihxxZ+22FHs0piGjQAvoUE= +github.com/onsi/gomega v1.24.2/go.mod h1:gs3J10IS7Z7r7eXRoNJIrNqU4ToQukCJhFtKrWgHWnk= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= @@ -484,6 +493,9 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= +golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU= +golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -557,6 +569,8 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220224120231-95c6836cb0e7/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956 h1:XeJjHH1KiLpKGb6lvMiksZ9l0fVUh+AmGcm0nOMEBOY= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -570,6 +584,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= +golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -720,6 +736,7 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/go.work.sum b/go.work.sum index 0c6157e..dcfb39a 100644 --- a/go.work.sum +++ b/go.work.sum @@ -1,10 +1,16 @@ -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE= github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0= github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A= -github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= -github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/onsi/gomega v1.24.1 h1:KORJXNNTzJXzu4ScJWssJfJMnJ+2QJqhoQSRwNlze9E= github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= -golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/net v0.3.0 h1:VWL6FNY2bEEmsGVKabSlHu5Irp34xmMRoqb/9lF9lxk= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.4.0 h1:7mTAgkunk3fr4GAloyyCasadO6h9zSsQZbwvcaIciV4= +golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= diff --git a/gobblr_suite_test.go b/gobblr_suite_test.go new file mode 100644 index 0000000..41d9459 --- /dev/null +++ b/gobblr_suite_test.go @@ -0,0 +1,13 @@ +package main_test + +import ( + "testing" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" +) + +func TestGobblr(t *testing.T) { + RegisterFailHandler(Fail) + RunSpecs(t, "Gobblr Suite") +} diff --git a/test/e2e/main_test.go b/test/e2e/main_test.go index 1e5730b..d08b8eb 100644 --- a/test/e2e/main_test.go +++ b/test/e2e/main_test.go @@ -1,15 +1,32 @@ -//go:build e2e -// +build e2e - package e2e_test import ( "fmt" - "testing" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" ) -func TestExample(t *testing.T) { - t.Run("hello", func(t *testing.T) { - fmt.Println(222) +var _ = Describe("", func() { + BeforeEach(func() { + fmt.Println("I'm a before each") + }) + + It("should", func() { + Expect(2).To(Equal(3)) }) -} +}) + +// func BeforeEach() {} + +// func TestExample(t *testing.T) { +// t.Run("hello", func(t *testing.T) { +// fmt.Println(222) +// }) +// } + +// func TestExample2(t *testing.T) { +// t.Run("hello", func(t *testing.T) { +// fmt.Println(333) +// }) +// }