Merge pull request #484 from talam/update_assert_package

Swap out bmizerany/assert package in favor of stretchr/testify/assert
This commit is contained in:
Jehiah Czebotar 2017-10-23 13:56:35 -04:00 committed by GitHub
commit bc1b839f7f
15 changed files with 19 additions and 15 deletions

2
Godeps
View File

@ -2,7 +2,7 @@ github.com/18F/hmacauth 1.0.1
github.com/BurntSushi/toml d94612f9fc140360834f9742158c70b5c5b5535b github.com/BurntSushi/toml d94612f9fc140360834f9742158c70b5c5b5535b
github.com/bitly/go-simplejson da1a8928f709389522c8023062a3739f3b4af419 github.com/bitly/go-simplejson da1a8928f709389522c8023062a3739f3b4af419
github.com/mreiferson/go-options 77551d20752b54535462404ad9d877ebdb26e53d github.com/mreiferson/go-options 77551d20752b54535462404ad9d877ebdb26e53d
github.com/bmizerany/assert e17e99893cb6509f428e1728281c2ad60a6b31e3 github.com/stretchr/testify v1.1.4
gopkg.in/fsnotify.v1 v1.2.0 gopkg.in/fsnotify.v1 v1.2.0
golang.org/x/oauth2 7fdf09982454086d5570c7db3e11f360194830ca golang.org/x/oauth2 7fdf09982454086d5570c7db3e11f360194830ca
golang.org/x/net/context 242b6b35177ec3909636b6cf6a47e8c2c6324b5d golang.org/x/net/context 242b6b35177ec3909636b6cf6a47e8c2c6324b5d

View File

@ -2,12 +2,13 @@ package api
import ( import (
"github.com/bitly/go-simplejson" "github.com/bitly/go-simplejson"
"github.com/bmizerany/assert"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"strings" "strings"
"testing" "testing"
"github.com/stretchr/testify/assert"
) )
func testBackend(response_code int, payload string) *httptest.Server { func testBackend(response_code int, payload string) *httptest.Server {

View File

@ -4,7 +4,7 @@ import (
"encoding/base64" "encoding/base64"
"testing" "testing"
"github.com/bmizerany/assert" "github.com/stretchr/testify/assert"
) )
func TestEncodeAndDecodeAccessToken(t *testing.T) { func TestEncodeAndDecodeAccessToken(t *testing.T) {

View File

@ -4,7 +4,7 @@ import (
"os" "os"
"testing" "testing"
"github.com/bmizerany/assert" "github.com/stretchr/testify/assert"
) )
type envTest struct { type envTest struct {

View File

@ -2,7 +2,7 @@ package main
import ( import (
"bytes" "bytes"
"github.com/bmizerany/assert" "github.com/stretchr/testify/assert"
"testing" "testing"
) )

View File

@ -17,7 +17,7 @@ import (
"github.com/18F/hmacauth" "github.com/18F/hmacauth"
"github.com/bitly/oauth2_proxy/providers" "github.com/bitly/oauth2_proxy/providers"
"github.com/bmizerany/assert" "github.com/stretchr/testify/assert"
) )
func init() { func init() {

View File

@ -8,7 +8,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/bmizerany/assert" "github.com/stretchr/testify/assert"
) )
func testOptions() *Options { func testOptions() *Options {

View File

@ -1,11 +1,12 @@
package providers package providers
import ( import (
"github.com/bmizerany/assert"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"net/url" "net/url"
"testing" "testing"
"github.com/stretchr/testify/assert"
) )
func testAzureProvider(hostname string) *AzureProvider { func testAzureProvider(hostname string) *AzureProvider {

View File

@ -6,7 +6,7 @@ import (
"net/url" "net/url"
"testing" "testing"
"github.com/bmizerany/assert" "github.com/stretchr/testify/assert"
) )
func testGitLabProvider(hostname string) *GitLabProvider { func testGitLabProvider(hostname string) *GitLabProvider {

View File

@ -8,7 +8,7 @@ import (
"net/url" "net/url"
"testing" "testing"
"github.com/bmizerany/assert" "github.com/stretchr/testify/assert"
) )
func newRedeemServer(body []byte) (*url.URL, *httptest.Server) { func newRedeemServer(body []byte) (*url.URL, *httptest.Server) {

View File

@ -7,7 +7,7 @@ import (
"net/url" "net/url"
"testing" "testing"
"github.com/bmizerany/assert" "github.com/stretchr/testify/assert"
) )
type ValidateSessionStateTestProvider struct { type ValidateSessionStateTestProvider struct {

View File

@ -1,11 +1,12 @@
package providers package providers
import ( import (
"github.com/bmizerany/assert"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"net/url" "net/url"
"testing" "testing"
"github.com/stretchr/testify/assert"
) )
func testLinkedInProvider(hostname string) *LinkedInProvider { func testLinkedInProvider(hostname string) *LinkedInProvider {

View File

@ -4,7 +4,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/bmizerany/assert" "github.com/stretchr/testify/assert"
) )
func TestRefresh(t *testing.T) { func TestRefresh(t *testing.T) {

View File

@ -6,7 +6,7 @@ import (
"time" "time"
"github.com/bitly/oauth2_proxy/cookie" "github.com/bitly/oauth2_proxy/cookie"
"github.com/bmizerany/assert" "github.com/stretchr/testify/assert"
) )
const secret = "0123456789abcdefghijklmnopqrstuv" const secret = "0123456789abcdefghijklmnopqrstuv"

View File

@ -1,8 +1,9 @@
package main package main
import ( import (
"github.com/bmizerany/assert"
"testing" "testing"
"github.com/stretchr/testify/assert"
) )
func TestTemplatesCompile(t *testing.T) { func TestTemplatesCompile(t *testing.T) {