diff options
| author | Chris <ccbrown112@gmail.com> | 2018-02-09 10:04:48 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-09 10:04:48 -0600 |
| commit | a6309aaf48e216fe5f6779188071d4b621b643b6 (patch) | |
| tree | 9abbac7f172822e2286c755725fe3533cde8de8a /app/session_test.go | |
| parent | 7e8106b95c11a4187f8c00256f3067433d20b24e (diff) | |
| download | chat-a6309aaf48e216fe5f6779188071d4b621b643b6.tar.gz chat-a6309aaf48e216fe5f6779188071d4b621b643b6.tar.bz2 chat-a6309aaf48e216fe5f6779188071d4b621b643b6.zip | |
Remove license globals entirely (#8229)
* remove license globals entirely
* fix infinite recursion
* test fix
Diffstat (limited to 'app/session_test.go')
| -rw-r--r-- | app/session_test.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/app/session_test.go b/app/session_test.go index 09d81f4ac..bf8198a4e 100644 --- a/app/session_test.go +++ b/app/session_test.go @@ -6,11 +6,10 @@ package app import ( "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/mattermost/mattermost-server/model" ) func TestCache(t *testing.T) { @@ -111,7 +110,7 @@ func TestGetSessionIdleTimeoutInMinutes(t *testing.T) { assert.Nil(t, err) // Test regular session with license off, should not timeout - *utils.License().Features.Compliance = false + th.App.SetLicense(nil) session = &model.Session{ UserId: model.NewId(), @@ -125,7 +124,7 @@ func TestGetSessionIdleTimeoutInMinutes(t *testing.T) { _, err = th.App.GetSession(session.Token) assert.Nil(t, err) - *utils.License().Features.Compliance = true + th.App.SetLicense(model.NewTestLicense("compliance")) // Test regular session with timeout set to 0, should not timeout th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.SessionIdleTimeoutInMinutes = 0 }) |