You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

52 lines
1.3 KiB

Restricted users (#6274) * Restricted users (#4334): initial implementation * Add User.IsRestricted & UI to edit it * Pass user object instead of user id to places where IsRestricted flag matters * Restricted users: maintain access rows for all referenced repos (incl public) * Take logged in user & IsRestricted flag into account in org/repo listings, searches and accesses * Add basic repo access tests for restricted users Signed-off-by: Manush Dodunekov <manush@stendahls.se> * Mention restricted users in the faq Signed-off-by: Manush Dodunekov <manush@stendahls.se> * Revert unnecessary change `.isUserPartOfOrg` -> `.IsUserPartOfOrg` Signed-off-by: Manush Dodunekov <manush@stendahls.se> * Remove unnecessary `org.IsOrganization()` call Signed-off-by: Manush Dodunekov <manush@stendahls.se> * Revert to an `int64` keyed `accessMap` * Add type `userAccess` * Add convenience func updateUserAccess() * Turn accessMap into a `map[int64]userAccess` Signed-off-by: Manush Dodunekov <manush@stendahls.se> * or even better: `map[int64]*userAccess` * updateUserAccess(): use tighter syntax as suggested by lafriks * even tighter * Avoid extra loop * Don't disclose limited orgs to unauthenticated users * Don't assume block only applies to orgs * Use an array of `VisibleType` for filtering * fix yet another thinko * Ok - no need for u * Revert "Ok - no need for u" This reverts commit 5c3e886aabd5acd997a3b35687d322439732c200. Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com> Co-authored-by: Lauris BH <lauris@nix.lv>
4 years ago
  1. // Copyright 2018 The Gitea Authors. All rights reserved.
  2. // Use of this source code is governed by a MIT-style
  3. // license that can be found in the LICENSE file.package models
  4. package models
  5. import (
  6. "encoding/json"
  7. "testing"
  8. "github.com/stretchr/testify/assert"
  9. )
  10. func TestGetUserHeatmapDataByUser(t *testing.T) {
  11. testCases := []struct {
  12. userID int64
  13. CountResult int
  14. JSONResult string
  15. }{
  16. {2, 1, `[{"timestamp":1571616000,"contributions":1}]`},
  17. {3, 0, `[]`},
  18. }
  19. // Prepare
  20. assert.NoError(t, PrepareTestDatabase())
  21. for _, tc := range testCases {
  22. // Insert some action
  23. user := AssertExistsAndLoadBean(t, &User{ID: tc.userID}).(*User)
  24. // get the action for comparison
  25. actions, err := GetFeeds(GetFeedsOptions{
  26. RequestedUser: user,
  27. Actor: user,
  28. IncludePrivate: true,
  29. OnlyPerformedBy: false,
  30. IncludeDeleted: true,
  31. })
  32. assert.NoError(t, err)
  33. // Get the heatmap and compare
  34. heatmap, err := GetUserHeatmapDataByUser(user)
  35. assert.NoError(t, err)
  36. assert.Equal(t, len(actions), len(heatmap), "invalid action count: did the test data became too old?")
  37. assert.Equal(t, tc.CountResult, len(heatmap))
  38. //Test JSON rendering
  39. jsonData, err := json.Marshal(heatmap)
  40. assert.NoError(t, err)
  41. assert.Equal(t, tc.JSONResult, string(jsonData))
  42. }
  43. }