diff options
Diffstat (limited to 'server/auth/google')
-rw-r--r-- | server/auth/google/google.go | 2 | ||||
-rw-r--r-- | server/auth/google/google_test.go | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/server/auth/google/google.go b/server/auth/google/google.go index 08a4083..643ecfe 100644 --- a/server/auth/google/google.go +++ b/server/auth/google/google.go @@ -34,7 +34,7 @@ func New(c *config.Auth) (auth.Provider, error) { uw[u] = true } if c.ProviderOpts["domain"] == "" && len(uw) == 0 { - return nil, errors.New("google_opts domain and the users whitelist must not be both empty") + return nil, errors.New("either Google Apps domain or users whitelist must be specified") } return &Config{ diff --git a/server/auth/google/google_test.go b/server/auth/google/google_test.go index b80c4bf..781cf6f 100644 --- a/server/auth/google/google_test.go +++ b/server/auth/google/google_test.go @@ -28,12 +28,11 @@ func TestNew(t *testing.T) { } func TestNewWithoutDomain(t *testing.T) { - a := assert.New(t) - domain = "" - _, err := newGoogle() - a.EqualError(err, "google_opts domain and the users whitelist must not be both empty") + if _, err := newGoogle(); err == nil { + t.Error("creating a provider without a domain set should return an error") + } domain = "example.com" } |