diff options
Diffstat (limited to 'api')
| -rw-r--r-- | api/admin.go | 2 | ||||
| -rw-r--r-- | api/apitestlib.go | 9 | ||||
| -rw-r--r-- | api/status_test.go | 1 | ||||
| -rw-r--r-- | api/user.go | 2 |
4 files changed, 2 insertions, 12 deletions
diff --git a/api/admin.go b/api/admin.go index ff5971734..1e343fdfa 100644 --- a/api/admin.go +++ b/api/admin.go @@ -400,7 +400,7 @@ func removeCertificate(c *Context, w http.ResponseWriter, r *http.Request) { } func samlCertificateStatus(c *Context, w http.ResponseWriter, r *http.Request) { - status := app.GetSamlCertificateStatus() + status := c.App.GetSamlCertificateStatus() statusMap := map[string]interface{}{} statusMap["IdpCertificateFile"] = status.IdpCertificateFile diff --git a/api/apitestlib.go b/api/apitestlib.go index 17e2a6623..266ca95fc 100644 --- a/api/apitestlib.go +++ b/api/apitestlib.go @@ -114,15 +114,6 @@ func Setup() *TestHelper { return setupTestHelper(false) } -func ReloadConfigForSetup() { - utils.LoadConfig("config.json") - utils.InitTranslations(utils.Cfg.LocalizationSettings) - *utils.Cfg.TeamSettings.MaxUsersPerTeam = 50 - *utils.Cfg.RateLimitSettings.Enable = false - utils.Cfg.EmailSettings.SendEmailNotifications = true - *utils.Cfg.TeamSettings.EnableOpenServer = true -} - func (me *TestHelper) InitBasic() *TestHelper { me.waitForConnectivity() diff --git a/api/status_test.go b/api/status_test.go index 19d422b16..6a0ba3937 100644 --- a/api/status_test.go +++ b/api/status_test.go @@ -205,7 +205,6 @@ func TestStatuses(t *testing.T) { } func TestGetStatusesByIds(t *testing.T) { - ReloadConfigForSetup() th := Setup().InitBasic() defer th.TearDown() diff --git a/api/user.go b/api/user.go index 82796a6a9..e6f3327ba 100644 --- a/api/user.go +++ b/api/user.go @@ -292,7 +292,7 @@ func getInitialLoad(c *Context, w http.ResponseWriter, r *http.Request) { il.TeamMembers = c.Session.TeamMembers } - if app.SessionCacheLength() == 0 { + if c.App.SessionCacheLength() == 0 { // Below is a special case when intializating a new server // Lets check to make sure the server is really empty |