diff --git a/app/services/setting_test.go b/app/services/setting_test.go index 495fbe46..5e5e4a64 100644 --- a/app/services/setting_test.go +++ b/app/services/setting_test.go @@ -25,12 +25,12 @@ func (s *SettingTestSuite) SetupTest() { func (s *SettingTestSuite) TestGet() { mockOrm, mockDb, _, _ := mock.Orm() - mockOrm.On("Query").Return(mockDb).Twice() - mockDb.On("Where", "key", "test").Return(mockDb).Twice() - mockDb.On("FirstOrFail", &models.Setting{}).Return(nil).Once() + mockOrm.On("Query").Return(mockDb) + mockDb.On("Where", "key", "test").Return(mockDb) + mockDb.On("FirstOrFail", &models.Setting{}).Return(nil) a := s.setting.Get("test") s.Equal("", a) - mockDb.On("FirstOrFail", &models.Setting{}).Return(nil).Once() + mockDb.On("FirstOrFail", &models.Setting{}).Return(nil) b := s.setting.Get("test", "test") s.Equal("test", b) mockOrm.AssertExpectations(s.T()) @@ -40,8 +40,8 @@ func (s *SettingTestSuite) TestGet() { func (s *SettingTestSuite) TestSet() { mockOrm, mockDb, _, _ := mock.Orm() mockOrm.On("Query").Return(mockDb) - mockDb.On("Where", "key", "test").Return(mockDb).Once() - mockDb.On("UpdateOrCreate", &models.Setting{}, models.Setting{Key: "test"}, models.Setting{Value: "test"}).Return(nil).Once() + mockDb.On("Where", "key", "test").Return(mockDb) + mockDb.On("UpdateOrCreate", &models.Setting{}, models.Setting{Key: "test"}, models.Setting{Value: "test"}).Return(nil) err := s.setting.Set("test", "test") s.Nil(err) mockOrm.AssertExpectations(s.T()) diff --git a/app/services/user_test.go b/app/services/user_test.go index e9bdb08d..bc08c14a 100644 --- a/app/services/user_test.go +++ b/app/services/user_test.go @@ -31,7 +31,7 @@ func (s *UserTestSuite) TestCreate() { mockDb.On("Create", &models.User{ Username: "haozi", Password: "123456", - }).Return(nil).Once() + }).Return(nil) user, err := s.user.Create("haozi", "123456") s.Nil(err) s.Equal("haozi", user.Username)