From c8ee9829a76ae7a076ecc4d98aa5a3ebd81529d2 Mon Sep 17 00:00:00 2001 From: Ben Chadwick Date: Mon, 26 Jul 2021 21:55:47 -0700 Subject: [PATCH] Revert "fixing mistake" This reverts commit 5e3ca02198010c9cd4bd5db52abb9e4d56cd3ca0. --- pkg/cmd/browse/browse_test.go | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkg/cmd/browse/browse_test.go b/pkg/cmd/browse/browse_test.go index 86a66ff9b..53c6f0e5c 100644 --- a/pkg/cmd/browse/browse_test.go +++ b/pkg/cmd/browse/browse_test.go @@ -3,6 +3,7 @@ package browse import ( "fmt" "net/http" + "os" "testing" "github.com/cli/cli/internal/ghrepo" @@ -134,6 +135,7 @@ func TestNewCmdBrowse(t *testing.T) { } func Test_runBrowse(t *testing.T) { + s := string(os.PathSeparator) tests := []struct { name string opts BrowseOptions @@ -257,7 +259,7 @@ func Test_runBrowse(t *testing.T) { { name: "relative path from browse_test.go", opts: BrowseOptions{ - SelectorArg: "./browse_test.go", + SelectorArg: "." + s + "browse_test.go", }, baseRepo: ghrepo.New("bchadwic", "gh-graph"), defaultBranch: "trunk", @@ -267,7 +269,7 @@ func Test_runBrowse(t *testing.T) { { name: "relative path to file in parent folder from browse_test.go", opts: BrowseOptions{ - SelectorArg: "../pr", + SelectorArg: ".." + s + "pr", }, baseRepo: ghrepo.New("bchadwic", "gh-graph"), defaultBranch: "trunk", @@ -357,6 +359,7 @@ func Test_parseFileArg(t *testing.T) { func Test_parsePathFromFileArg(t *testing.T) { + s := string(os.PathSeparator) // tests assume path is pkg/cmd/browse tests := []struct { name string @@ -365,27 +368,27 @@ func Test_parsePathFromFileArg(t *testing.T) { }{ { name: "go to parent folder", - fileArg: "../", + fileArg: ".." + s, expectedPath: "pkg/cmd", }, { name: "file in current folder", - fileArg: "./browse.go", + fileArg: "." + s + "browse.go", expectedPath: "pkg/cmd/browse/browse.go", }, { name: "file within parent folder", - fileArg: "../browse.go", + fileArg: ".." + s + "browse.go", expectedPath: "pkg/cmd/browse.go", }, { name: "file within parent folder uncleaned", - fileArg: ".././//browse.go", + fileArg: ".." + s + "." + s + s + s + "browse.go", expectedPath: "pkg/cmd/browse.go", }, { name: "different path from root directory", - fileArg: "../../../internal/build/build.go", + fileArg: ".." + s + ".." + s + ".." + s + "internal/build/build.go", expectedPath: "internal/build/build.go", }, { @@ -400,12 +403,12 @@ func Test_parsePathFromFileArg(t *testing.T) { }, { name: "go out of repository", - fileArg: "../../../../../../", + fileArg: ".." + s + ".." + s + ".." + s + ".." + s + ".." + s + ".." + s + "", expectedPath: "", }, { name: "go to root of repository", - fileArg: "../../../", + fileArg: ".." + s + ".." + s + ".." + s + "", expectedPath: "", }, }