Using RxBlocking on tests

Author: fjcaetano

.travis.yml

@@ -5,4 +5,4 @@ install:
   - ./install_dependencies.sh
 
 script:
-  - fastlane ci
+  - bundle exec fastlane ci

Classes/RxWebSocket.swift

@@ -33,7 +33,8 @@ open class RxWebSocket: WebSocket {
         case data(Data)
     }
 
-    fileprivate let publishStream: PublishSubject<StreamEvent>
+    fileprivate let connectSubject: ReplaySubject<StreamEvent>
+    fileprivate let eventSubject: PublishSubject<StreamEvent>
 
     /**
      - parameters:
@@ -47,15 +48,18 @@ open class RxWebSocket: WebSocket {
      */
     override public init(request: URLRequest, protocols: [String]? = nil, stream: WSStream = FoundationStream()) {
         let publish = PublishSubject<StreamEvent>()
-        publishStream = publish
+        eventSubject = publish
+
+        let replay = ReplaySubject<StreamEvent>.create(bufferSize: 1)
+        connectSubject = replay
 
         super.init(request: request, protocols: protocols, stream: stream)
 
-        super.onConnect = { publish.onNext(.connect) }
-        super.onDisconnect = { publish.onNext(.disconnect($0)) }
+        super.onConnect = { replay.onNext(.connect) }
         super.onText = { publish.onNext(.text($0)) }
         super.onData = { publish.onNext(.data($0)) }
         super.onPong = { publish.onNext(.pong($0)) }
+        super.onDisconnect = { replay.onNext(.disconnect($0)) }
 
         connect()
     }
@@ -152,7 +156,7 @@ public extension Reactive where Base: RxWebSocket {
     }
 
     /// The stream of messages received by the websocket.
-    public var stream: Observable<RxWebSocket.StreamEvent> {
-        return base.publishStream.asObservable()
+    public var stream: Observable<Base.StreamEvent> {
+        return Observable.merge(base.connectSubject, base.eventSubject)
     }
 }

Example/Podfile

@@ -6,10 +6,4 @@ use_frameworks!
 
 target 'RxWebSocket_Example' do
     pod 'RxWebSocket', :path => '../'
-
-    pod 'SwiftLint', '~> 0.23.1'
-
-    target 'RxWebSocket_Tests' do
-        inherit! :search_paths
-    end
 end

Example/Podfile.lock

@@ -7,11 +7,9 @@ PODS:
     - RxSwift (~> 4.0)
     - Starscream (~> 3.0)
   - Starscream (3.0.2)
-  - SwiftLint (0.23.1)
 
 DEPENDENCIES:
   - RxWebSocket (from `../`)
-  - SwiftLint (~> 0.23.1)
 
 EXTERNAL SOURCES:
   RxWebSocket:
@@ -22,8 +20,7 @@ SPEC CHECKSUMS:
   RxSwift: fd680d75283beb5e2559486f3c0ff852f0d35334
   RxWebSocket: 92e3b508c1edc110ae99db695c64c83326e2cf70
   Starscream: b512c62f6706421221b5ceb2ba01a9f58aca5bea
-  SwiftLint: 1b670ce79284c76520f84060e87d645078fd32fa
 
-PODFILE CHECKSUM: 456db7708e72ed614ed2493176db7ce5f5302def
+PODFILE CHECKSUM: 2856c9d589b1d945bedd888ba5283bf79d28af3b
 
 COCOAPODS: 1.3.1