From 17b17fc8bb690d1f6344e5af1c62b3b37166bc48 Mon Sep 17 00:00:00 2001
From: Niall Sheridan <nsheridan@gmail.com>
Date: Sun, 15 Jan 2017 21:50:38 +0000
Subject: Add more context to errors

---
 server/auth/github/github.go      | 2 +-
 server/auth/github/github_test.go | 8 +++-----
 server/auth/google/google.go      | 2 +-
 server/auth/google/google_test.go | 7 +++----
 4 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'server/auth')

diff --git a/server/auth/github/github.go b/server/auth/github/github.go
index 24a4bbf..7628526 100644
--- a/server/auth/github/github.go
+++ b/server/auth/github/github.go
@@ -32,7 +32,7 @@ func New(c *config.Auth) (auth.Provider, error) {
 		uw[u] = true
 	}
 	if c.ProviderOpts["organization"] == "" && len(uw) == 0 {
-		return nil, errors.New("github_opts organization and the users whitelist must not be both empty")
+		return nil, errors.New("either GitHub organization or users whitelist must be specified")
 	}
 	return &Config{
 		config: &oauth2.Config{
diff --git a/server/auth/github/github_test.go b/server/auth/github/github_test.go
index c0b26a4..b0c97d2 100644
--- a/server/auth/github/github_test.go
+++ b/server/auth/github/github_test.go
@@ -29,11 +29,9 @@ func TestNew(t *testing.T) {
 
 func TestNewEmptyOrganization(t *testing.T) {
 	organization = ""
-	a := assert.New(t)
-
-	_, err := newGithub()
-	a.EqualError(err, "github_opts organization and the users whitelist must not be both empty")
-
+	if _, err := newGithub(); err == nil {
+		t.Error("creating a provider without an organization set should return an error")
+	}
 	organization = "exampleorg"
 }
 
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"
 }
-- 
cgit v1.2.3