commands: Fix TestFixURL - hugo - [fork] hugo port for 9front
HTML git clone git@git.drkhsh.at/hugo.git
DIR Log
DIR Files
DIR Refs
DIR Submodules
DIR README
DIR LICENSE
---
DIR commit 1e233b1c4598fd8cbce7da8a67bf2c4918c6047e
DIR parent b110d0ae04e13fb45c739bcebb580709745082e6
HTML Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Wed, 11 Apr 2018 08:55:50 +0200
commands: Fix TestFixURL
See #4598
Diffstat:
M commands/server_test.go | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
---
DIR diff --git a/commands/server_test.go b/commands/server_test.go
@@ -13,12 +13,13 @@
package commands
-// "testing"
+import (
+ "testing"
-// "github.com/spf13/viper"
+ "github.com/spf13/viper"
+)
-// TODO(bep) cli refactor fix me
-/*func TestFixURL(t *testing.T) {
+func TestFixURL(t *testing.T) {
type data struct {
TestName string
CLIBaseURL string
@@ -41,12 +42,13 @@ package commands
}
for i, test := range tests {
+ s := newServerCmd()
v := viper.New()
- baseURL = test.CLIBaseURL
+ baseURL := test.CLIBaseURL
v.Set("baseURL", test.CfgBaseURL)
- serverAppend = test.AppendPort
- serverPort = test.Port
- result, err := fixURL(v, baseURL, serverPort)
+ s.serverAppend = test.AppendPort
+ s.serverPort = test.Port
+ result, err := s.fixURL(v, baseURL, s.serverPort)
if err != nil {
t.Errorf("Test #%d %s: unexpected error %s", i, test.TestName, err)
}
@@ -55,4 +57,3 @@ package commands
}
}
}
-*/