diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-17 07:53:16 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-17 07:53:16 -0400 |
| commit | 6f31d90e2f31ae597b83b2f845d5db938af8e38c (patch) | |
| tree | 81c59b83ffb033df92ff7fba5ffaf3ba5fe7a3cf /web/web_test.go | |
| parent | 319d61123a0418ea9caa9510b8ad1e9a302c7b93 (diff) | |
| parent | 1f6c271b3bedd6656ae7155714423b1b39a669c1 (diff) | |
| download | chat-6f31d90e2f31ae597b83b2f845d5db938af8e38c.tar.gz chat-6f31d90e2f31ae597b83b2f845d5db938af8e38c.tar.bz2 chat-6f31d90e2f31ae597b83b2f845d5db938af8e38c.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'web/web_test.go')
| -rw-r--r-- | web/web_test.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/web/web_test.go b/web/web_test.go index 4497f00cc..9b6230013 100644 --- a/web/web_test.go +++ b/web/web_test.go @@ -17,7 +17,7 @@ import ( "github.com/mattermost/mattermost-server/utils" ) -var ApiClient *model.Client +var ApiClient *model.Client4 var URL string type persistentTestStore struct { @@ -58,7 +58,7 @@ func Setup() *TestHelper { NewWeb(a, a.Srv.Router) URL = fmt.Sprintf("http://localhost:%v", a.Srv.ListenAddr.Port) - ApiClient = model.NewClient(URL) + ApiClient = model.NewAPIv4Client(URL) a.DoAdvancedPermissionsMigration() @@ -66,7 +66,6 @@ func Setup() *TestHelper { a.UpdateConfig(func(cfg *model.Config) { *cfg.TeamSettings.EnableOpenServer = true - *cfg.ServiceSettings.EnableAPIv3 = true }) th := &TestHelper{ |