addtional testing

.travis.yml

@@ -10,7 +10,7 @@ go_import_path: github.com/hunterlong/statup
 
 cache:
   directories:
-  - $GOPATH/pkg/dep
+    - $GOPATH/pkg/dep
 
 sudo: required
 
@@ -48,7 +48,6 @@ before_install:
 
 install:
   - make dev-deps
-  - make dep
   - make install
 
 before_script:
@@ -61,4 +60,3 @@ script:
 
 after_success:
   - if [[ "$TRAVIS_BRANCH" == "master" ]]; then make travis-build; fi
-  - if [[ "$TRAVIS_BRANCH" == "master" ]]; then make publish-dev; fi

cmd/main_test.go

@@ -312,8 +312,9 @@ func RunUser_NonUniqueCreate(t *testing.T) {
 		Password: "admin",
 		Email:    "info@testuser.com",
 	}
-	_, err := core.CreateUser(user)
-	assert.NotNil(t, err)
+	admin, err := core.CreateUser(user)
+	assert.Error(t, err)
+	assert.Nil(t, admin)
 }
 
 func RunUser_Delete(t *testing.T) {
@@ -396,9 +397,12 @@ func RunBadService_Create(t *testing.T) {
 }
 
 func RunBadService_Check(t *testing.T) {
-	service := core.SelectService(4)
+	service := core.SelectService(7)
 	assert.NotNil(t, service)
-	assert.Equal(t, "JSON API Tester", service.Name)
+	assert.Equal(t, "Bad Service", service.Name)
+	for i := 0; i <= 10; i++ {
+		core.ServiceHTTPCheck(service, true)
+	}
 	assert.True(t, service.IsRunning())
 }
 
@@ -418,7 +422,8 @@ func RunCreateService_Hits(t *testing.T) {
 	services, err := core.SelectAllServices()
 	assert.Nil(t, err)
 	assert.NotNil(t, services)
-	for i := 0; i <= 10; i++ {
+	assert.Equal(t, 6, len(services))
+	for i := 0; i <= 15; i++ {
 		for _, s := range services {
 			var service *core.Service
 			if s.Type == "http" {
@@ -440,9 +445,9 @@ func RunService_Hits(t *testing.T) {
 }
 
 func RunService_Failures(t *testing.T) {
-	t.SkipNow()
-	service := core.SelectService(6)
+	service := core.SelectService(7)
 	assert.NotNil(t, service)
+	assert.Equal(t, "Bad Service", service.Name)
 	assert.NotEmpty(t, service.Failures)
 }
 

core/users.go

@@ -61,6 +61,9 @@ func CreateUser(u *types.User) (int64, error) {
 	u.ApiSecret = utils.NewSHA1Hash(10)
 	col := DbSession.Collection("users")
 	uuid, err := col.Insert(u)
+	if err != nil {
+		return 0, err
+	}
 	if uuid == nil {
 		utils.Log(3, fmt.Sprintf("Failed to create user %v. %v", u.Username, err))
 		return 0, err

handlers/handlers_test.go

@@ -368,7 +368,6 @@ func TestViewTCPServicesHandler(t *testing.T) {
 }
 
 func TestServicesDeleteFailuresHandler(t *testing.T) {
-	t.SkipNow()
 	req, err := http.NewRequest("GET", "/service/7/delete_failures", nil)
 	assert.Nil(t, err)
 	rr := httptest.NewRecorder()
@@ -377,6 +376,15 @@ func TestServicesDeleteFailuresHandler(t *testing.T) {
 	assert.True(t, IsRouteAuthenticated(req))
 }
 
+func TestFailingServicesDeleteFailuresHandler(t *testing.T) {
+	req, err := http.NewRequest("GET", "/service/1/delete_failures", nil)
+	assert.Nil(t, err)
+	rr := httptest.NewRecorder()
+	Router().ServeHTTP(rr, req)
+	assert.Equal(t, 200, rr.Code)
+	assert.True(t, IsRouteAuthenticated(req))
+}
+
 func TestServicesUpdateHandler(t *testing.T) {
 	form := url.Values{}
 	form.Add("name", "The Bravery - An Honest Mistake")

source/sql/mysql_up.sql

@@ -13,7 +13,7 @@ CREATE TABLE core (
 );
 CREATE TABLE users (
     id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-    username VARCHAR(50),
+    username VARCHAR(50) NOT NULL UNIQUE,
     password text,
     email VARCHAR (50),
     api_key VARCHAR(50),

source/sql/sqlite_up.sql

@@ -14,7 +14,7 @@ CREATE TABLE core (
 
 CREATE TABLE users (
     id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    username text,
+    username text NOT NULL UNIQUE,
     password text,
     email text,
     api_key text,