diff options
author | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2018-06-08 17:04:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-08 17:04:17 +0200 |
commit | 3bae67489f53ad6501d3632cfa8847b2d09ebaff (patch) | |
tree | 8858e3399e782271673eed2e9e79bb9e51919260 /app/user_test.go | |
parent | e09b3c566b2de1da1d916d3e209c96d43be739e2 (diff) | |
download | chat-3bae67489f53ad6501d3632cfa8847b2d09ebaff.tar.gz chat-3bae67489f53ad6501d3632cfa8847b2d09ebaff.tar.bz2 chat-3bae67489f53ad6501d3632cfa8847b2d09ebaff.zip |
Relese5.0 merge master 20180608 (#8933)
* Add missing diagnostics (#8911)
* Update diagnostics.go
* Update diagnostics.go
* Fix push notification styling backwards compatibility (#8913)
* MM-10803: remove premature user sanitization on deactivation (#8926)
* remove unused UpdateNonSSOUserActive
* MM-10803: stop prematurely sanitizing users on deactivate
This change was preceded by the removal of UpdateNonSSOUserActive to
ensure there are no APIs relying on the sanitized return value.
* MM-10803: test websocket events after UpdateUserActive
* MM-10264: Adds system scheme to permissions import/export. (#8924)
* MM-10264: Adds system scheme to permissions import/export.
* MM-10264: Switches to more likely unique name.
* MM-10264: Changed collision prevention string.
* MM-10264: Rolls back created schemes in all error cases.
* MM-10264: Test fix for more rollback cases.
Diffstat (limited to 'app/user_test.go')
-rw-r--r-- | app/user_test.go | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/app/user_test.go b/app/user_test.go index f0e026fa9..b557d296b 100644 --- a/app/user_test.go +++ b/app/user_test.go @@ -96,24 +96,6 @@ func TestCreateOAuthUser(t *testing.T) { } } -func TestDeactivateSSOUser(t *testing.T) { - th := Setup().InitBasic() - defer th.TearDown() - - r := rand.New(rand.NewSource(time.Now().UnixNano())) - glUser := oauthgitlab.GitLabUser{Id: int64(r.Intn(1000)) + 1, Username: "o" + model.NewId(), Email: model.NewId() + "@simulator.amazonses.com", Name: "Joram Wilander"} - - json := glUser.ToJson() - user, err := th.App.CreateOAuthUser(model.USER_AUTH_SERVICE_GITLAB, strings.NewReader(json), th.BasicTeam.Id) - if err != nil { - t.Fatal(err) - } - defer th.App.PermanentDeleteUser(user) - - _, err = th.App.UpdateNonSSOUserActive(user.Id, false) - assert.Equal(t, "api.user.update_active.no_deactivate_sso.app_error", err.Id) -} - func TestCreateProfileImage(t *testing.T) { b, err := CreateProfileImage("Corey Hulen", "eo1zkdr96pdj98pjmq8zy35wba", "luximbi.ttf") if err != nil { |