Merge pull request #423 from CircleCI-Public/windows-unit-tests

Make more tests pass on Windows
CircleCI-Public · Jun 5, 2020 · 423e103 · 423e103
2 parents fa5217e + 2da8caf
commit 423e103
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/cmd/check_test.go b/cmd/check_test.go
@@ -81,6 +81,13 @@ var _ = Describe("Check", func() {
 		"label": "short description",
         "content_type": "application/zip",
 		"size": 1024
+      },
+      {
+        "id": 1,
+        "name": "windows_amd64.tar.gz",
+        "label": "short description",
+        "content_type": "application/zip",
+        "size": 1024
       }
     ]
   }

diff --git a/cmd/setup_test.go b/cmd/setup_test.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"os/exec"
 	"regexp"
+	"runtime"
 
 	"github.com/CircleCI-Public/circleci-cli/clitest"
 	. "github.com/onsi/ginkgo"
@@ -50,7 +51,9 @@ var _ = Describe("Setup with prompts", func() {
 
 			fileInfo, err := os.Stat(tempSettings.Config.Path)
 			Expect(err).ToNot(HaveOccurred())
-			Expect(fileInfo.Mode().Perm().String()).To(Equal("-rw-------"))
+			if runtime.GOOS != "windows" {
+				Expect(fileInfo.Mode().Perm().String()).To(Equal("-rw-------"))
+			}
 		})
 	})
 
@@ -63,7 +66,9 @@ var _ = Describe("Setup with prompts", func() {
 
 			fileInfo, err := os.Stat(tempSettings.Config.Path)
 			Expect(err).ToNot(HaveOccurred())
-			Expect(fileInfo.Mode().Perm().String()).To(Equal("-rw-------"))
+			if runtime.GOOS != "windows" {
+				Expect(fileInfo.Mode().Perm().String()).To(Equal("-rw-------"))
+			}
 		})
 
 		Describe("token and host set in config file", func() {

diff --git a/cmd/setup_unit_test.go b/cmd/setup_unit_test.go
@@ -5,6 +5,7 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+	"runtime"
 
 	"github.com/CircleCI-Public/circleci-cli/client"
 	"github.com/CircleCI-Public/circleci-cli/clitest"
@@ -93,12 +94,15 @@ var _ = Describe("Setup with prompts", func() {
 
 		Describe("new config file", func() {
 			It("should set file permissions to 0600", func() {
+
 				err := setup(opts)
 				Expect(err).ShouldNot(HaveOccurred())
 
 				fileInfo, err := os.Stat(tempSettings.Config.Path)
 				Expect(err).ToNot(HaveOccurred())
-				Expect(fileInfo.Mode().Perm().String()).To(Equal("-rw-------"))
+				if runtime.GOOS != "windows" {
+					Expect(fileInfo.Mode().Perm().String()).To(Equal("-rw-------"))
+				}
 			})
 		})
 

diff --git a/cmd/update_test.go b/cmd/update_test.go
@@ -45,6 +45,13 @@ var _ = Describe("Update", func() {
 		"label": "short description",
         "content_type": "application/zip",
 		"size": 1024
+      },
+      {
+        "id": 1,
+        "name": "windows_amd64.tar.gz",
+        "label": "short description",
+        "content_type": "application/zip",
+        "size": 1024
       }
     ]
   }