Improve association of local branches with PR (#24)

connmock/stub.go

@@ -22,6 +22,16 @@ type (
 	Conf struct {
 		Times *Times
 	}
+
+	AssociatedBranchNamesStub struct {
+		Oid      string
+		Filename string
+	}
+
+	LogStub struct {
+		BranchName string
+		Filename   string
+	}
 )
 
 var (
@@ -74,6 +84,32 @@ func (s *Stub) GetBranchNames(name string, err error, conf *Conf) *Stub {
 	return s
 }
 
+func (s *Stub) GetAssociatedBranchNames(stubs []AssociatedBranchNamesStub, err error, conf *Conf) *Stub {
+	s.t.Helper()
+	for _, stub := range stubs {
+		configure(
+			s.Conn.EXPECT().
+				GetAssociatedBranchNames(stub.Oid).
+				Return(s.readFile("git", "abranch", stub.Filename), err),
+			conf,
+		)
+	}
+	return s
+}
+
+func (s *Stub) GetLog(stubs []LogStub, err error, conf *Conf) *Stub {
+	s.t.Helper()
+	for _, stub := range stubs {
+		configure(
+			s.Conn.EXPECT().
+				GetLog(stub.BranchName).
+				Return(s.readFile("git", "log", stub.Filename), err),
+			conf,
+		)
+	}
+	return s
+}
+
 func (s *Stub) GetPullRequests(path string, err error, conf *Conf) *Stub {
 	s.t.Helper()
 	configure(
@@ -99,11 +135,7 @@ func (s *Stub) DeleteBranches(err error, conf *Conf) *Stub {
 }
 
 func configure(call *gomock.Call, conf *Conf) {
-	if conf == nil {
-		return
-	}
-
-	if conf.Times == nil {
+	if conf == nil || conf.Times == nil {
 		call.AnyTimes()
 	} else {
 		call.Times(conf.Times.N)

fixtures/gh/pr_issue1Closed.json

@@ -9,6 +9,15 @@
             "url": "https://github.com/owner/repo/pull/1",
             "state": "CLOSED",
             "headRefName": "issue1",
+            "commits": {
+              "nodes": [
+                {
+                  "commit": {
+                    "oid": "356a192b7913b04c54574d18c28d46e6395428ab"
+                  }
+                }
+              ]
+            },
             "author": {
               "login": "owner"
             }

fixtures/gh/pr_issue1Merged.json

@@ -9,6 +9,15 @@
             "url": "https://github.com/owner/repo/pull/1",
             "state": "MERGED",
             "headRefName": "issue1",
+            "commits": {
+              "nodes": [
+                {
+                  "commit": {
+                    "oid": "356a192b7913b04c54574d18c28d46e6395428ab"
+                  }
+                }
+              ]
+            },
             "author": {
               "login": "owner"
             }

fixtures/gh/pr_issue1Merged_issue1Closed.json

@@ -9,6 +9,15 @@
             "url": "https://github.com/owner/repo/pull/1",
             "state": "CLOSED",
             "headRefName": "issue1",
+            "commits": {
+              "nodes": [
+                {
+                  "commit": {
+                    "oid": "356a192b7913b04c54574d18c28d46e6395428ab"
+                  }
+                }
+              ]
+            },
             "author": {
               "login": "owner"
             }
@@ -20,6 +29,15 @@
             "url": "https://github.com/owner/repo/pull/2",
             "state": "MERGED",
             "headRefName": "issue1",
+            "commits": {
+              "nodes": [
+                {
+                  "commit": {
+                    "oid": "356a192b7913b04c54574d18c28d46e6395428ab"
+                  }
+                }
+              ]
+            },
             "author": {
               "login": "owner"
             }

fixtures/gh/pr_issue1UpMerged.json

@@ -9,6 +9,15 @@
             "url": "https://github.com/parent-owner/repo/pull/1",
             "state": "MERGED",
             "headRefName": "issue1",
+            "commits": {
+              "nodes": [
+                {
+                  "commit": {
+                    "oid": "356a192b7913b04c54574d18c28d46e6395428ab"
+                  }
+                }
+              ]
+            },
             "author": {
               "login": "owner"
             }

fixtures/git/abranch_issue1.txt

@@ -0,0 +1 @@
+issue1

fixtures/git/abranch_main.txt

@@ -0,0 +1 @@
+main

fixtures/git/abranch_main_issue1.txt

@@ -0,0 +1,2 @@
+issue1
+main

fixtures/git/branch_main_@issue1.txt

@@ -1,3 +1,2 @@
 *,issue1,356a192b7913b04c54574d18c28d46e6395428ab
  ,main,b6589fc6ab0dc82cf12099d1c2d40ab994e8410c
-

fixtures/git/log_issue1.txt

@@ -0,0 +1,2 @@
+356a192b7913b04c54574d18c28d46e6395428ab
+b6589fc6ab0dc82cf12099d1c2d40ab994e8410c

fixtures/git/log_issue1CommitAfterMerge.txt

@@ -0,0 +1,3 @@
+b8a2645298053fb62ea03e27feea6c483d3fd27e
+356a192b7913b04c54574d18c28d46e6395428ab
+b6589fc6ab0dc82cf12099d1c2d40ab994e8410c

fixtures/git/log_main.txt

@@ -0,0 +1 @@
+b6589fc6ab0dc82cf12099d1c2d40ab994e8410c

fixtures/git/log_main_issue1Merged.txt

@@ -0,0 +1,2 @@
+cb197ba87e4ad323b1008c611212deb7da2a4a49
+b6589fc6ab0dc82cf12099d1c2d40ab994e8410c