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

Fix RTL6g1 test. #258

Merged
merged 1 commit into from
Feb 29, 2016
Merged

Fix RTL6g1 test. #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ably-ios/ARTBaseMessage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ART_ASSUME_NONNULL_BEGIN
@property (strong, nonatomic) NSDate *timestamp;

/// The id of the publisher of this message
@property (strong, nonatomic) NSString *clientId;
@property (strong, nonatomic, art_nullable) NSString *clientId;

/// The connection id of the publisher of this message
@property (strong, nonatomic) NSString *connectionId;
Expand Down
6 changes: 3 additions & 3 deletions ablySpec/RealtimeClientChannel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,7 @@ class RealtimeClientChannel: QuickSpec {
context("When publishing a Message with clientId set to null") {

// RTL6g1a & RTL6g1b
pending("should be unnecessary to set clientId of the Message before publishing and have clientId value as null for the Message when received") {
it("should be unnecessary to set clientId of the Message before publishing and have clientId value set for the Message when received") {
let options = AblyTests.commonAppSetup()
options.clientId = "client_string"
options.autoConnect = false
Expand All @@ -938,7 +938,7 @@ class RealtimeClientChannel: QuickSpec {

waitUntil(timeout: testTimeout) { done in
channel.subscribe() { message in
expect(message.clientId).to(beNil())
expect(message.clientId).to(equal(options.clientId))
done()
}
channel.publish([message])
Expand All @@ -950,7 +950,7 @@ class RealtimeClientChannel: QuickSpec {
expect(messageSent.messages![0].clientId).to(beNil())

let messageReceived = transport.protocolMessagesReceived.filter({ $0.action == .Message })[0]
expect(messageReceived.messages![0].clientId).to(beNil())
expect(messageReceived.messages![0].clientId).to(equal(options.clientId))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't agree with this change. It should be nil...

RTL6g1b

the clientId value is null for the Message when received

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this changed recently (ably/docs#91), it should've commented it in the commit.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup and now deployed, see http://docs.ably.io/client-lib-development-guide/features/#RTL6g1b

}

}
Expand Down