From 0361bc3af31a06ec64adeab0ca2d1534a1c35ed0 Mon Sep 17 00:00:00 2001 From: Stefan Majewsky Date: Mon, 30 Mar 2020 20:40:25 +0200 Subject: rtree: always store compact remote URLs in the index file Includes a refactor to use a type RemoteURL with a more natural API. --- internal/rtree/get_test.go | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) (limited to 'internal/rtree/get_test.go') diff --git a/internal/rtree/get_test.go b/internal/rtree/get_test.go index bdd0f2e..a438234 100644 --- a/internal/rtree/get_test.go +++ b/internal/rtree/get_test.go @@ -60,24 +60,27 @@ func TestGetExistingRepoWithoutShortcut(t *testing.T) { func TestGetNewRepo(t *testing.T) { target := filepath.Join(RootPath, "/github.com/another/repo") - Test{ - Args: []string{"get", "gh:another/repo"}, - Index: testIndexWithTwoRepos, - ExpectOutput: target + "\n", - ExpectExecution: Recorded("git clone gh:another/repo " + target), - ExpectIndex: &Index{ - Repos: []*Repo{ - { - CheckoutPath: "github.com/another/repo", - Remotes: []Remote{ - {Name: "origin", URL: "gh:another/repo"}, + for _, remoteURL := range []string{"gh:another/repo", "https://github.com/another/repo"} { + Test{ + Args: []string{"get", remoteURL}, + Index: testIndexWithTwoRepos, + ExpectOutput: target + "\n", + ExpectExecution: Recorded("git clone gh:another/repo " + target), + ExpectIndex: &Index{ + Repos: []*Repo{ + { + CheckoutPath: "github.com/another/repo", + Remotes: []Remote{ + //regardless of the remote URL used, we expect the contracted form to be used + {Name: "origin", URL: "gh:another/repo"}, + }, }, + testIndexWithTwoRepos.Repos[0], + testIndexWithTwoRepos.Repos[1], }, - testIndexWithTwoRepos.Repos[0], - testIndexWithTwoRepos.Repos[1], }, - }, - }.Run(t) + }.Run(t) + } } func TestGetNewForkAsRemote(t *testing.T) { -- cgit v1.3.1