Merge branch 'master' into post-metadata

api4/user_test.go

@@ -3087,10 +3087,34 @@ func TestRegisterTermsOfServiceAction(t *testing.T) {
 	CheckNoError(t, resp)
 
 	assert.True(t, *success)
-	user, err := th.App.GetUser(th.BasicUser.Id)
+	_, err = th.App.GetUser(th.BasicUser.Id)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+
+func TestGetUserTermsOfService(t *testing.T) {
+	th := Setup().InitBasic()
+	defer th.TearDown()
+	Client := th.Client
+
+	_, resp := Client.GetUserTermsOfService(th.BasicUser.Id, "")
+	CheckErrorMessage(t, resp, "store.sql_user_terms_of_service.get_by_user.no_rows.app_error")
+
+	termsOfService, err := th.App.CreateTermsOfService("terms of service", th.BasicUser.Id)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	assert.Equal(t, user.AcceptedTermsOfServiceId, termsOfService.Id)
+	success, resp := Client.RegisteTermsOfServiceAction(th.BasicUser.Id, termsOfService.Id, true)
+	CheckNoError(t, resp)
+	assert.True(t, *success)
+
+	userTermsOfService, resp := Client.GetUserTermsOfService(th.BasicUser.Id, "")
+	CheckNoError(t, resp)
+
+	assert.Equal(t, th.BasicUser.Id, userTermsOfService.UserId)
+	assert.Equal(t, termsOfService.Id, userTermsOfService.TermsOfServiceId)
+	assert.NotEmpty(t, userTermsOfService.CreateAt)
 }