fix test

models/fixtures/branch.yml

@@ -192,7 +192,7 @@
 
 -
   id: 17
-  repo_id: 60
+  repo_id: 62
   name: 'master'
   commit_id: '65f1bf27bc3bf70f64657658635e66094edbcb4d'
   commit_message: 'Initial commit'
@@ -204,7 +204,7 @@
 
 -
   id: 18
-  repo_id: 60
+  repo_id: 62
   name: 'org-fork-new-commit'
   commit_id: 'cb24c347e328d83c1e0c3c908a6b2c0a2fcb8a3d'
   commit_message: 'add'
@@ -216,7 +216,7 @@
 
 -
   id: 19
-  repo_id: 60
+  repo_id: 62
   name: 'org-fork-no-commit'
   commit_id: '65f1bf27bc3bf70f64657658635e66094edbcb4d'
   commit_message: 'Initial commit'
@@ -228,7 +228,7 @@
 
 -
   id: 20
-  repo_id: 61
+  repo_id: 63
   name: 'master'
   commit_id: '65f1bf27bc3bf70f64657658635e66094edbcb4d'
   commit_message: 'Initial commit'
@@ -240,7 +240,7 @@
 
 -
   id: 21
-  repo_id: 61
+  repo_id: 63
   name: 'private-org-fork-new-commit'
   commit_id: 'cb24c347e328d83c1e0c3c908a6b2c0a2fcb8a3d'
   commit_message: 'add'
@@ -252,7 +252,7 @@
 
 -
   id: 22
-  repo_id: 61
+  repo_id: 63
   name: 'private-org-fork-no-commit'
   commit_id: '65f1bf27bc3bf70f64657658635e66094edbcb4d'
   commit_message: 'Initial commit'
@@ -264,7 +264,7 @@
 
 -
   id: 23
-  repo_id: 61
+  repo_id: 63
   name: 'private-org-fork-no-permission-new-commit'
   commit_id: 'cb24c347e328d83c1e0c3c908a6b2c0a2fcb8a3d'
   commit_message: 'add'
@@ -276,7 +276,7 @@
 
 -
   id: 24
-  repo_id: 61
+  repo_id: 63
   name: 'private-org-fork-no-permission-no-commit'
   commit_id: '65f1bf27bc3bf70f64657658635e66094edbcb4d'
   commit_message: 'Initial commit'

models/fixtures/repository.yml

@@ -1773,8 +1773,8 @@
   id: 62
   owner_id: 25
   owner_name: org25
-  lower_name: org_fork_repo59
-  name: org_fork_repo59
+  lower_name: org_fork_repo62
+  name: org_fork_repo62
   num_watches: 0
   num_stars: 0
   num_forks: 0
@@ -1803,8 +1803,8 @@
   id: 63
   owner_id: 35
   owner_name: private_org35
-  lower_name: private_org_fork_repo60
-  name: private_org_fork_repo60
+  lower_name: private_org_fork_repo63
+  name: private_org_fork_repo63
   num_watches: 0
   num_stars: 0
   num_forks: 0

models/git/branch_test.go

@@ -213,7 +213,7 @@ func TestFindRecentlyPushedNewBranches(t *testing.T) {
 				},
 			},
 			count: 2,
-			want:  []string{"new-commit", "org25/org_fork_repo59:org-fork-new-commit"},
+			want:  []string{"new-commit", "org25/org_fork_repo62:org-fork-new-commit"},
 		},
 		// user13 pushed 2 branches with the same name in repo10 and repo11
 		// and repo11's branch has a pr, but repo10's branch doesn't
@@ -239,7 +239,7 @@ func TestFindRecentlyPushedNewBranches(t *testing.T) {
 				CommitAfterUnix: 1489927670,
 			},
 			count: 1,
-			want:  []string{"private_org35/private_org_fork_repo60:private-org-fork-new-commit"},
+			want:  []string{"private_org35/private_org_fork_repo63:private-org-fork-new-commit"},
 		},
 		// user2 does not have code permission in private_org35
 		{
@@ -258,7 +258,7 @@ func TestFindRecentlyPushedNewBranches(t *testing.T) {
 				CommitAfterUnix: 1489927690,
 			},
 			count: 1,
-			want:  []string{"org25/org_fork_repo59:org-fork-new-commit"},
+			want:  []string{"org25/org_fork_repo62:org-fork-new-commit"},
 		},
 	}
 
@@ -272,7 +272,7 @@ func TestFindRecentlyPushedNewBranches(t *testing.T) {
 			assert.Equal(t, tt.count, len(branches))
 
 			for i := 0; i < tt.count; i++ {
-				assert.Equal(t, tt.want[i], branches[i].BranchName)
+				assert.Equal(t, tt.want[i], branches[i].BranchDisplayName)
 			}
 		})
 	}