Add tests and fix result of collaborative filter in specific condition

go-gitea · Sep 21, 2017 · 19c15bb · 19c15bb
1 parent 62076a3
commit 19c15bb
Show file tree

Hide file tree

Showing 8 changed files with 261 additions and 51 deletions.
diff --git a/integrations/api_repo_test.go b/integrations/api_repo_test.go
@@ -73,9 +73,9 @@ func TestAPISearchRepo(t *testing.T) {
 		expectedResults
 	}{
 		{name: "RepositoriesMax50", requestURL: "/api/v1/repos/search?limit=50", expectedResults: expectedResults{
-			nil:   {count: 12, privacy: privacyTypePublic},
-			user:  {count: 12, privacy: privacyTypePublic},
-			user2: {count: 12, privacy: privacyTypePublic}},
+			nil:   {count: 15, privacy: privacyTypePublic},
+			user:  {count: 15, privacy: privacyTypePublic},
+			user2: {count: 15, privacy: privacyTypePublic}},
 		},
 		{name: "RepositoriesMax10", requestURL: "/api/v1/repos/search?limit=10", expectedResults: expectedResults{
 			nil:   {count: 10, privacy: privacyTypePublic},
@@ -88,24 +88,24 @@ func TestAPISearchRepo(t *testing.T) {
 			user2: {count: 10, privacy: privacyTypePublic}},
 		},
 		{name: "RepositoriesByName", requestURL: fmt.Sprintf("/api/v1/repos/search?q=%s", "big_test_"), expectedResults: expectedResults{
-			nil:   {count: 4, repoName: "big_test_", privacy: privacyTypePublic},
-			user:  {count: 4, repoName: "big_test_", privacy: privacyTypePublic},
-			user2: {count: 4, repoName: "big_test_", privacy: privacyTypePublic}},
+			nil:   {count: 7, repoName: "big_test_", privacy: privacyTypePublic},
+			user:  {count: 7, repoName: "big_test_", privacy: privacyTypePublic},
+			user2: {count: 7, repoName: "big_test_", privacy: privacyTypePublic}},
 		},
-		{name: "RepositoriesAccessibleAndRelatedToUser", requestURL: fmt.Sprintf("/api/v1/repos/search?uid=%d", user.ID), expectedResults: expectedResults{
-			nil:   {count: 4, privacy: privacyTypePublic},
-			user:  {count: 8},
-			user2: {count: 4, privacy: privacyTypePublic}},
+		{name: "RepositoriesAccessibleAndRelatedToUser", requestURL: fmt.Sprintf("/api/v1/repos/search?uid=%d&limit=50", user.ID), expectedResults: expectedResults{
+			nil:   {count: 7, privacy: privacyTypePublic},
+			user:  {count: 14},
+			user2: {count: 7, privacy: privacyTypePublic}},
 		},
 		{name: "RepositoriesAccessibleAndRelatedToUser2", requestURL: fmt.Sprintf("/api/v1/repos/search?uid=%d", user2.ID), expectedResults: expectedResults{
 			nil:   {count: 1, privacy: privacyTypePublic},
 			user:  {count: 1, privacy: privacyTypePublic},
 			user2: {count: 2}},
 		},
 		{name: "RepositoriesOwnedByOrganization", requestURL: fmt.Sprintf("/api/v1/repos/search?uid=%d", orgUser.ID), expectedResults: expectedResults{
-			nil:   {count: 1, repoOwnerID: orgUser.ID, privacy: privacyTypePublic},
-			user:  {count: 2, repoOwnerID: orgUser.ID},
-			user2: {count: 1, repoOwnerID: orgUser.ID, privacy: privacyTypePublic}},
+			nil:   {count: 2, repoOwnerID: orgUser.ID, privacy: privacyTypePublic},
+			user:  {count: 4, repoOwnerID: orgUser.ID},
+			user2: {count: 2, repoOwnerID: orgUser.ID, privacy: privacyTypePublic}},
 		},
 	}
 

diff --git a/models/fixtures/access.yml b/models/fixtures/access.yml
@@ -38,4 +38,15 @@
   id: 7
   user_id: 15
   repo_id: 24
+  mode: 4 # owner
+-
+  id: 8
+  user_id: 15
+  repo_id: 27
+  mode: 4 # owner
+
+-
+  id: 9
+  user_id: 15
+  repo_id: 28
   mode: 4 # owner
diff --git a/models/fixtures/repository.yml b/models/fixtures/repository.yml
@@ -201,6 +201,7 @@
   num_closed_pulls: 0
   num_watches: 0
   is_mirror: false
+  is_fork: false
 
 -
   id: 18
@@ -213,6 +214,7 @@
   num_pulls: 0
   num_closed_pulls: 0
   is_mirror: false
+  is_fork: false
 
 -
   id: 19
@@ -225,6 +227,7 @@
   num_pulls: 0
   num_closed_pulls: 0
   is_mirror: false
+  is_fork: false
 
 -
   id: 20
@@ -237,6 +240,7 @@
   num_pulls: 0
   num_closed_pulls: 0
   is_mirror: false
+  is_fork: false
 
 -
   id: 21
@@ -249,6 +253,7 @@
   num_pulls: 0
   num_closed_pulls: 0
   is_mirror: false
+  is_fork: false
 
 -
   id: 22
@@ -261,6 +266,7 @@
   num_pulls: 0
   num_closed_pulls: 0
   is_mirror: false
+  is_fork: false
 
 -
   id: 23
@@ -273,6 +279,7 @@
   num_pulls: 0
   num_closed_pulls: 0
   is_mirror: false
+  is_fork: false
 
 -
   id: 24
@@ -285,3 +292,90 @@
   num_pulls: 0
   num_closed_pulls: 0
   is_mirror: false
+  is_fork: false
+
+-
+  id: 25
+  owner_id: 15
+  lower_name: big_test_public_mirror_5
+  name: big_test_public_mirror_5
+  is_private: false
+  num_issues: 0
+  num_closed_issues: 0
+  num_pulls: 0
+  num_closed_pulls: 0
+  num_watches: 0
+  is_mirror: true
+  is_fork: false
+
+-
+  id: 26
+  owner_id: 15
+  lower_name: big_test_private_mirror_5
+  name: big_test_private_mirror_5
+  is_private: true
+  num_issues: 0
+  num_closed_issues: 0
+  num_pulls: 0
+  num_closed_pulls: 0
+  num_watches: 0
+  is_mirror: true
+  is_fork: false
+
+-
+  id: 27
+  owner_id: 17
+  lower_name: big_test_public_mirror_6
+  name: big_test_public_mirror_6
+  is_private: false
+  num_issues: 0
+  num_closed_issues: 0
+  num_pulls: 0
+  num_closed_pulls: 0
+  num_watches: 0
+  is_mirror: true
+  num_forks: 1
+  is_fork: false
+
+-
+  id: 28
+  owner_id: 17
+  lower_name: big_test_private_mirror_6
+  name: big_test_private_mirror_6
+  is_private: true
+  num_issues: 0
+  num_closed_issues: 0
+  num_pulls: 0
+  num_closed_pulls: 0
+  num_watches: 0
+  is_mirror: true
+  num_forks: 1
+  is_fork: false
+
+-
+  id: 29
+  fork_id: 27
+  owner_id: 15
+  lower_name: big_test_public_fork_7
+  name: big_test_public_fork_7
+  is_private: false
+  num_issues: 0
+  num_closed_issues: 0
+  num_pulls: 0
+  num_closed_pulls: 0
+  is_mirror: false
+  is_fork: true
+
+-
+  id: 30
+  fork_id: 28
+  owner_id: 15
+  lower_name: big_test_private_fork_7
+  name: big_test_private_fork_7
+  is_private: true
+  num_issues: 0
+  num_closed_issues: 0
+  num_pulls: 0
+  num_closed_pulls: 0
+  is_mirror: false
+  is_fork: true
diff --git a/models/fixtures/team.yml b/models/fixtures/team.yml
@@ -43,6 +43,6 @@
   lower_name: owners
   name: Owners
   authorize: 4 # owner
-  num_repos: 2
+  num_repos: 4
   num_members: 1
   unit_types: '[1,2,3,4,5,6,7]'
diff --git a/models/fixtures/team_repo.yml b/models/fixtures/team_repo.yml
@@ -26,4 +26,16 @@
   id: 5
   org_id: 17
   team_id: 5
-  repo_id: 24
+  repo_id: 24
+
+-
+  id: 6
+  org_id: 17
+  team_id: 5
+  repo_id: 27
+
+-
+  id: 7
+  org_id: 17
+  team_id: 5
+  repo_id: 28
diff --git a/models/fixtures/user.yml b/models/fixtures/user.yml
@@ -231,7 +231,7 @@
   is_admin: false
   avatar: avatar15
   avatar_email: user15@example.com
-  num_repos: 4
+  num_repos: 8
   is_active: true
 
 -
@@ -261,7 +261,7 @@
   is_admin: false
   avatar: avatar17
   avatar_email: user17@example.com
-  num_repos: 2
+  num_repos: 4
   is_active: true
   num_members: 1
   num_teams: 1
diff --git a/models/repo_list.go b/models/repo_list.go
@@ -164,6 +164,10 @@ func SearchRepositoryByName(opts *SearchRepoOptions) (repos RepositoryList, _ in
 		}
 	}
 
+	if opts.RepoType == RepoTypeCollaborative && (!opts.Collaborate || opts.OwnerID <= 0) {
+		return repos, 0, nil
+	}
+
 	// Check and set page to correct number
 	if opts.Page <= 0 {
 		opts.Page = 1