fix tests

Author: lunny

integrations/api_repo_test.go

@@ -70,9 +70,9 @@ func TestAPISearchRepo(t *testing.T) {
 		expectedResults
 	}{
 		{name: "RepositoriesMax50", requestURL: "/api/v1/repos/search?limit=50&private=false", expectedResults: expectedResults{
-			nil:   {count: 22},
-			user:  {count: 22},
-			user2: {count: 22}},
+			nil:   {count: 21},
+			user:  {count: 21},
+			user2: {count: 21}},
 		},
 		{name: "RepositoriesMax10", requestURL: "/api/v1/repos/search?limit=10&private=false", expectedResults: expectedResults{
 			nil:   {count: 10},

models/fixtures/repository.yml

@@ -6,12 +6,11 @@
   is_private: false
   num_issues: 2
   num_closed_issues: 1
-  num_pulls: 3
+  num_pulls: 2
   num_closed_pulls: 0
   num_milestones: 3
   num_closed_milestones: 1
   num_watches: 3
-  num_forks: 1
 
 -
   id: 2
@@ -119,7 +118,7 @@
   is_private: false
   num_issues: 0
   num_closed_issues: 0
-  num_pulls: 0
+  num_pulls: 1
   num_closed_pulls: 0
   is_mirror: false
   num_forks: 1
@@ -497,17 +496,4 @@
   num_stars: 0
   num_forks: 0
   num_issues: 0
-  is_mirror: false
-
--
-  id: 42
-  owner_id: 1
-  lower_name: forked_repo1
-  name: forked_repo1
-  is_private: false
-  num_stars: 0
-  num_forks: 0
-  num_issues: 0
-  is_mirror: false
-  is_fork: true
-  fork_id: 1
+  is_mirror: false

models/fixtures/user.yml

@@ -12,7 +12,7 @@
   is_admin: true
   avatar: avatar1
   avatar_email: [email protected]
-  num_repos: 1
+  num_repos: 0
   is_active: true
 
 -

models/repo_list_test.go

@@ -147,10 +147,10 @@ func TestSearchRepositoryByName(t *testing.T) {
 			count: 14},
 		{name: "AllPublic/PublicRepositoriesOfUserIncludingCollaborative",
 			opts:  &SearchRepoOptions{Page: 1, PageSize: 10, OwnerID: 15, AllPublic: true},
-			count: 22},
+			count: 21},
 		{name: "AllPublic/PublicAndPrivateRepositoriesOfUserIncludingCollaborative",
 			opts:  &SearchRepoOptions{Page: 1, PageSize: 10, OwnerID: 15, Private: true, AllPublic: true},
-			count: 28},
+			count: 27},
 		{name: "AllPublic/PublicAndPrivateRepositoriesOfUserIncludingCollaborativeByName",
 			opts:  &SearchRepoOptions{Keyword: "test", Page: 1, PageSize: 10, OwnerID: 15, Private: true, AllPublic: true},
 			count: 15},
@@ -159,7 +159,7 @@ func TestSearchRepositoryByName(t *testing.T) {
 			count: 13},
 		{name: "AllPublic/PublicRepositoriesOfOrganization",
 			opts:  &SearchRepoOptions{Page: 1, PageSize: 10, OwnerID: 17, AllPublic: true, Collaborate: util.OptionalBoolFalse},
-			count: 22},
+			count: 21},
 	}
 
 	for _, testCase := range testCases {