TEST: add PullRequest ID:5

Repo: user2/repo1
Base: branch1
Head: pr-to-update

integrations/api_issue_test.go

@@ -134,15 +134,15 @@ func TestAPISearchIssue(t *testing.T) {
  var apiIssues []*api.Issue
  DecodeJSON(t, resp, &apiIssues)
 
- assert.Len(t, apiIssues, 8)
+ assert.Len(t, apiIssues, 9)
 
  query := url.Values{}
  query.Add("token", token)
  link.RawQuery = query.Encode()
  req = NewRequest(t, "GET", link.String())
  resp = session.MakeRequest(t, req, http.StatusOK)
  DecodeJSON(t, resp, &apiIssues)
- assert.Len(t, apiIssues, 8)
+ assert.Len(t, apiIssues, 9)
 
  query.Add("state", "closed")
  link.RawQuery = query.Encode()
@@ -163,5 +163,5 @@ func TestAPISearchIssue(t *testing.T) {
  req = NewRequest(t, "GET", link.String())
  resp = session.MakeRequest(t, req, http.StatusOK)
  DecodeJSON(t, resp, &apiIssues)
- assert.Len(t, apiIssues, 0)
+ assert.Len(t, apiIssues, 1)
 }

integrations/gitea-repositories-meta/user2/repo1.git/refs/heads/branch2

@@ -1 +1 @@
-5c050d3b6d2db231ab1f64e324f1b6b9a0b181c2
+985f0301dba5e7b34be866819cd15ad3d8f508ee

integrations/gitea-repositories-meta/user2/repo1.git/refs/heads/pr-to-update

@@ -0,0 +1 @@
+5c050d3b6d2db231ab1f64e324f1b6b9a0b181c2

integrations/repo_activity_test.go

@@ -56,9 +56,9 @@ func TestRepoActivity(t *testing.T) {
  list = htmlDoc.doc.Find("#merged-pull-requests").Next().Find("p.desc")
  assert.Len(t, list.Nodes, 1)
 
- // Should be 2 merged proposed pull requests
+ // Should be 3 merged proposed pull requests
  list = htmlDoc.doc.Find("#proposed-pull-requests").Next().Find("p.desc")
- assert.Len(t, list.Nodes, 2)
+ assert.Len(t, list.Nodes, 3)
 
  // Should be 3 new issues
  list = htmlDoc.doc.Find("#new-issues").Next().Find("p.desc")

models/fixtures/issue.yml

@@ -122,3 +122,15 @@
  created_unix: 946684830
  updated_unix: 999307200
  deadline_unix: 1019307200
+
+-
+ id: 11
+ repo_id: 1
+ index: 5
+ poster_id: 1
+ name: pull5
+ content: content for the a pull request
+ is_closed: false
+ is_pull: true
+ created_unix: 1579194806
+ updated_unix: 1579194806

models/fixtures/pull_request.yml

@@ -49,4 +49,17 @@
  head_branch: branch1
  base_branch: master
  merge_base: abcdef1234567890
- has_merged: false
+ has_merged: false
+
+-
+ id: 5 # this PR is outdated (one commit behind branch1 )
+ type: 0 # gitea pull request
+ status: 2 # mergable
+ issue_id: 11
+ index: 5
+ head_repo_id: 1
+ base_repo_id: 1
+ head_branch: pr-to-update
+ base_branch: branch1
+ merge_base: 1234567890abcdef
+ has_merged: false

models/fixtures/repository.yml

@@ -7,7 +7,7 @@
  is_private: false
  num_issues: 2
  num_closed_issues: 1
- num_pulls: 2
+ num_pulls: 3
  num_closed_pulls: 0
  num_milestones: 3
  num_closed_milestones: 1

models/issue_test.go

@@ -276,8 +276,8 @@ func TestIssue_SearchIssueIDsByKeyword(t *testing.T) {
 
  total, ids, err = SearchIssueIDsByKeyword("for", []int64{1}, 10, 0)
  assert.NoError(t, err)
- assert.EqualValues(t, 4, total)
- assert.EqualValues(t, []int64{1, 2, 3, 5}, ids)
+ assert.EqualValues(t, 5, total)
+ assert.EqualValues(t, []int64{1, 2, 3, 5, 11}, ids)
 
  // issue1's comment id 2
  total, ids, err = SearchIssueIDsByKeyword("good", []int64{1}, 10, 0)
@@ -305,8 +305,8 @@ func testInsertIssue(t *testing.T, title, content string) {
  assert.True(t, has)
  assert.EqualValues(t, issue.Title, newIssue.Title)
  assert.EqualValues(t, issue.Content, newIssue.Content)
- // there are 4 issues and max index is 4 on repository 1, so this one should 5
- assert.EqualValues(t, 5, newIssue.Index)
+ // there are 5 issues and max index is 5 on repository 1, so this one should 6
+ assert.EqualValues(t, 6, newIssue.Index)
 
  _, err = x.ID(issue.ID).Delete(new(Issue))
  assert.NoError(t, err)

models/issue_user_test.go

@@ -17,7 +17,7 @@ func Test_newIssueUsers(t *testing.T) {
  newIssue := &Issue{
  RepoID: repo.ID,
  PosterID: 4,
- Index: 5,
+ Index: 6,
  Title: "newTestIssueTitle",
  Content: "newTestIssueContent",
  }

models/pull_test.go

@@ -61,10 +61,11 @@ func TestPullRequestsNewest(t *testing.T) {
  Labels: []string{},
  })
  assert.NoError(t, err)
- assert.Equal(t, int64(2), count)
- if assert.Len(t, prs, 2) {
- assert.Equal(t, int64(2), prs[0].ID)
- assert.Equal(t, int64(1), prs[1].ID)
+ assert.EqualValues(t, 3, count)
+ if assert.Len(t, prs, 3) {
+ assert.EqualValues(t, 5, prs[0].ID)
+ assert.EqualValues(t, 2, prs[1].ID)
+ assert.EqualValues(t, 1, prs[2].ID)
  }
 }
 
@@ -77,10 +78,11 @@ func TestPullRequestsOldest(t *testing.T) {
  Labels: []string{},
  })
  assert.NoError(t, err)
- assert.Equal(t, int64(2), count)
- if assert.Len(t, prs, 2) {
- assert.Equal(t, int64(1), prs[0].ID)
- assert.Equal(t, int64(2), prs[1].ID)
+ assert.EqualValues(t, 3, count)
+ if assert.Len(t, prs, 3) {
+ assert.EqualValues(t, 1, prs[0].ID)
+ assert.EqualValues(t, 2, prs[1].ID)
+ assert.EqualValues(t, 5, prs[2].ID)
  }
 }