diff options
author | Harshil Sharma <harshil.sharma@joshtechnologygroup.com> | 2018-10-10 00:55:47 +0000 |
---|---|---|
committer | Jesse Hallam <jesse.hallam@gmail.com> | 2018-10-09 20:55:47 -0400 |
commit | bffcccf99de8a8f3c68cff9e39d2847f0996b67b (patch) | |
tree | 10bf45d87927dc792a233d0653d6ba273c9a7b28 /api4/service_terms_test.go | |
parent | 59319b7915b8eb4c20a0d4878382cc0e41fc536d (diff) | |
download | chat-bffcccf99de8a8f3c68cff9e39d2847f0996b67b.tar.gz chat-bffcccf99de8a8f3c68cff9e39d2847f0996b67b.tar.bz2 chat-bffcccf99de8a8f3c68cff9e39d2847f0996b67b.zip |
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
Diffstat (limited to 'api4/service_terms_test.go')
-rw-r--r-- | api4/service_terms_test.go | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/api4/service_terms_test.go b/api4/service_terms_test.go deleted file mode 100644 index 607c104a6..000000000 --- a/api4/service_terms_test.go +++ /dev/null @@ -1,53 +0,0 @@ -package api4 - -import ( - "github.com/mattermost/mattermost-server/model" - "github.com/stretchr/testify/assert" - "testing" -) - -func TestGetServiceTerms(t *testing.T) { - th := Setup().InitBasic() - defer th.TearDown() - Client := th.Client - - _, err := th.App.CreateServiceTerms("abc", th.BasicUser.Id) - if err != nil { - t.Fatal(err) - } - - serviceTerms, resp := Client.GetServiceTerms("") - CheckNoError(t, resp) - - assert.NotNil(t, serviceTerms) - assert.Equal(t, "abc", serviceTerms.Text) - assert.NotEmpty(t, serviceTerms.Id) - assert.NotEmpty(t, serviceTerms.CreateAt) -} - -func TestCreateServiceTerms(t *testing.T) { - th := Setup().InitBasic() - defer th.TearDown() - Client := th.Client - - _, resp := Client.CreateServiceTerms("service terms new", th.BasicUser.Id) - CheckErrorMessage(t, resp, "api.context.permissions.app_error") -} - -func TestCreateServiceTermsAdminUser(t *testing.T) { - th := Setup().InitSystemAdmin() - defer th.TearDown() - Client := th.SystemAdminClient - - serviceTerms, resp := Client.CreateServiceTerms("service terms new", th.SystemAdminUser.Id) - CheckErrorMessage(t, resp, "api.create_service_terms.custom_service_terms_disabled.app_error") - - th.App.SetLicense(model.NewTestLicense("EnableCustomServiceTerms")) - - serviceTerms, resp = Client.CreateServiceTerms("service terms new_2", th.SystemAdminUser.Id) - CheckNoError(t, resp) - assert.NotEmpty(t, serviceTerms.Id) - assert.NotEmpty(t, serviceTerms.CreateAt) - assert.Equal(t, "service terms new_2", serviceTerms.Text) - assert.Equal(t, th.SystemAdminUser.Id, serviceTerms.UserId) -} |