Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Test suite: fix "account blocked (connection limits exceeded)" #468

Merged
merged 2 commits into from Aug 25, 2016
Merged

Test suite: fix "account blocked (connection limits exceeded)" #468

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aadc8be
Fix RTN5: close remaining connections
ricardopereira Aug 24, 2016
c08d509
Fix: use `defer` to close the realtime connection
ricardopereira Aug 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 30 additions & 16 deletions Spec/RealtimeClientConnection.swift
View file
Open in desktop
Expand Up @@ -32,14 +32,14 @@ class RealtimeClientConnection: QuickSpec {
let client = ARTRealtime(options: options)
client.setTransportClass(TestProxyTransport.self)
client.connect()
defer { client.close() }

if let transport = client.transport as? TestProxyTransport, let url = transport.lastUrl {
expect(url.host).to(equal("realtime.ably.io"))
}
else {
XCTFail("MockTransport isn't working")
}
client.close()
}

it("should connect with query string params") {
Expand All @@ -49,6 +49,7 @@ class RealtimeClientConnection: QuickSpec {
let client = ARTRealtime(options: options)
client.setTransportClass(TestProxyTransport.self)
client.connect()
defer { client.close() }

waitUntil(timeout: testTimeout) { done in
client.connection.on { stateChange in
Expand All @@ -75,7 +76,6 @@ class RealtimeClientConnection: QuickSpec {
}
}
}
client.close()
}

it("should connect with query string params including clientId") {
Expand All @@ -87,6 +87,7 @@ class RealtimeClientConnection: QuickSpec {
let client = ARTRealtime(options: options)
client.setTransportClass(TestProxyTransport.self)
client.connect()
defer { client.close() }

waitUntil(timeout: testTimeout) { done in
client.connection.on { stateChange in
Expand Down Expand Up @@ -114,7 +115,6 @@ class RealtimeClientConnection: QuickSpec {
}
}
}
client.close()
}
}

Expand All @@ -126,8 +126,10 @@ class RealtimeClientConnection: QuickSpec {
// Default
expect(options.autoConnect).to(beTrue(), description: "autoConnect should be true by default")

let client = ARTRealtime(options: options)
defer { client.close() }
// The only way to control this functionality is with the options flag
ARTRealtime(options: options).connection.on { stateChange in
client.connection.on { stateChange in
let stateChange = stateChange!
let state = stateChange.current
let errorInfo = stateChange.reason
Expand All @@ -146,6 +148,7 @@ class RealtimeClientConnection: QuickSpec {
options.autoConnect = false

let client = ARTRealtime(options: options)
defer { client.close() }
var waiting = true

waitUntil(timeout: testTimeout) { done in
Expand All @@ -168,7 +171,6 @@ class RealtimeClientConnection: QuickSpec {
client.connect()
}
}
client.close()
}

// RTN4
Expand All @@ -181,6 +183,7 @@ class RealtimeClientConnection: QuickSpec {
options.disconnectedRetryTimeout = 0.0

let client = ARTRealtime(options: options)
defer { client.close() }
let connection = client.connection
var events: [ARTRealtimeConnectionState] = []

Expand Down Expand Up @@ -244,8 +247,6 @@ class RealtimeClientConnection: QuickSpec {
expect(events[5].rawValue).to(equal(ARTRealtimeConnectionState.Closed.rawValue), description: "Should be CLOSED state")
expect(events[6].rawValue).to(equal(ARTRealtimeConnectionState.Suspended.rawValue), description: "Should be SUSPENDED state")
expect(events[7].rawValue).to(equal(ARTRealtimeConnectionState.Failed.rawValue), description: "Should be FAILED state")

client.close()
}

// RTN4b
Expand All @@ -254,6 +255,7 @@ class RealtimeClientConnection: QuickSpec {
options.autoConnect = false

let client = ARTRealtime(options: options)
defer { client.close() }
let connection = client.connection
var events: [ARTRealtimeConnectionState] = []

Expand Down Expand Up @@ -283,13 +285,13 @@ class RealtimeClientConnection: QuickSpec {

expect(events[0].rawValue).to(equal(ARTRealtimeConnectionState.Connecting.rawValue), description: "Should be CONNECTING state")
expect(events[1].rawValue).to(equal(ARTRealtimeConnectionState.Connected.rawValue), description: "Should be CONNECTED state")

connection.close()
}

// RTN4c
it("should emit states when connection is closed") {
let connection = ARTRealtime(options: AblyTests.commonAppSetup()).connection
let client = ARTRealtime(options: AblyTests.commonAppSetup())
let connection = client.connection
defer { client.close() }
var events: [ARTRealtimeConnectionState] = []

waitUntil(timeout: testTimeout) { done in
Expand Down Expand Up @@ -319,15 +321,14 @@ class RealtimeClientConnection: QuickSpec {

expect(events[0].rawValue).to(equal(ARTRealtimeConnectionState.Closing.rawValue), description: "Should be CLOSING state")
expect(events[1].rawValue).to(equal(ARTRealtimeConnectionState.Closed.rawValue), description: "Should be CLOSED state")

connection.close()
}

// RTN4d
it("should have the current state") {
let options = AblyTests.commonAppSetup()
options.autoConnect = false
let client = ARTRealtime(options: options)
defer { client.close() }
let connection = client.connection
expect(connection.state.rawValue).to(equal(ARTRealtimeConnectionState.Initialized.rawValue), description: "Missing INITIALIZED state")

Expand All @@ -348,14 +349,13 @@ class RealtimeClientConnection: QuickSpec {
}
client.connect()
}

connection.close()
}

// RTN4f
it("should have the reason which contains an ErrorInfo") {
let options = AblyTests.commonAppSetup()
let client = ARTRealtime(options: options)
defer { client.close() }
let connection = client.connection

// TODO: ConnectionStateChange object
Expand All @@ -379,8 +379,6 @@ class RealtimeClientConnection: QuickSpec {
}

expect(errorInfo).toNot(beNil())

connection.close()
}
}

Expand All @@ -400,6 +398,11 @@ class RealtimeClientConnection: QuickSpec {
let channelName = "chat"

TotalReach.shared = 0
defer {
for client in disposable {
client.close()
}
}
for _ in 1...max {
let client = ARTRealtime(options: options)
disposable.append(client)
Expand Down Expand Up @@ -843,6 +846,11 @@ class RealtimeClientConnection: QuickSpec {
it("should have unique IDs") {
let options = AblyTests.commonAppSetup()
var disposable = [ARTRealtime]()
defer {
for client in disposable {
client.close()
}
}
var ids = [String]()
let max = 25

Expand Down Expand Up @@ -913,6 +921,11 @@ class RealtimeClientConnection: QuickSpec {
it("should have unique connection keys") {
let options = AblyTests.commonAppSetup()
var disposable = [ARTRealtime]()
defer {
for client in disposable {
client.close()
}
}
var keys = [String]()
let max = 25

Expand Down Expand Up @@ -2613,6 +2626,7 @@ class RealtimeClientConnection: QuickSpec {
}

client.connect()
defer { client.close() }

expect(urlConnections).toEventually(haveCount(2), timeout: testTimeout)

Expand Down