From bffcccf99de8a8f3c68cff9e39d2847f0996b67b Mon Sep 17 00:00:00 2001 From: Harshil Sharma Date: Wed, 10 Oct 2018 00:55:47 +0000 Subject: 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 --- store/storetest/mocks/LayeredStoreDatabaseLayer.go | 32 +++++------ store/storetest/mocks/ServiceTermsStore.go | 62 ---------------------- store/storetest/mocks/SqlStore.go | 32 +++++------ store/storetest/mocks/Store.go | 32 +++++------ store/storetest/mocks/TermsOfServiceStore.go | 62 ++++++++++++++++++++++ 5 files changed, 110 insertions(+), 110 deletions(-) delete mode 100644 store/storetest/mocks/ServiceTermsStore.go create mode 100644 store/storetest/mocks/TermsOfServiceStore.go (limited to 'store/storetest/mocks') diff --git a/store/storetest/mocks/LayeredStoreDatabaseLayer.go b/store/storetest/mocks/LayeredStoreDatabaseLayer.go index 7f653fc2f..3b06bbdf5 100644 --- a/store/storetest/mocks/LayeredStoreDatabaseLayer.go +++ b/store/storetest/mocks/LayeredStoreDatabaseLayer.go @@ -729,22 +729,6 @@ func (_m *LayeredStoreDatabaseLayer) SchemeSave(ctx context.Context, scheme *mod return r0 } -// ServiceTerms provides a mock function with given fields: -func (_m *LayeredStoreDatabaseLayer) ServiceTerms() store.ServiceTermsStore { - ret := _m.Called() - - var r0 store.ServiceTermsStore - if rf, ok := ret.Get(0).(func() store.ServiceTermsStore); ok { - r0 = rf() - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(store.ServiceTermsStore) - } - } - - return r0 -} - // Session provides a mock function with given fields: func (_m *LayeredStoreDatabaseLayer) Session() store.SessionStore { ret := _m.Called() @@ -814,6 +798,22 @@ func (_m *LayeredStoreDatabaseLayer) Team() store.TeamStore { return r0 } +// TermsOfService provides a mock function with given fields: +func (_m *LayeredStoreDatabaseLayer) TermsOfService() store.TermsOfServiceStore { + ret := _m.Called() + + var r0 store.TermsOfServiceStore + if rf, ok := ret.Get(0).(func() store.TermsOfServiceStore); ok { + r0 = rf() + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(store.TermsOfServiceStore) + } + } + + return r0 +} + // Token provides a mock function with given fields: func (_m *LayeredStoreDatabaseLayer) Token() store.TokenStore { ret := _m.Called() diff --git a/store/storetest/mocks/ServiceTermsStore.go b/store/storetest/mocks/ServiceTermsStore.go deleted file mode 100644 index 9115e6093..000000000 --- a/store/storetest/mocks/ServiceTermsStore.go +++ /dev/null @@ -1,62 +0,0 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. - -// Regenerate this file using `make store-mocks`. - -package mocks - -import mock "github.com/stretchr/testify/mock" -import model "github.com/mattermost/mattermost-server/model" -import store "github.com/mattermost/mattermost-server/store" - -// ServiceTermsStore is an autogenerated mock type for the ServiceTermsStore type -type ServiceTermsStore struct { - mock.Mock -} - -// Get provides a mock function with given fields: id, allowFromCache -func (_m *ServiceTermsStore) Get(id string, allowFromCache bool) store.StoreChannel { - ret := _m.Called(id, allowFromCache) - - var r0 store.StoreChannel - if rf, ok := ret.Get(0).(func(string, bool) store.StoreChannel); ok { - r0 = rf(id, allowFromCache) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(store.StoreChannel) - } - } - - return r0 -} - -// GetLatest provides a mock function with given fields: allowFromCache -func (_m *ServiceTermsStore) GetLatest(allowFromCache bool) store.StoreChannel { - ret := _m.Called(allowFromCache) - - var r0 store.StoreChannel - if rf, ok := ret.Get(0).(func(bool) store.StoreChannel); ok { - r0 = rf(allowFromCache) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(store.StoreChannel) - } - } - - return r0 -} - -// Save provides a mock function with given fields: serviceTerms -func (_m *ServiceTermsStore) Save(serviceTerms *model.ServiceTerms) store.StoreChannel { - ret := _m.Called(serviceTerms) - - var r0 store.StoreChannel - if rf, ok := ret.Get(0).(func(*model.ServiceTerms) store.StoreChannel); ok { - r0 = rf(serviceTerms) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(store.StoreChannel) - } - } - - return r0 -} diff --git a/store/storetest/mocks/SqlStore.go b/store/storetest/mocks/SqlStore.go index c2852f3a1..278ca1a61 100644 --- a/store/storetest/mocks/SqlStore.go +++ b/store/storetest/mocks/SqlStore.go @@ -603,22 +603,6 @@ func (_m *SqlStore) Scheme() store.SchemeStore { return r0 } -// ServiceTerms provides a mock function with given fields: -func (_m *SqlStore) ServiceTerms() store.ServiceTermsStore { - ret := _m.Called() - - var r0 store.ServiceTermsStore - if rf, ok := ret.Get(0).(func() store.ServiceTermsStore); ok { - r0 = rf() - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(store.ServiceTermsStore) - } - } - - return r0 -} - // Session provides a mock function with given fields: func (_m *SqlStore) Session() store.SessionStore { ret := _m.Called() @@ -683,6 +667,22 @@ func (_m *SqlStore) Team() store.TeamStore { return r0 } +// TermsOfService provides a mock function with given fields: +func (_m *SqlStore) TermsOfService() store.TermsOfServiceStore { + ret := _m.Called() + + var r0 store.TermsOfServiceStore + if rf, ok := ret.Get(0).(func() store.TermsOfServiceStore); ok { + r0 = rf() + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(store.TermsOfServiceStore) + } + } + + return r0 +} + // Token provides a mock function with given fields: func (_m *SqlStore) Token() store.TokenStore { ret := _m.Called() diff --git a/store/storetest/mocks/Store.go b/store/storetest/mocks/Store.go index 8f15650e8..b55df2097 100644 --- a/store/storetest/mocks/Store.go +++ b/store/storetest/mocks/Store.go @@ -320,22 +320,6 @@ func (_m *Store) Scheme() store.SchemeStore { return r0 } -// ServiceTerms provides a mock function with given fields: -func (_m *Store) ServiceTerms() store.ServiceTermsStore { - ret := _m.Called() - - var r0 store.ServiceTermsStore - if rf, ok := ret.Get(0).(func() store.ServiceTermsStore); ok { - r0 = rf() - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(store.ServiceTermsStore) - } - } - - return r0 -} - // Session provides a mock function with given fields: func (_m *Store) Session() store.SessionStore { ret := _m.Called() @@ -400,6 +384,22 @@ func (_m *Store) Team() store.TeamStore { return r0 } +// TermsOfService provides a mock function with given fields: +func (_m *Store) TermsOfService() store.TermsOfServiceStore { + ret := _m.Called() + + var r0 store.TermsOfServiceStore + if rf, ok := ret.Get(0).(func() store.TermsOfServiceStore); ok { + r0 = rf() + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(store.TermsOfServiceStore) + } + } + + return r0 +} + // Token provides a mock function with given fields: func (_m *Store) Token() store.TokenStore { ret := _m.Called() diff --git a/store/storetest/mocks/TermsOfServiceStore.go b/store/storetest/mocks/TermsOfServiceStore.go new file mode 100644 index 000000000..54dcee1fc --- /dev/null +++ b/store/storetest/mocks/TermsOfServiceStore.go @@ -0,0 +1,62 @@ +// Code generated by mockery v1.0.0. DO NOT EDIT. + +// Regenerate this file using `make store-mocks`. + +package mocks + +import mock "github.com/stretchr/testify/mock" +import model "github.com/mattermost/mattermost-server/model" +import store "github.com/mattermost/mattermost-server/store" + +// TermsOfServiceStore is an autogenerated mock type for the TermsOfServiceStore type +type TermsOfServiceStore struct { + mock.Mock +} + +// Get provides a mock function with given fields: id, allowFromCache +func (_m *TermsOfServiceStore) Get(id string, allowFromCache bool) store.StoreChannel { + ret := _m.Called(id, allowFromCache) + + var r0 store.StoreChannel + if rf, ok := ret.Get(0).(func(string, bool) store.StoreChannel); ok { + r0 = rf(id, allowFromCache) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(store.StoreChannel) + } + } + + return r0 +} + +// GetLatest provides a mock function with given fields: allowFromCache +func (_m *TermsOfServiceStore) GetLatest(allowFromCache bool) store.StoreChannel { + ret := _m.Called(allowFromCache) + + var r0 store.StoreChannel + if rf, ok := ret.Get(0).(func(bool) store.StoreChannel); ok { + r0 = rf(allowFromCache) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(store.StoreChannel) + } + } + + return r0 +} + +// Save provides a mock function with given fields: termsOfService +func (_m *TermsOfServiceStore) Save(termsOfService *model.TermsOfService) store.StoreChannel { + ret := _m.Called(termsOfService) + + var r0 store.StoreChannel + if rf, ok := ret.Get(0).(func(*model.TermsOfService) store.StoreChannel); ok { + r0 = rf(termsOfService) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(store.StoreChannel) + } + } + + return r0 +} -- cgit v1.2.3-1-g7c22