Added more tests

Author: Aristat

README.md

@@ -272,5 +272,6 @@ Usage only `gin` package and oauth2 client/server mechanic
 
 # Testing
 ```
+export APP_WD=go_path to app/rsources or app/artifacts - needed for load templates
 ➜  make test
 ```

app/entrypoint/entrypoint.go

@@ -5,19 +5,17 @@ import (
 	"os"
 	"sync"
 
-	"github.com/pkg/errors"
 	"github.com/spf13/viper"
 )
 
 var (
-	vi                    *viper.Viper
-	mu                    sync.Mutex
-	reloadCh              = make(chan struct{})
-	shutdownCtx           context.Context
-	cancelFn              context.CancelFunc
-	errAlreadyInitialized = errors.New("entrypoint already initialized")
-	ep                    *EntryPoint
-	wd                    string
+	vi          *viper.Viper
+	mu          sync.Mutex
+	reloadCh    = make(chan struct{})
+	shutdownCtx context.Context
+	cancelFn    context.CancelFunc
+	ep          *EntryPoint
+	wd          string
 )
 
 const prefix = "app.entrypoint"
@@ -42,7 +40,7 @@ func Initialize(workDir string, v *viper.Viper) (*EntryPoint, error) {
 	mu.Lock()
 	defer mu.Unlock()
 	if ep != nil {
-		return nil, errors.WithMessage(errAlreadyInitialized, prefix)
+		return ep, nil
 	}
 	if len(workDir) > 0 {
 		wd = workDir

app/entrypoint/provider.go

@@ -2,6 +2,8 @@ package entrypoint
 
 import (
 	"context"
+	"os"
+	"path/filepath"
 
 	"github.com/google/wire"
 )
@@ -14,8 +16,12 @@ func ContextProvider() (context.Context, func(), error) {
 
 // ContextProviderTest
 func ContextProviderTest() (context.Context, func(), error) {
+	// initializing
+	wd, _ := filepath.Abs(os.Getenv("APP_WD"))
+	_, err := Initialize(wd, nil)
+
 	c := context.Background()
-	return c, func() {}, nil
+	return c, func() {}, err
 }
 
 var (

app/http/http.go

@@ -10,7 +10,6 @@ import (
 	"github.com/go-session/session"
 
 	"github.com/aristat/golang-example-app/app/logger"
-	oauth_router "github.com/aristat/golang-example-app/app/routers/oauth-router"
 )
 
 const prefix = "app.http"
@@ -25,7 +24,6 @@ type Config struct {
 type Http struct {
 	ctx     context.Context
 	cfg     Config
-	oauth   *oauth_router.Manager
 	session *session.Manager
 	log     logger.Logger
 	mux     *chi.Mux
@@ -66,7 +64,6 @@ func New(ctx context.Context, mux *chi.Mux, log logger.Logger, cfg Config, manag
 	return &Http{
 		ctx:     ctx,
 		cfg:     cfg,
-		oauth:   managers.oauth,
 		session: managers.session,
 		mux:     mux,
 		log:     log.WithFields(logger.Fields{"service": prefix}),

app/routers/users-router/router.go

@@ -65,11 +65,13 @@ func (service *Router) PostLogin(w http.ResponseWriter, r *http.Request) {
 
 	currentUser, err := service.repo.Users.FindByEmail(email)
 	if err != nil {
+		w.WriteHeader(http.StatusNotFound)
 		service.template.ExecuteTemplate(w, "users/login", H{"errors": []string{userNotFound.Error()}})
 		return
 	}
 
 	if common.CheckPasswordHash(password, currentUser.EncryptedPassword) == false {
+		w.WriteHeader(http.StatusNotFound)
 		service.template.ExecuteTemplate(w, "users/login", H{"errors": []string{userNotFound.Error()}})
 		return
 	}
@@ -84,7 +86,7 @@ func (service *Router) PostLogin(w http.ResponseWriter, r *http.Request) {
 	}
 
 	w.Header().Set("Location", "/login")
-	w.WriteHeader(http.StatusFound)
+	w.WriteHeader(http.StatusNotFound)
 }
 
 func (service *Router) Auth(w http.ResponseWriter, r *http.Request) {

app/routers/users-router/router_test.go

@@ -0,0 +1,69 @@
+package users_router
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"strings"
+	"testing"
+
+	"golang.org/x/crypto/bcrypt"
+
+	mocket "github.com/selvatico/go-mocket"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestGetLogin(t *testing.T) {
+	provider, _, _ := BuildTest()
+	rec := httptest.NewRecorder()
+	req, _ := http.NewRequest(http.MethodGet, "/login", nil)
+	provider.Router.GetLogin(rec, req)
+
+	assert.Equal(t, http.StatusOK, rec.Code)
+}
+
+func TestPostLogin(t *testing.T) {
+	mocket.Catcher.Logging = true
+
+	tests := []struct {
+		name         string
+		urlValues    url.Values
+		mock         func()
+		expectedCode int
+	}{
+		{
+			name:      "successful logged",
+			urlValues: url.Values{"email": {"test_email"}, "password": {"test_password"}},
+			mock: func() {
+				ePassword, e := bcrypt.GenerateFromPassword([]byte("test_password"), 8)
+				assert.Nil(t, e, "Password is correct")
+				reply := []map[string]interface{}{{"id": 1, "email": "test_email", "encrypted_password": ePassword}}
+				mocket.Catcher.Reset().NewMock().WithQuery(`WHERE (users.email = $1) LIMIT 1`).WithArgs("test_email").WithReply(reply)
+			},
+			expectedCode: http.StatusFound,
+		},
+		{
+			name:         "user does not exist",
+			urlValues:    url.Values{"email": {"test_email"}, "password": {"test_password"}},
+			mock:         func() {},
+			expectedCode: http.StatusNotFound,
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			mocket.Catcher.Reset()
+			test.mock()
+
+			provider, _, e := BuildTest()
+			assert.Nil(t, e, "err should be nil")
+
+			rec := httptest.NewRecorder()
+			req, _ := http.NewRequest(http.MethodPost, "/login", strings.NewReader(test.urlValues.Encode()))
+			req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+			provider.Router.PostLogin(rec, req)
+
+			assert.Equal(t, test.expectedCode, rec.Code)
+		})
+	}
+}