Refactored to rename "service terms" to "terms of service" (#9581)
* #124 renamed identififers from service terms to terms of service * #124 renamed identififers from service terms to terms of service * 124 renamed ServiceTerms model to TermsOfService * 124 Renamed EnableCustomServiceTerms feature flag to EnableCustomTermsOfService * 124 Renamed EnableCustomServiceTerms feature flag to EnableCustomTermsOfService * #124 fixed formatting * #124 fixed formatting * #132 renamed table ServiceTerms to TermsOfService * #124 renamed some missed files from 'service_terms' to 'terms_of_service' * #124 removed fixed TODOs * drop migrate of ServiceTerms table, since backporting * s/ServiceTerms/TermsOfService/ in tests * s/AcceptedServiceTermsId/AcceptedTermsOfServiceId/ Change the model attribute, even though the column name will eventually be removed. * s/accepted_service_terms_id/accepted_terms_of_service_id/ to match redux * s/serviceTerms/termsOfService * rename column too, and add max size constraint * s/EnableCustomServiceTerms/EnableCustomTermsOfService
Этот коммит содержится в:
коммит произвёл
Jesse Hallam
родитель
59319b7915
Коммит
bffcccf99d
53
api4/terms_of_service_test.go
Обычный файл
53
api4/terms_of_service_test.go
Обычный файл
@@ -0,0 +1,53 @@
|
||||
package api4
|
||||
|
||||
import (
|
||||
"github.com/mattermost/mattermost-server/model"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestGetTermsOfService(t *testing.T) {
|
||||
th := Setup().InitBasic()
|
||||
defer th.TearDown()
|
||||
Client := th.Client
|
||||
|
||||
_, err := th.App.CreateTermsOfService("abc", th.BasicUser.Id)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
termsOfService, resp := Client.GetTermsOfService("")
|
||||
CheckNoError(t, resp)
|
||||
|
||||
assert.NotNil(t, termsOfService)
|
||||
assert.Equal(t, "abc", termsOfService.Text)
|
||||
assert.NotEmpty(t, termsOfService.Id)
|
||||
assert.NotEmpty(t, termsOfService.CreateAt)
|
||||
}
|
||||
|
||||
func TestCreateTermsOfService(t *testing.T) {
|
||||
th := Setup().InitBasic()
|
||||
defer th.TearDown()
|
||||
Client := th.Client
|
||||
|
||||
_, resp := Client.CreateTermsOfService("terms of service new", th.BasicUser.Id)
|
||||
CheckErrorMessage(t, resp, "api.context.permissions.app_error")
|
||||
}
|
||||
|
||||
func TestCreateTermsOfServiceAdminUser(t *testing.T) {
|
||||
th := Setup().InitSystemAdmin()
|
||||
defer th.TearDown()
|
||||
Client := th.SystemAdminClient
|
||||
|
||||
termsOfService, resp := Client.CreateTermsOfService("terms of service new", th.SystemAdminUser.Id)
|
||||
CheckErrorMessage(t, resp, "api.create_terms_of_service.custom_terms_of_service_disabled.app_error")
|
||||
|
||||
th.App.SetLicense(model.NewTestLicense("EnableCustomTermsOfService"))
|
||||
|
||||
termsOfService, resp = Client.CreateTermsOfService("terms of service new_2", th.SystemAdminUser.Id)
|
||||
CheckNoError(t, resp)
|
||||
assert.NotEmpty(t, termsOfService.Id)
|
||||
assert.NotEmpty(t, termsOfService.CreateAt)
|
||||
assert.Equal(t, "terms of service new_2", termsOfService.Text)
|
||||
assert.Equal(t, th.SystemAdminUser.Id, termsOfService.UserId)
|
||||
}
|
||||
Ссылка в новой задаче
Block a user