Merge pull request #133 from dominikschulz/fix/lint

[chore] Fix copyloopvar finding
gopasspw · Oct 5, 2024 · 66fef18 · 66fef18
2 parents 9bf84b4 + 69a881a
commit 66fef18
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/internal/jsonapi/api_test.go b/internal/jsonapi/api_test.go
@@ -148,7 +148,6 @@ login_fields: "invalid"`)},
 			out:  `{"username":"thelogin","password":"thepass"}`,
 		},
 	} {
-		tc := tc
 		t.Run(tc.desc, func(t *testing.T) {
 			t.Parallel()
 

diff --git a/internal/jsonapi/manifest/manifest_path_darwin.go b/internal/jsonapi/manifest/manifest_path_darwin.go
@@ -2,22 +2,23 @@ package manifest
 
 var manifestPaths = &manifestPath{
 	local: map[string]string{
-		"firefox":  "~/Library/Application Support/Mozilla/NativeMessagingHosts",
+		"arc":      "~/Library/Application Support/Arc/User Data/NativeMessagingHosts",
+		"brave":    "~/Library/Application Support/Brave/NativeMessagingHosts",
 		"chrome":   "~/Library/Application Support/Google/Chrome/NativeMessagingHosts",
 		"chromium": "~/Library/Application Support/Chromium/NativeMessagingHosts",
-		"brave":    "~/Library/Application Support/Brave/NativeMessagingHosts",
-		"vivaldi":  "~/Library/Application Support/Vivaldi/NativeMessagingHosts",
+		"firefox":  "~/Library/Application Support/Mozilla/NativeMessagingHosts",
 		"iridium":  "~/Library/Application Support/Iridium/NativeMessagingHosts",
 		"slimjet":  "~/Library/Application Support/Slimjet/NativeMessagingHosts",
-		"arc": 	    "~/Library/Application Support/Arc/User Data/NativeMessagingHosts",
+		"vivaldi":  "~/Library/Application Support/Vivaldi/NativeMessagingHosts",
 	},
 	global: map[string]string{
-		"firefox":  "/Library/Application Support/Mozilla/NativeMessagingHosts",
+		"arc":      "/Library/Application Support/Arc/User Data/NativeMessagingHosts",
+		"brave":    "/Library/Application Support/Brave/NativeMessagingHosts",
 		"chrome":   "/Library/Google/Chrome/NativeMessagingHosts",
 		"chromium": "/Library/Application Support/Chromium/NativeMessagingHosts",
-		"brave":    "/Library/Application Support/Brave/NativeMessagingHosts",
-		"vivaldi":  "/Library/Application Support/Vivaldi/NativeMessagingHosts",
+		"firefox":  "/Library/Application Support/Mozilla/NativeMessagingHosts",
 		"iridium":  "/Library/Application Support/Iridium/NativeMessagingHosts",
 		"slimjet":  "/Library/Application Support/Slimjet/NativeMessagingHosts",
+		"vivaldi":  "/Library/Application Support/Vivaldi/NativeMessagingHosts",
 	},
 }
diff --git a/internal/jsonapi/manifest/setup_test.go b/internal/jsonapi/manifest/setup_test.go
@@ -54,5 +54,8 @@ func TestValidBrowsers(t *testing.T) {
 	if runtime.GOOS == "windows" {
 		validBrowsers = []string{"chrome", "chromium", "firefox"}
 	}
-	assert.Equal(t, validBrowsers, ValidBrowsers())
+	if runtime.GOOS == "darwin" {
+		validBrowsers = append(validBrowsers, "arc")
+	}
+	assert.ElementsMatch(t, validBrowsers, ValidBrowsers())
 }
diff --git a/internal/jsonapi/responses_test.go b/internal/jsonapi/responses_test.go
@@ -27,7 +27,6 @@ func TestGetUsername(t *testing.T) {
 			Out:  "foo",
 		},
 	} {
-		tc := tc
 		t.Run(tc.Name, func(t *testing.T) {
 			t.Parallel()
 			assert.Equal(t, tc.Out, a.getUsername(tc.Name, tc.Sec), "Wrong Username")