Skip to content

Use the Gorilla Mux router for better routing of mocked GitHub APIs. #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 24, 2020
Merged

Use the Gorilla Mux router for better routing of mocked GitHub APIs. #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ go 1.14
require (
github.com/go-git/go-git/v5 v5.1.0
github.com/google/go-github/v32 v32.1.0
github.com/gorilla/mux v1.8.0
github.com/mitchellh/ioprogress v0.0.0-20180201004757-6a23b12fa88e
github.com/pkg/errors v0.8.1
github.com/spf13/cobra v1.0.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 7 additions & 10 deletions internal/pull/pull_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +124,16 @@ func TestPullReleases(t *testing.T) {
githubTestServer, githubURL := test.GetTestHTTPServer(t)
githubTestServer.HandleFunc("/api/v3/repos/github/codeql-action/releases/tags/some-codeql-version-on-main", func(response http.ResponseWriter, request *http.Request) {
test.ServeHTTPResponseFromFile(t, http.StatusOK, "./pull_test/api/release-some-codeql-version-on-main.json", response)
})
}).Methods("GET")
githubTestServer.HandleFunc("/api/v3/repos/github/codeql-action/releases/assets/1", func(response http.ResponseWriter, request *http.Request) {
require.Equal(t, "application/octet-stream", request.Header.Get("accept"))
test.ServeHTTPResponseFromFile(t, http.StatusOK, "./pull_test/api/asset-some-codeql-version-on-main.bin", response)
})
}).Methods("GET").Headers("accept", "application/octet-stream")
githubTestServer.HandleFunc("/api/v3/repos/github/codeql-action/releases/tags/some-codeql-version-on-v1-and-v2", func(response http.ResponseWriter, request *http.Request) {
test.ServeHTTPResponseFromFile(t, http.StatusOK, "./pull_test/api/release-some-codeql-version-on-v1-and-v2.json", response)
})
}).Methods("GET")
githubTestServer.HandleFunc("/api/v3/repos/github/codeql-action/releases/assets/2", func(response http.ResponseWriter, request *http.Request) {
require.Equal(t, "application/octet-stream", request.Header.Get("accept"))
test.ServeHTTPResponseFromFile(t, http.StatusOK, "./pull_test/api/asset-some-codeql-version-on-v1-and-v2.bin", response)
})
}).Methods("GET").Headers("accept", "application/octet-stream")
pullService := getTestPullService(t, temporaryDirectory, initialActionRepository, githubURL)
err := pullService.pullGit(true)
require.NoError(t, err)
Expand All @@ -151,14 +149,13 @@ func TestPullReleases(t *testing.T) {
githubTestServer, githubURL = test.GetTestHTTPServer(t)
githubTestServer.HandleFunc("/api/v3/repos/github/codeql-action/releases/tags/some-codeql-version-on-main", func(response http.ResponseWriter, request *http.Request) {
test.ServeHTTPResponseFromFile(t, http.StatusOK, "./pull_test/api/release-some-codeql-version-on-main.json", response)
})
}).Methods("GET")
githubTestServer.HandleFunc("/api/v3/repos/github/codeql-action/releases/tags/some-codeql-version-on-v1-and-v2", func(response http.ResponseWriter, request *http.Request) {
test.ServeHTTPResponseFromFile(t, http.StatusOK, "./pull_test/api/release-some-codeql-version-on-v1-and-v2.json", response)
})
}).Methods("GET")
githubTestServer.HandleFunc("/api/v3/repos/github/codeql-action/releases/assets/2", func(response http.ResponseWriter, request *http.Request) {
require.Equal(t, "application/octet-stream", request.Header.Get("accept"))
test.ServeHTTPResponseFromFile(t, http.StatusOK, "./pull_test/api/asset-some-codeql-version-on-v1-and-v2.bin", response)
})
}).Methods("GET").Headers("accept", "application/octet-stream")
pullService = getTestPullService(t, temporaryDirectory, initialActionRepository, githubURL)
err = pullService.pullReleases()
require.NoError(t, err)
Expand Down
5 changes: 3 additions & 2 deletions test/test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"os"
"testing"

"github.com/gorilla/mux"
"github.com/stretchr/testify/require"
)

Expand All @@ -19,8 +20,8 @@ func CreateTemporaryDirectory(t *testing.T) string {
return directory
}

func GetTestHTTPServer(t *testing.T) (*http.ServeMux, string) {
mux := http.NewServeMux()
func GetTestHTTPServer(t *testing.T) (*mux.Router, string) {
mux := mux.NewRouter()
mux.HandleFunc("/", func(response http.ResponseWriter, request *http.Request) {
require.Failf(t, "Unexpected HTTP request: %s %s", request.Method, request.URL.Path)
})
Expand Down