Fix port flag

caalberts · Jul 19, 2018 · 4155eef · 4155eef
1 parent 8907f72
commit 4155eef
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/cmd/localroast/main.go b/cmd/localroast/main.go
@@ -7,13 +7,13 @@ import (
 	"github.com/caalberts/localroast/json"
 )
 
-var port = flag.String("port", "8080", "port number")
-
 func main() {
+	port := flag.String("port", "8080", "port number")
+
 	flag.Parse()
 	args := flag.Args()
 
-	err := json.NewCommand().Execute(args)
+	err := json.NewCommand().Execute(*port, args)
 	if err != nil {
 		log.Fatal(err)
 	}

diff --git a/json/command.go b/json/command.go
@@ -32,7 +32,7 @@ func NewCommand() Command {
 }
 
 // Execute runs the command and start a server.
-func (c Command) Execute(args []string) error {
+func (c Command) Execute(port string, args []string) error {
 	bytes, err := c.r.Read(args)
 	if err != nil {
 		return err
@@ -43,7 +43,7 @@ func (c Command) Execute(args []string) error {
 		return err
 	}
 
-	server := c.s("8080", schema)
+	server := c.s(port, schema)
 
 	return server.ListenAndServe()
 }
diff --git a/json/command_test.go b/json/command_test.go
@@ -37,14 +37,18 @@ func (m *mockServer) ListenAndServe() error {
 	return args.Error(0)
 }
 
+var port = "8080"
+
 func TestExecuteJSONCommand(t *testing.T) {
 	r := new(mockReader)
 	p := new(mockParser)
 	s := new(mockServer)
 
 	var parsedSchema []localroast.Schema
+	var serverPort string
 	sFunc := func(port string, schemas []localroast.Schema) http.Server {
 		parsedSchema = schemas
+		serverPort = port
 		return s
 	}
 
@@ -63,10 +67,11 @@ func TestExecuteJSONCommand(t *testing.T) {
 	s.On("ListenAndServe").Return(nil)
 
 	cmd := Command{r, p, sFunc}
-	err := cmd.Execute(args)
+	err := cmd.Execute(port, args)
 
 	assert.Nil(t, err)
 	assert.Equal(t, mockSchema, parsedSchema)
+	assert.Equal(t, port, serverPort)
 
 	r.AssertExpectations(t)
 	p.AssertExpectations(t)
@@ -86,7 +91,7 @@ func TestReadError(t *testing.T) {
 	r.On("Read", args).Return([]byte(""), errors.New(errorMsg))
 
 	cmd := Command{r, p, sFunc}
-	err := cmd.Execute(args)
+	err := cmd.Execute(port, args)
 
 	assert.NotNil(t, err)
 	assert.Equal(t, "Failed to read file", err.Error())
@@ -111,7 +116,7 @@ func TestParseError(t *testing.T) {
 	p.On("Parse", mockResult).Return([]localroast.Schema{}, errors.New(errorMsg))
 
 	cmd := Command{r, p, sFunc}
-	err := cmd.Execute(args)
+	err := cmd.Execute(port, args)
 
 	assert.NotNil(t, err)
 	assert.Equal(t, errorMsg, err.Error())