cheykrym/socket.io-client-swift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
* master:
  Updates test
  Adds missing character for url percent encoding
This commit is contained in:
Erik Little 2019-10-17 06:06:26 -04:00
commit cb74f6ca55
No known key found for this signature in database
GPG Key ID: 62F837E56F4E9320
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/SocketIO/Util/SocketExtensions.swift
View File

@ -38,7 +38,7 @@ extension Array {
extension CharacterSet { extension CharacterSet {
static var allowedURLCharacterSet: CharacterSet { static var allowedURLCharacterSet: CharacterSet {
return CharacterSet(charactersIn: "!*'();:@&=+$,/?%#[]\" {}^").inverted return CharacterSet(charactersIn: "!*'();:@&=+$,/?%#[]\" {}^|").inverted
} }
} }

6
Tests/TestSocketIO/SocketEngineTest.swift
View File

@ -87,11 +87,11 @@ class SocketEngineTest: XCTestCase {
XCTAssertEqual(engine.urlWebSocket.query, "transport=websocket&created=2016-05-04T18%3A31%3A15%2B0200") XCTAssertEqual(engine.urlWebSocket.query, "transport=websocket&created=2016-05-04T18%3A31%3A15%2B0200")
engine.connectParams = [ engine.connectParams = [
"forbidden": "!*'();:@&=+$,/?%#[]\" {}^" "forbidden": "!*'();:@&=+$,/?%#[]\" {}^|"
] ]
XCTAssertEqual(engine.urlPolling.query, "transport=polling&b64=1&forbidden=%21%2A%27%28%29%3B%3A%40%26%3D%2B%24%2C%2F%3F%25%23%5B%5D%22%20%7B%7D%5E") XCTAssertEqual(engine.urlPolling.query, "transport=polling&b64=1&forbidden=%21%2A%27%28%29%3B%3A%40%26%3D%2B%24%2C%2F%3F%25%23%5B%5D%22%20%7B%7D%5E%7C")
XCTAssertEqual(engine.urlWebSocket.query, "transport=websocket&forbidden=%21%2A%27%28%29%3B%3A%40%26%3D%2B%24%2C%2F%3F%25%23%5B%5D%22%20%7B%7D%5E") XCTAssertEqual(engine.urlWebSocket.query, "transport=websocket&forbidden=%21%2A%27%28%29%3B%3A%40%26%3D%2B%24%2C%2F%3F%25%23%5B%5D%22%20%7B%7D%5E%7C")
} }
func testBase64Data() { func testBase64Data() {