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/permissions_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/permissions_test.go')
| -rw-r--r-- | app/permissions_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/permissions_test.go b/app/permissions_test.go index 3c70dc026..ca98461e7 100644 --- a/app/permissions_test.go +++ b/app/permissions_test.go @@ -179,7 +179,7 @@ func TestImportPermissions_idempotentScheme(t *testing.T) { if appErr != nil { panic(appErr) } - expected = len(results) + 1 + expected = len(results) err := th.App.ImportPermissions(r) if err == nil { |