-
-
Notifications
You must be signed in to change notification settings - Fork 113
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.
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
Fix main.go generation when executing on a windows machine #32
Merged
mholt
merged 4 commits into
caddyserver:master
from
jaysonsantos:windows-import-path-fix
Sep 25, 2020
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
57b3486
Fix main.go generation when executing on a windows machine
jaysonsantos 90afea0
Apply CR suggestions
jaysonsantos cbeddd0
Add test cases for sub-paths on normalizeImportPath
jaysonsantos 05fcc30
Run windows tests only when GOOS matches
jaysonsantos File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -71,3 +71,34 @@ func TestSplitWith(t *testing.T) { | |||||
} | ||||||
} | ||||||
} | ||||||
|
||||||
func Test_normalizeImportPath(t *testing.T) { | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
type args struct { | ||||||
currentModule string | ||||||
cwd string | ||||||
moduleDir string | ||||||
} | ||||||
tests := []struct { | ||||||
name string | ||||||
args args | ||||||
want string | ||||||
}{ | ||||||
{"linux-path", args{ | ||||||
currentModule: "github.com/caddyserver/xcaddy", | ||||||
cwd: "/xcaddy", | ||||||
moduleDir: "/xcaddy", | ||||||
}, "github.com/caddyserver/xcaddy"}, | ||||||
{"windows-path", args{ | ||||||
currentModule: "github.com/caddyserver/xcaddy", | ||||||
cwd: "c:\\xcaddy", | ||||||
moduleDir: "c:\\xcaddy", | ||||||
}, "github.com/caddyserver/xcaddy"}, | ||||||
} | ||||||
for _, tt := range tests { | ||||||
t.Run(tt.name, func(t *testing.T) { | ||||||
if got := normalizeImportPath(tt.args.currentModule, tt.args.cwd, tt.args.moduleDir); got != tt.want { | ||||||
t.Errorf("normalizeImportPath() = %v, want %v", got, tt.want) | ||||||
} | ||||||
}) | ||||||
} | ||||||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.