From 85b621bf4e4ff4988721860fbfeee75d4ba5832c Mon Sep 17 00:00:00 2001
From: Ian Tan <ian.tan@techinasia.com>
Date: Thu, 16 Nov 2017 18:54:14 +0800
Subject: [PATCH] Use same helper and mockDb

---
 gorm_expect_test.go | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/gorm_expect_test.go b/gorm_expect_test.go
index 9e726c50..3d4d37b2 100644
--- a/gorm_expect_test.go
+++ b/gorm_expect_test.go
@@ -6,21 +6,21 @@ import (
 	"github.com/iantanwx/gorm"
 )
 
+var helper *gorm.TestHelper
+var mockDb *gorm.DB
+
 func TestOpenWithSqlmock(t *testing.T) {
-	err, _, _ := gorm.NewTestHelper(&gorm.SqlmockAdapter{})
+	err, db, h := gorm.NewTestHelper(&gorm.SqlmockAdapter{})
 
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
+
+	helper = h
+	mockDb = db
 }
 
 func TestQuery(t *testing.T) {
-	err, db, helper := gorm.NewTestHelper(&gorm.SqlmockAdapter{})
-
-	if err != nil {
-		t.Fatal(err.Error())
-	}
-
 	helper.ExpectFirst(&User{}).Return(&User{})
-	db.First(&User{})
+	mockDb.First(&User{})
 }