305cd290ee
First, consolidate the functionality between `pr merge` and `pr checkout` that resolves the default branch name of the base repo. With an added bonus, the new approach avoids an API request when one isn't necessary. Then, ensure that checking out 3rd-party PRs will result in local branch name such as `<owner>/<branch>` when the head branch of the repository matches the default branch of the base repository. We already have had code in place to take care of this, but it only took effect in the `pr checkout <number>`-style invocation.
72 lines
1.3 KiB
Go
72 lines
1.3 KiB
Go
package httpmock
|
|
|
|
import (
|
|
"fmt"
|
|
"net/http"
|
|
"sync"
|
|
)
|
|
|
|
type Registry struct {
|
|
mu sync.Mutex
|
|
stubs []*Stub
|
|
Requests []*http.Request
|
|
}
|
|
|
|
func (r *Registry) Register(m Matcher, resp Responder) {
|
|
r.stubs = append(r.stubs, &Stub{
|
|
Matcher: m,
|
|
Responder: resp,
|
|
})
|
|
}
|
|
|
|
type Testing interface {
|
|
Errorf(string, ...interface{})
|
|
Helper()
|
|
}
|
|
|
|
func (r *Registry) Verify(t Testing) {
|
|
n := 0
|
|
for _, s := range r.stubs {
|
|
if !s.matched {
|
|
n++
|
|
}
|
|
}
|
|
if n > 0 {
|
|
t.Helper()
|
|
// NOTE: stubs offer no useful reflection, so we can't print details
|
|
// about dead stubs and what they were trying to match
|
|
t.Errorf("%d unmatched HTTP stubs", n)
|
|
}
|
|
}
|
|
|
|
// RoundTrip satisfies http.RoundTripper
|
|
func (r *Registry) RoundTrip(req *http.Request) (*http.Response, error) {
|
|
var stub *Stub
|
|
|
|
r.mu.Lock()
|
|
for _, s := range r.stubs {
|
|
if s.matched || !s.Matcher(req) {
|
|
continue
|
|
}
|
|
// TODO: reinstate this check once the legacy layer has been cleaned up
|
|
// if stub != nil {
|
|
// r.mu.Unlock()
|
|
// return nil, fmt.Errorf("more than 1 stub matched %v", req)
|
|
// }
|
|
stub = s
|
|
break // TODO: remove
|
|
}
|
|
if stub != nil {
|
|
stub.matched = true
|
|
}
|
|
|
|
if stub == nil {
|
|
r.mu.Unlock()
|
|
return nil, fmt.Errorf("no registered stubs matched %v", req)
|
|
}
|
|
|
|
r.Requests = append(r.Requests, req)
|
|
r.mu.Unlock()
|
|
|
|
return stub.Responder(req)
|
|
}
|