diff options
author | Chris <ccbrown112@gmail.com> | 2017-10-16 08:09:43 -0700 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-10-16 11:09:43 -0400 |
commit | 34285d8cca93fc0f473636e78680fade03f26bda (patch) | |
tree | b8274ed8d17e5dc63ac36aadac7e7299635d2b43 /api/websocket_test.go | |
parent | adb2b1d6eddabea803af8fa6cf53a75c98694427 (diff) | |
download | chat-34285d8cca93fc0f473636e78680fade03f26bda.tar.gz chat-34285d8cca93fc0f473636e78680fade03f26bda.tar.bz2 chat-34285d8cca93fc0f473636e78680fade03f26bda.zip |
parallel tests (#7629)
Diffstat (limited to 'api/websocket_test.go')
-rw-r--r-- | api/websocket_test.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/api/websocket_test.go b/api/websocket_test.go index 161ea4960..42604124b 100644 --- a/api/websocket_test.go +++ b/api/websocket_test.go @@ -4,6 +4,7 @@ package api import ( + "fmt" //"encoding/json" //"net/http" "net/http" @@ -323,7 +324,7 @@ func TestWebsocketOriginSecurity(t *testing.T) { th := Setup().InitBasic() defer th.TearDown() - url := "ws://localhost" + *utils.Cfg.ServiceSettings.ListenAddress + url := fmt.Sprintf("ws://localhost:%v", th.App.Srv.ListenAddr.Port) // Should fail because origin doesn't match _, _, err := websocket.DefaultDialer.Dial(url+model.API_URL_SUFFIX_V3+"/users/websocket", http.Header{ @@ -335,7 +336,7 @@ func TestWebsocketOriginSecurity(t *testing.T) { // We are not a browser so we can spoof this just fine _, _, err = websocket.DefaultDialer.Dial(url+model.API_URL_SUFFIX_V3+"/users/websocket", http.Header{ - "Origin": []string{"http://localhost" + *utils.Cfg.ServiceSettings.ListenAddress}, + "Origin": []string{fmt.Sprintf("http://localhost:%v", th.App.Srv.ListenAddr.Port)}, }) if err != nil { t.Fatal(err) |