Open platform to collect and prioritize feedback
moving tests to its own package
goenning93347e2f70b3
diff --git a/handlers/router_test.go b/handlers/router_test.goindex 06625702c..acb301539 100644--- a/handlers/router_test.go+++ b/handlers/router_test.go@@ -1,4 +1,4 @@-package handlers+package handlers_testimport ("encoding/json"@@ -6,6 +6,7 @@ import ("net/http/httptest""github.com/WeCanHearYou/wchy-api/context"+ "github.com/WeCanHearYou/wchy-api/handlers""github.com/WeCanHearYou/wchy-api/models""github.com/WeCanHearYou/wchy-api/services""github.com/jmoiron/jsonq"@@ -22,19 +23,21 @@ func makeRequest(method, url string) (int, *jsonq.JsonQuery) {BuildTime: "today",},}- router := GetMainEngine(ctx)+ router := handlers.GetMainEngine(ctx)request, _ := http.NewRequest(method, url, nil)response := httptest.NewRecorder()router.ServeHTTP(response, request)- var query *jsonq.JsonQuery- if response.Result().StatusCode == 200 {+ status := response.Result().StatusCode++ if status == 200 {var data interface{}decoder := json.NewDecoder(response.Body)decoder.Decode(&data)- query = jsonq.NewQuery(data)+ query := jsonq.NewQuery(data)+ return status, query}- return response.Result().StatusCode, query+ return status, nil}diff --git a/handlers/status_test.go b/handlers/status_test.goindex f119e52f8..1a5140da7 100644--- a/handlers/status_test.go+++ b/handlers/status_test.go@@ -1,4 +1,4 @@-package handlers+package handlers_testimport ("testing"diff --git a/handlers/tenant_test.go b/handlers/tenant_test.goindex 711bd43f3..4e2326722 100644--- a/handlers/tenant_test.go+++ b/handlers/tenant_test.go@@ -1,4 +1,4 @@-package handlers+package handlers_testimport ("testing"diff --git a/migrations/20170128_1131_rename_domain.up.sql b/migrations/20170128_1131_rename_domain.up.sqlnew file mode 100644index 000000000..b4fdf170f--- /dev/null+++ b/migrations/20170128_1131_rename_domain.up.sql@@ -0,0 +1 @@+ALTER TABLE tenants RENAME COLUMN domain TO subdomain;\ No newline at end of filediff --git a/services/health_test.go b/services/health_test.goindex c44015605..252af2ace 100644--- a/services/health_test.go+++ b/services/health_test.go@@ -1,9 +1,10 @@-package services+package services_testimport ("fmt""testing"+ "github.com/WeCanHearYou/wchy-api/services""github.com/stretchr/testify/assert"sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1")@@ -13,7 +14,7 @@ func TestIsDatabaseOnline_ShouldReturnFalseIfQueryFails(t *testing.T) {defer db.Close()mock.ExpectQuery("SELECT now()").WillReturnError(fmt.Errorf("some error"))- svc := &PostgresHealthCheckService{DB: db}+ svc := &services.PostgresHealthCheckService{DB: db}isOnline := svc.IsDatabaseOnline()assert.Equal(t, false, isOnline)@@ -29,7 +30,7 @@ func TestIsDatabaseOnline_ShouldReturnTrueIfQuerySucceed(t *testing.T) {mock.ExpectQuery("SELECT now()").WillReturnRows(sqlmock.NewRows([]string{}))- svc := &PostgresHealthCheckService{DB: db}+ svc := &services.PostgresHealthCheckService{DB: db}isOnline := svc.IsDatabaseOnline()assert.Equal(t, true, isOnline)diff --git a/services/tenant.go b/services/tenant.goindex 2aa856cbf..494ba641c 100644--- a/services/tenant.go+++ b/services/tenant.go@@ -35,7 +35,7 @@ type PostgresTenantService struct {func (svc PostgresTenantService) GetByDomain(domain string) (*models.Tenant, error) {tenant := &models.Tenant{}- row := svc.DB.QueryRow("SELECT id, name, domain FROM tenants WHERE domain = $1", domain)+ row := svc.DB.QueryRow("SELECT id, name, subdomain FROM tenants WHERE subdomain = $1", domain)err := row.Scan(&tenant.ID, &tenant.Name, &tenant.Domain)if err == sql.ErrNoRows {return nil, ErrNotFounddiff --git a/services/tenant_test.go b/services/tenant_test.goindex 1c2f254e5..ff70870ac 100644--- a/services/tenant_test.go+++ b/services/tenant_test.go@@ -1,10 +1,11 @@-package services+package services_testimport ("testing""database/sql"+ "github.com/WeCanHearYou/wchy-api/services""github.com/stretchr/testify/assert"sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1")@@ -13,9 +14,9 @@ func TestTenantByDomain_WhenDomainIsUnknown_ShouldReturnError(t *testing.T) {db, mock, _ := sqlmock.New()defer db.Close()- mock.ExpectQuery("SELECT id, name, domain FROM tenants WHERE domain = \\$1").WithArgs("mydomain").WillReturnError(sql.ErrNoRows)+ mock.ExpectQuery("SELECT id, name, subdomain FROM tenants WHERE subdomain = \\$1").WithArgs("mydomain").WillReturnError(sql.ErrNoRows)- svc := &PostgresTenantService{DB: db}+ svc := &services.PostgresTenantService{DB: db}tenant, err := svc.GetByDomain("mydomain")assert.Nil(t, tenant)@@ -26,10 +27,10 @@ func TestTenantByDomain_WhenDomainIsKnown_ShouldReturnTenantInformation(t *testidb, mock, _ := sqlmock.New()defer db.Close()- rows := sqlmock.NewRows([]string{"id", "name", "domain"}).AddRow(234, "My Domain Inc.", "mydomain")- mock.ExpectQuery("SELECT id, name, domain FROM tenants WHERE domain = \\$1").WithArgs("mydomain").WillReturnRows(rows)+ rows := sqlmock.NewRows([]string{"id", "name", "subdomain"}).AddRow(234, "My Domain Inc.", "mydomain")+ mock.ExpectQuery("SELECT id, name, subdomain FROM tenants WHERE subdomain = \\$1").WithArgs("mydomain").WillReturnRows(rows)- svc := &PostgresTenantService{DB: db}+ svc := &services.PostgresTenantService{DB: db}tenant, err := svc.GetByDomain("mydomain")assert.Equal(t, tenant.ID, 234)diff --git a/util/env_test.go b/util/env_test.goindex 139113c01..10157ab7f 100644--- a/util/env_test.go+++ b/util/env_test.go@@ -1,17 +1,18 @@-package util+package util_testimport ("testing"+ "github.com/WeCanHearYou/wchy-api/util""github.com/stretchr/testify/assert")func TestGetEnvOrDefault_ShouldReturnNullWhenKeyIsUnknown(t *testing.T) {- value := GetEnvOrDefault("UNKNOWN_KEY", "some value")+ value := util.GetEnvOrDefault("UNKNOWN_KEY", "some value")assert.Equal(t, "some value", value)}func TestGetEnvOrDefault_ShouldReturnEnvironmentValue(t *testing.T) {- value := GetEnvOrDefault("PATH", "default path")+ value := util.GetEnvOrDefault("PATH", "default path")assert.NotEqual(t, "default path", value)}