Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2019-11-29 17:34:10 +0300
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2019-11-29 17:34:10 +0300
commit16e6e7e947fcc9235bdea9c72d0cbcc2dbd21bd0 (patch)
tree95a047b4865736a4f23aeb0d732e2b4cc460574f
parentffbe202a012f0366d4f2fb24eb1959c90e0f2ff5 (diff)
Simplify gitlab client stub in tests
-rw-r--r--internal/source/gitlab/client/client_stub.go11
-rw-r--r--internal/source/gitlab/gitlab_test.go6
2 files changed, 6 insertions, 11 deletions
diff --git a/internal/source/gitlab/client/client_stub.go b/internal/source/gitlab/client/client_stub.go
index 809d60d3..6dc0af85 100644
--- a/internal/source/gitlab/client/client_stub.go
+++ b/internal/source/gitlab/client/client_stub.go
@@ -9,12 +9,12 @@ import (
// StubClient is a stubbed client used for testing
type StubClient struct {
- file string
+ File string
}
// GetVirtualDomain reads a test fixture and unmarshalls it
-func (m *StubClient) GetVirtualDomain(host string) (*api.VirtualDomain, error) {
- f, err := os.Open(m.file)
+func (c StubClient) GetVirtualDomain(host string) (*api.VirtualDomain, error) {
+ f, err := os.Open(c.File)
defer f.Close()
if err != nil {
return nil, err
@@ -25,8 +25,3 @@ func (m *StubClient) GetVirtualDomain(host string) (*api.VirtualDomain, error) {
return &domain, err
}
-
-// NewStubClient return a stubbed client
-func NewStubClient(fixture string) *StubClient {
- return &StubClient{file: fixture}
-}
diff --git a/internal/source/gitlab/gitlab_test.go b/internal/source/gitlab/gitlab_test.go
index affb1694..02751eea 100644
--- a/internal/source/gitlab/gitlab_test.go
+++ b/internal/source/gitlab/gitlab_test.go
@@ -13,7 +13,7 @@ import (
func TestGetDomain(t *testing.T) {
t.Run("when the response if correct", func(t *testing.T) {
- client := client.NewStubClient("client/testdata/test.gitlab.io.json")
+ client := client.StubClient{File: "client/testdata/test.gitlab.io.json"}
source := Gitlab{client: client, cache: cache.New()}
domain, err := source.GetDomain("test.gitlab.io")
@@ -23,7 +23,7 @@ func TestGetDomain(t *testing.T) {
})
t.Run("when the response is not valid", func(t *testing.T) {
- client := client.NewStubClient("/dev/null")
+ client := client.StubClient{File: "/dev/null"}
source := Gitlab{client: client, cache: cache.New()}
domain, err := source.GetDomain("test.gitlab.io")
@@ -34,7 +34,7 @@ func TestGetDomain(t *testing.T) {
}
func TestResolve(t *testing.T) {
- client := client.NewStubClient("client/testdata/test.gitlab.io.json")
+ client := client.StubClient{File: "client/testdata/test.gitlab.io.json"}
source := Gitlab{client: client, cache: cache.New()}
t.Run("when requesting a nested group project", func(t *testing.T) {