Merge pull request #11 from rande/remove_test_function_from_main_code

feat(test): remove testing helper functions from the main code
rande · Jun 13, 2018 · b121ece · b121ece
2 parents 60438a1 + a2b1681
commit b121ece
Show file tree

Hide file tree

Showing 31 changed files with 182 additions and 145 deletions.
diff --git a/cli/main.go b/cli/main.go
@@ -1,16 +1,17 @@
-// Copyright © 2016 Thomas Rabaix <thomas.rabaix@gmail.com>.
+// Copyright © 2016-present Thomas Rabaix <thomas.rabaix@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
 package main
 
 import (
+	"os"
+
 	"github.com/mitchellh/cli"
 	"github.com/rande/gitlab-ci-helper/commands"
 	"github.com/rande/gitlab-ci-helper/integrations/flowdock"
 	"github.com/rande/gitlab-ci-helper/integrations/hipchat"
-	"os"
 )
 
 var (

diff --git a/commands/ci_dump_meta.go b/commands/ci_dump_meta.go
@@ -1,4 +1,4 @@
-// Copyright © 2016 Thomas Rabaix <thomas.rabaix@gmail.com>.
+// Copyright © 2016-present Thomas Rabaix <thomas.rabaix@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
@@ -9,10 +9,11 @@ import (
 	"bytes"
 	"encoding/json"
 	"flag"
-	"github.com/mitchellh/cli"
-	helper "github.com/rande/gitlab-ci-helper"
 	"os"
 	"strings"
+
+	"github.com/mitchellh/cli"
+	helper "github.com/rande/gitlab-ci-helper"
 )
 
 type MetaBuild struct {

diff --git a/commands/ci_dump_meta_test.go b/commands/ci_dump_meta_test.go
@@ -1,4 +1,4 @@
-// Copyright © 2016 Thomas Rabaix <thomas.rabaix@gmail.com>.
+// Copyright © 2016-present Thomas Rabaix <thomas.rabaix@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
@@ -8,12 +8,13 @@ package commands
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/mitchellh/cli"
-	helper "github.com/rande/gitlab-ci-helper"
-	"github.com/stretchr/testify/assert"
 	"net/http/httptest"
 	"os"
 	"testing"
+
+	"github.com/mitchellh/cli"
+	helper "github.com/rande/gitlab-ci-helper"
+	"github.com/stretchr/testify/assert"
 )
 
 func Test_Ci_Dump_Meta(t *testing.T) {

diff --git a/commands/ci_dump_revision.go b/commands/ci_dump_revision.go
@@ -1,4 +1,4 @@
-// Copyright © 2016 Thomas Rabaix <thomas.rabaix@gmail.com>.
+// Copyright © 2016-present Thomas Rabaix <thomas.rabaix@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
@@ -7,10 +7,11 @@ package commands
 
 import (
 	"flag"
-	"github.com/mitchellh/cli"
-	helper "github.com/rande/gitlab-ci-helper"
 	"os"
 	"strings"
+
+	"github.com/mitchellh/cli"
+	helper "github.com/rande/gitlab-ci-helper"
 )
 
 type CiDumpRevisionCommand struct {

diff --git a/commands/ci_dump_revision_test.go b/commands/ci_dump_revision_test.go
@@ -1,4 +1,4 @@
-// Copyright © 2016 Thomas Rabaix <thomas.rabaix@gmail.com>.
+// Copyright © 2016-present Thomas Rabaix <thomas.rabaix@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
@@ -7,13 +7,14 @@ package commands
 
 import (
 	"fmt"
-	"github.com/mitchellh/cli"
-	helper "github.com/rande/gitlab-ci-helper"
-	"github.com/stretchr/testify/assert"
 	"io/ioutil"
 	"net/http/httptest"
 	"os"
 	"testing"
+
+	"github.com/mitchellh/cli"
+	helper "github.com/rande/gitlab-ci-helper"
+	"github.com/stretchr/testify/assert"
 )
 
 func Test_Ci_Dump_Revision(t *testing.T) {

diff --git a/commands/dump_readme.go b/commands/dump_readme.go
@@ -1,4 +1,4 @@
-// Copyright © 2016 Thomas Rabaix <thomas.rabaix@gmail.com>.
+// Copyright © 2016-present Thomas Rabaix <thomas.rabaix@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
@@ -8,9 +8,10 @@ package commands
 import (
 	"flag"
 	"fmt"
-	"github.com/mitchellh/cli"
 	"sort"
 	"strings"
+
+	"github.com/mitchellh/cli"
 )
 
 type DumpReadmeCommand struct {

diff --git a/commands/dump_readme_test.go b/commands/dump_readme_test.go
@@ -1,14 +1,15 @@
-// Copyright © 2016 Thomas Rabaix <thomas.rabaix@gmail.com>.
+// Copyright © 2016-present Thomas Rabaix <thomas.rabaix@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
 package commands
 
 import (
+	"testing"
+
 	"github.com/mitchellh/cli"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Dump_Readme(t *testing.T) {

diff --git a/commands/project_build_artifacts.go b/commands/project_build_artifacts.go
@@ -1,4 +1,4 @@
-// Copyright © 2016 Thomas Rabaix <thomas.rabaix@gmail.com>.
+// Copyright © 2016-present Thomas Rabaix <thomas.rabaix@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
@@ -8,13 +8,14 @@ package commands
 import (
 	"flag"
 	"fmt"
-	"github.com/mitchellh/cli"
-	gitlab "github.com/plouc/go-gitlab-client"
-	helper "github.com/rande/gitlab-ci-helper"
 	"io"
 	"os"
 	"strconv"
 	"strings"
+
+	"github.com/mitchellh/cli"
+	gitlab "github.com/plouc/go-gitlab-client"
+	helper "github.com/rande/gitlab-ci-helper"
 )
 
 type ProjectBuildArtifactCommand struct {

diff --git a/commands/project_build_artifacts_test.go b/commands/project_build_artifacts_test.go
@@ -1,18 +1,19 @@
-// Copyright © 2016 Thomas Rabaix <thomas.rabaix@gmail.com>.
+// Copyright © 2016-present Thomas Rabaix <thomas.rabaix@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
 package commands
 
 import (
-	"github.com/mitchellh/cli"
-	helper "github.com/rande/gitlab-ci-helper"
-	"github.com/stretchr/testify/assert"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"testing"
+
+	"github.com/mitchellh/cli"
+	helper "github.com/rande/gitlab-ci-helper"
+	"github.com/stretchr/testify/assert"
 )
 
 func Test_Project_Builds_Artifacts(t *testing.T) {

diff --git a/commands/project_builds_list.go b/commands/project_builds_list.go
@@ -1,4 +1,4 @@
-// Copyright © 2016 Thomas Rabaix <thomas.rabaix@gmail.com>.
+// Copyright © 2016-present Thomas Rabaix <thomas.rabaix@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
@@ -8,11 +8,12 @@ package commands
 import (
 	"flag"
 	"fmt"
+	"strconv"
+	"strings"
+
 	"github.com/mitchellh/cli"
 	gitlab "github.com/plouc/go-gitlab-client"
 	helper "github.com/rande/gitlab-ci-helper"
-	"strconv"
-	"strings"
 )
 
 var (

diff --git a/commands/project_builds_list_test.go b/commands/project_builds_list_test.go
@@ -1,18 +1,19 @@
-// Copyright © 2016 Thomas Rabaix <thomas.rabaix@gmail.com>.
+// Copyright © 2016-present Thomas Rabaix <thomas.rabaix@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
 package commands
 
 import (
-	"github.com/mitchellh/cli"
-	helper "github.com/rande/gitlab-ci-helper"
-	"github.com/stretchr/testify/assert"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"testing"
+
+	"github.com/mitchellh/cli"
+	helper "github.com/rande/gitlab-ci-helper"
+	"github.com/stretchr/testify/assert"
 )
 
 func Test_Project_BuildsList_From_Args(t *testing.T) {

diff --git a/commands/project_list.go b/commands/project_list.go
@@ -1,4 +1,4 @@
-// Copyright © 2016 Thomas Rabaix <thomas.rabaix@gmail.com>.
+// Copyright © 2016-present Thomas Rabaix <thomas.rabaix@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
@@ -8,10 +8,11 @@ package commands
 import (
 	"flag"
 	"fmt"
+	"strings"
+
 	"github.com/mitchellh/cli"
 	gitlab "github.com/plouc/go-gitlab-client"
 	helper "github.com/rande/gitlab-ci-helper"
-	"strings"
 )
 
 type ProjectsListCommand struct {

diff --git a/commands/project_list_test.go b/commands/project_list_test.go
@@ -1,18 +1,19 @@
-// Copyright © 2016 Thomas Rabaix <thomas.rabaix@gmail.com>.
+// Copyright © 2016-present Thomas Rabaix <thomas.rabaix@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
 package commands
 
 import (
-	"github.com/mitchellh/cli"
-	helper "github.com/rande/gitlab-ci-helper"
-	"github.com/stretchr/testify/assert"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"testing"
+
+	"github.com/mitchellh/cli"
+	helper "github.com/rande/gitlab-ci-helper"
+	"github.com/stretchr/testify/assert"
 )
 
 func Test_Project_List(t *testing.T) {

diff --git a/commands/s3_archive.go b/commands/s3_archive.go
@@ -1,4 +1,4 @@
-// Copyright © 2016 Thomas Rabaix <thomas.rabaix@gmail.com>.
+// Copyright © 2016-present Thomas Rabaix <thomas.rabaix@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.

diff --git a/commands/s3_archive_test.go b/commands/s3_archive_test.go
@@ -1,14 +1,15 @@
-// Copyright © 2016 Thomas Rabaix <thomas.rabaix@gmail.com>.
+// Copyright © 2016-present Thomas Rabaix <thomas.rabaix@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
 package commands
 
 import (
+	"testing"
+
 	"github.com/mitchellh/cli"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_S3ArchiveCommand_Help(t *testing.T) {

diff --git a/commands/s3_extract.go b/commands/s3_extract.go
@@ -1,4 +1,4 @@
-// Copyright © 2016 Thomas Rabaix <thomas.rabaix@gmail.com>.
+// Copyright © 2016-present Thomas Rabaix <thomas.rabaix@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.

diff --git a/commands/s3_extract_test.go b/commands/s3_extract_test.go
@@ -1,14 +1,15 @@
-// Copyright © 2016 Thomas Rabaix <thomas.rabaix@gmail.com>.
+// Copyright © 2016-present Thomas Rabaix <thomas.rabaix@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
 package commands
 
 import (
+	"testing"
+
 	"github.com/mitchellh/cli"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_S3ExtractCommand_Help(t *testing.T) {

diff --git a/commands/version.go b/commands/version.go
@@ -1,4 +1,4 @@
-// Copyright © 2016 Thomas Rabaix <thomas.rabaix@gmail.com>.
+// Copyright © 2016-present Thomas Rabaix <thomas.rabaix@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
@@ -8,8 +8,9 @@ package commands
 import (
 	"flag"
 	"fmt"
-	"github.com/mitchellh/cli"
 	"strings"
+
+	"github.com/mitchellh/cli"
 )
 
 type VersionCommand struct {

diff --git a/commands/version_test.go b/commands/version_test.go
@@ -1,14 +1,15 @@
-// Copyright © 2016 Thomas Rabaix <thomas.rabaix@gmail.com>.
+// Copyright © 2016-present Thomas Rabaix <thomas.rabaix@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
 package commands
 
 import (
+	"testing"
+
 	"github.com/mitchellh/cli"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func Test_Version(t *testing.T) {

diff --git a/config.go b/config.go
@@ -1,4 +1,4 @@
-// Copyright © 2016 Thomas Rabaix <thomas.rabaix@gmail.com>.
+// Copyright © 2016-present Thomas Rabaix <thomas.rabaix@gmail.com>.
 //
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.