From 3595662729480fb17cd5ef4647fc6c7839dd100e Mon Sep 17 00:00:00 2001 From: Erik Little Date: Sun, 12 Nov 2017 10:32:59 -0500 Subject: [PATCH] don't return optional from defaultSocket --- Source/SocketIO/Manager/SocketManager.swift | 2 +- Source/SocketIO/Manager/SocketManagerSpec.swift | 2 +- Tests/TestSocketIO/SocketParserTest.swift | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/SocketIO/Manager/SocketManager.swift b/Source/SocketIO/Manager/SocketManager.swift index f07dbb3..95e56e7 100644 --- a/Source/SocketIO/Manager/SocketManager.swift +++ b/Source/SocketIO/Manager/SocketManager.swift @@ -49,7 +49,7 @@ open class SocketManager : NSObject, SocketManagerSpec, SocketParsable, SocketDa // MARK Properties /// The socket associated with the default namespace ("/"). - public var defaultSocket: SocketIOClient? { + public var defaultSocket: SocketIOClient { return socket(forNamespace: "/") } diff --git a/Source/SocketIO/Manager/SocketManagerSpec.swift b/Source/SocketIO/Manager/SocketManagerSpec.swift index 9eb373c..8973f43 100644 --- a/Source/SocketIO/Manager/SocketManagerSpec.swift +++ b/Source/SocketIO/Manager/SocketManagerSpec.swift @@ -50,7 +50,7 @@ public protocol SocketManagerSpec : class, SocketEngineClient { // MARK: Properties /// Returns the socket associated with the default namespace ("/"). - var defaultSocket: SocketIOClient? { get } + var defaultSocket: SocketIOClient { get } /// The engine for this manager. var engine: SocketEngineSpec? { get set } diff --git a/Tests/TestSocketIO/SocketParserTest.swift b/Tests/TestSocketIO/SocketParserTest.swift index 285d7e8..2ac1301 100644 --- a/Tests/TestSocketIO/SocketParserTest.swift +++ b/Tests/TestSocketIO/SocketParserTest.swift @@ -106,7 +106,7 @@ class SocketParserTest: XCTestCase { func validateParseResult(_ message: String) { let validValues = SocketParserTest.packetTypes[message]! let packet = try! testManager.parseString(message) - let type = String(message.characters.prefix(1)) + let type = String(message.prefix(1)) XCTAssertEqual(packet.type, SocketPacket.PacketType(rawValue: Int(type) ?? -1)!) XCTAssertEqual(packet.nsp, validValues.0)