From af275fe9242303581192258ef4f6457fa45a58e4 Mon Sep 17 00:00:00 2001 From: Harshil Sharma Date: Wed, 26 Sep 2018 20:49:22 +0000 Subject: #MM-12130 changes for custom service terms (#9450) * #MM-12130 changes for custom service terms * Fixed styling * Added getServiceTerms API * removed unnecessary panic * removed custom service terms text from flat config * reverted user sql store as those changes are no longer needed * added tests * Updated a config key to be more standard * Added copyright info * Loading service terms only if the feature is enabled * Loading service terms only if the feature is enabled * removed unused index * added createservice termns API * made a param to bool instead of string * added createservice termns API * review fixes * fixed styling * Minor refactoring * removed saveConfig and loadConfig magic * added empty service terms text check to createServiceTerms API * refactoed some urls to be terms_of_service instead of service_terms * removed check for support settings * changed URLs in tests * removed unused code * fixed a bug * added service termd id in conif * fixed a test * review fixes * minor fixes * Fixed TestCreateServiceTerms --- api4/service_terms_test.go | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 api4/service_terms_test.go (limited to 'api4/service_terms_test.go') diff --git a/api4/service_terms_test.go b/api4/service_terms_test.go new file mode 100644 index 000000000..693388376 --- /dev/null +++ b/api4/service_terms_test.go @@ -0,0 +1,44 @@ +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 + + serviceTerms, resp := Client.CreateServiceTerms("service terms new", th.BasicUser.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", th.BasicUser.Id) + CheckNoError(t, resp) + assert.NotEmpty(t, serviceTerms.Id) + assert.NotEmpty(t, serviceTerms.CreateAt) + assert.Equal(t, "service terms new", serviceTerms.Text) + assert.Equal(t, th.BasicUser.Id, serviceTerms.UserId) +} -- cgit v1.2.3-1-g7c22