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 /app/user_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 'app/user_test.go')
-rw-r--r-- | app/user_test.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/user_test.go b/app/user_test.go index 465d2a994..7cd369749 100644 --- a/app/user_test.go +++ b/app/user_test.go @@ -545,7 +545,7 @@ func TestPermanentDeleteUser(t *testing.T) { } } -func TestRecordUserServiceTermsAction(t *testing.T) { +func TestRecordUserTermsOfServiceAction(t *testing.T) { th := Setup().InitBasic() defer th.TearDown() @@ -563,24 +563,24 @@ func TestRecordUserServiceTermsAction(t *testing.T) { defer th.App.PermanentDeleteUser(user) - serviceTerms, err := th.App.CreateServiceTerms("text", user.Id) + termsOfService, err := th.App.CreateTermsOfService("text", user.Id) if err != nil { - t.Fatalf("failed to create service terms: %v", err) + t.Fatalf("failed to create terms of service: %v", err) } - err = th.App.RecordUserServiceTermsAction(user.Id, serviceTerms.Id, true) + err = th.App.RecordUserTermsOfServiceAction(user.Id, termsOfService.Id, true) if err != nil { t.Fatalf("failed to record user action: %v", err) } nuser, err := th.App.GetUser(user.Id) - assert.Equal(t, serviceTerms.Id, nuser.AcceptedServiceTermsId) + assert.Equal(t, termsOfService.Id, nuser.AcceptedTermsOfServiceId) - err = th.App.RecordUserServiceTermsAction(user.Id, serviceTerms.Id, false) + err = th.App.RecordUserTermsOfServiceAction(user.Id, termsOfService.Id, false) if err != nil { t.Fatalf("failed to record user action: %v", err) } nuser, err = th.App.GetUser(user.Id) - assert.Empty(t, nuser.AcceptedServiceTermsId) + assert.Empty(t, nuser.AcceptedTermsOfServiceId) } |