Fix lint issues

gobuffalo · Aug 22, 2018 · e208a07 · e208a07
1 parent 8c3a430
commit e208a07
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 36 deletions.
diff --git a/benchmarks_test.go b/benchmarks_test.go
@@ -90,7 +90,7 @@ func translateOne(sql string) string {
 			for _, char := range str {
 				out = append(out, byte(char))
 			}
-			curr += 1
+			curr++
 		} else {
 			out = append(out, sql[i])
 		}

diff --git a/finders_test.go b/finders_test.go
@@ -615,87 +615,87 @@ func Test_Count_Disregards_Pagination(t *testing.T) {
 			r.NoError(err)
 		}
 
-		first_users := Users{}
-		second_users := Users{}
+		firstUsers := Users{}
+		secondUsers := Users{}
 
 		q := tx.Paginate(1, 3)
-		q.All(&first_users)
+		q.All(&firstUsers)
 		r.Equal(len(names), q.Paginator.TotalEntriesSize) //ensure paginator populates count
-		r.Equal(3, len(first_users))
+		r.Equal(3, len(firstUsers))
 
-		first_users = Users{}
+		firstUsers = Users{}
 		q = tx.RawQuery("select * from users").Paginate(1, 3)
-		q.All(&first_users)
+		q.All(&firstUsers)
 		r.Equal(1, q.Paginator.Page)
 		r.Equal(3, q.Paginator.PerPage)
 		r.Equal(len(names), q.Paginator.TotalEntriesSize) //ensure paginator populates count
 
-		r.Equal(3, len(first_users))
+		r.Equal(3, len(firstUsers))
 		totalFirstPage := q.Paginator.TotalPages
 
 		q = tx.Paginate(2, 3)
-		q.All(&second_users)
+		q.All(&secondUsers)
 
-		r.Equal(3, len(second_users))
+		r.Equal(3, len(secondUsers))
 		totalSecondPage := q.Paginator.TotalPages
 
 		r.NotEqual(0, totalFirstPage)
 		r.NotEqual(0, totalSecondPage)
 		r.Equal(totalFirstPage, totalSecondPage)
 
-		first_users = Users{}
+		firstUsers = Users{}
 		q = tx.RawQuery("select * from users limit  2").Paginate(1, 5)
-		err := q.All(&first_users)
+		err := q.All(&firstUsers)
 		r.NoError(err)
-		r.Equal(2, len(first_users)) //raw query limit applies
+		r.Equal(2, len(firstUsers)) //raw query limit applies
 
-		first_users = Users{}
+		firstUsers = Users{}
 		q = tx.RawQuery("select * from users limit 2 offset 1").Paginate(1, 5)
-		err = q.All(&first_users)
+		err = q.All(&firstUsers)
 		r.NoError(err)
-		r.Equal(2, len(first_users))
+		r.Equal(2, len(firstUsers))
 
-		first_users = Users{}
+		firstUsers = Users{}
 		q = tx.RawQuery("select * from users limit 2 offset\t1").Paginate(1, 5)
-		err = q.All(&first_users)
+		err = q.All(&firstUsers)
 		r.NoError(err)
-		r.Equal(2, len(first_users))
+		r.Equal(2, len(firstUsers))
 
-		first_users = Users{}
+		firstUsers = Users{}
 		q = tx.RawQuery(`select * from users limit 2 offset
 			1`).Paginate(1, 5)
-		err = q.All(&first_users)
+		err = q.All(&firstUsers)
 		r.NoError(err)
-		r.Equal(2, len(first_users))
+		r.Equal(2, len(firstUsers))
 
-		first_users = Users{}
+		firstUsers = Users{}
 		q = tx.RawQuery(`select * from users limit 2 offset
 			1
 			`).Paginate(1, 5) //ending space and tab
-		err = q.All(&first_users)
+		err = q.All(&firstUsers)
 		r.NoError(err)
-		r.Equal(2, len(first_users))
+		r.Equal(2, len(firstUsers))
 
 		if tx.Dialect.Name() == "sqlite" {
-			first_users = Users{}
+			firstUsers = Users{}
 			q = tx.RawQuery("select * from users limit 2,1").Paginate(1, 5)
-			err = q.All(&first_users)
+			err = q.All(&firstUsers)
 			r.NoError(err)
-			r.Equal(2, len(first_users))
+			r.Equal(2, len(firstUsers))
 
-			first_users = Users{}
+			firstUsers = Users{}
 			q = tx.RawQuery("select * from users limit 2 , 1").Paginate(1, 5)
-			err = q.All(&first_users)
+			err = q.All(&firstUsers)
 			r.NoError(err)
-			r.Equal(2, len(first_users))
+			r.Equal(2, len(firstUsers))
 		}
 
 		if tx.Dialect.Name() == "postgresql" {
-			first_users = Users{}
+			firstUsers = Users{}
 			q = tx.RawQuery("select * from users FETCH FIRST 3 rows only").Paginate(1, 5)
-			err = q.All(&first_users)
+			err = q.All(&firstUsers)
 			r.NoError(err)
-			r.Equal(3, len(first_users)) //should fetch only 3
+			r.Equal(3, len(firstUsers)) //should fetch only 3
 		}
 	})
 }

diff --git a/model_test.go b/model_test.go
@@ -65,7 +65,7 @@ type UnixTimestamp struct {
 func Test_Touch_Time_Timestamp(t *testing.T) {
 	r := require.New(t)
 
-	m := Model{Value: TimeTimestamp{}}
+	m := Model{Value: &TimeTimestamp{}}
 	m.touchCreatedAt()
 	m.touchUpdatedAt()
 	v := m.Value.(TimeTimestamp)
@@ -76,7 +76,7 @@ func Test_Touch_Time_Timestamp(t *testing.T) {
 func Test_Touch_Unix_Timestamp(t *testing.T) {
 	r := require.New(t)
 
-	m := Model{Value: UnixTimestamp{}}
+	m := Model{Value: &UnixTimestamp{}}
 	m.touchCreatedAt()
 	m.touchUpdatedAt()
 	v := m.Value.(UnixTimestamp)