Fix build (#63)

* Fix test under go 1.14 * Update package-lock.json
mattermost · Mar 30, 2020 · fdde4b5 · fdde4b5
1 parent e58eca8
commit fdde4b5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/server/utils/httputils/utils_test.go b/server/utils/httputils/utils_test.go
@@ -28,15 +28,15 @@ func TestNormalizeRemoteBaseURL(t *testing.T) {
 
 		// Errors
 		{"[jdsh", "", "",
-			`parse //[jdsh: missing ']' in host`},
+			`parse "//[jdsh": missing ']' in host`},
 		{"/mmtest", "", "",
 			`Invalid URL, no hostname: "/mmtest"`},
 		{"/mmtest/", "", "",
 			`Invalid URL, no hostname: "/mmtest/"`},
 		{"http:/mmtest/", "", "",
 			`Invalid URL, no hostname: "http:/mmtest/"`},
 		{"hƒƒp://xyz.com", "", "",
-			`parse hƒƒp://xyz.com: first path segment in URL cannot contain colon`},
+			`parse "hƒƒp://xyz.com": first path segment in URL cannot contain colon`},
 		{"https://mattermost.site.url", "https://mattermost.site.url/", "",
 			"https://mattermost.site.url is the Mattermost site URL. Please use the remote application's URL."},
 	} {

diff --git a/webapp/package-lock.json b/webapp/package-lock.json