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:
authorNick Thomas <nick@gitlab.com>2019-09-11 16:46:05 +0300
committerNick Thomas <nick@gitlab.com>2019-09-12 14:18:00 +0300
commit26d8e2d1197e0ffb9c0fcd47bb61ef35a901f67b (patch)
tree0829e6f01c15972e1780ed9fc1f42d993350c830 /internal/request/request_test.go
parentdd802698dba879ef5eeeb7b4f4abd03364f3788f (diff)
Remove github.com/stretchr/testify/assert
The "assert" form is difficult to use correctly and complicates test understanding. I think we should insist on using require *only* in our tests across GitLab.
Diffstat (limited to 'internal/request/request_test.go')
-rw-r--r--internal/request/request_test.go15
1 files changed, 7 insertions, 8 deletions
diff --git a/internal/request/request_test.go b/internal/request/request_test.go
index 97e40ee4..afb40142 100644
--- a/internal/request/request_test.go
+++ b/internal/request/request_test.go
@@ -4,7 +4,6 @@ import (
"net/http"
"testing"
- "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitlab-pages/internal/domain"
@@ -15,25 +14,25 @@ func TestWithHTTPSFlag(t *testing.T) {
require.NoError(t, err)
httpsRequest := WithHTTPSFlag(r, true)
- assert.True(t, IsHTTPS(httpsRequest))
+ require.True(t, IsHTTPS(httpsRequest))
httpRequest := WithHTTPSFlag(r, false)
- assert.False(t, IsHTTPS(httpRequest))
+ require.False(t, IsHTTPS(httpRequest))
}
func TestPanics(t *testing.T) {
r, err := http.NewRequest("GET", "/", nil)
require.NoError(t, err)
- assert.Panics(t, func() {
+ require.Panics(t, func() {
IsHTTPS(r)
})
- assert.Panics(t, func() {
+ require.Panics(t, func() {
GetHost(r)
})
- assert.Panics(t, func() {
+ require.Panics(t, func() {
GetDomain(r)
})
}
@@ -61,8 +60,8 @@ func TestWithHostAndDomain(t *testing.T) {
require.NoError(t, err)
r = WithHostAndDomain(r, tt.host, tt.domain)
- assert.Exactly(t, tt.domain, GetDomain(r))
- assert.Equal(t, tt.host, GetHost(r))
+ require.Exactly(t, tt.domain, GetDomain(r))
+ require.Equal(t, tt.host, GetHost(r))
})
}
}