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 or skip integrations tests #1628

Merged
merged 7 commits into from
Nov 14, 2022
Merged

Fix or skip integrations tests #1628

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7df9740
Tests: Fix/comment some push tests due to default push rules changes …
manuroe Nov 3, 2022
7810597
Tests: Update MXRestClientTests.testFilter() to match server expecta…
manuroe Nov 3, 2022
ce1bcda
Tests: Disable MXSpaceChildContentTests.testUpdateChildSuggestion() a…
manuroe Nov 3, 2022
b20ef03
Tests: Disable tests that randomly fail
manuroe Nov 3, 2022
0a39c85
Merge remote-tracking branch 'origin/develop' into manu/fix_integrati…
manuroe Nov 3, 2022
4ff7392
changelog
manuroe Nov 4, 2022
e25224c
Tests: Rename testDefaultRoomMemberCountCondition into testDefaultEve…
manuroe Nov 4, 2022
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
Prev Previous commit
Next Next commit
Tests: Update MXRestClientTests.testFilter() to match server expectation
  • Loading branch information
@manuroe
manuroe committed Nov 3, 2022
commit 78105975c4dcba1146e08b5717d1d5b19f18168e
9 changes: 4 additions & 5 deletions MatrixSDKTests/MXRestClientTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1112,23 +1112,22 @@ - (void)testAddAndRemoveTag
#pragma mark - Filter operations
- (void)testFilter
{
[self.matrixSDKTestsData doMXRestClientTestWithAlice:self readyToTest:^(MXRestClient *aliceRestClient, XCTestExpectation *expectation) {
[self.matrixSDKTestsData doMXRestClientTestWithBobAndAliceInARoom:self
readyToTest:^(MXRestClient *bobRestClient, MXRestClient *aliceRestClient, NSString *roomId, XCTestExpectation *expectation) {

MXFilterJSONModel *filter = [[MXFilterJSONModel alloc] init];

filter.eventFields = @[@"content.body"];
filter.eventFormat = @"federation";

filter.room = [[MXRoomFilter alloc] init];
filter.room.rooms = @[@"!aroom:matrix:org"];
filter.room.notRooms = @[@"!notaroom:matrix:org"];
filter.room.rooms = @[roomId];

filter.room.ephemeral = [[MXRoomEventFilter alloc] init];
filter.room.ephemeral.containsURL = NO;
filter.room.ephemeral.types = @[@"atype"];
filter.room.ephemeral.notTypes = @[@"notatype"];
filter.room.ephemeral.rooms = @[@"!aroom_ephemeral:matrix:org"];
filter.room.ephemeral.notRooms = @[@"!notaroom_ephemeral:matrix:org"];
filter.room.ephemeral.rooms = @[roomId];;
filter.room.ephemeral.senders = @[@"@asender:matrix.org"];
filter.room.ephemeral.notSenders = @[@"@notasender:matrix.org"];

Expand Down