Merge pull request #100 from matrix-org/markjh/archived_flag

Update the tests for archived rooms to include the flag needed to mak…
matrix-org · Dec 4, 2015 · 57ba0ed · 57ba0ed
2 parents c107712 + e1c8172
commit 57ba0ed
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/tests/31sync/09archived.pl b/tests/31sync/09archived.pl
@@ -7,7 +7,9 @@
 
       my ( $filter_id, $room_id );
 
-      matrix_create_filter( $user, {} )->then( sub {
+      matrix_create_filter( $user,
+         { room => { include_leave => JSON::true } }
+      )->then( sub {
          ( $filter_id ) = @_;
 
          matrix_create_room( $user );
@@ -37,7 +39,9 @@
 
       my ( $filter_id, $room_id, $next );
 
-     matrix_create_filter( $user, {} )->then( sub {
+     matrix_create_filter( $user,
+         { room => { include_leave => JSON::true } }
+     )->then( sub {
          ( $filter_id ) = @_;
 
          matrix_create_room( $user );
@@ -74,7 +78,7 @@
       my ( $filter_id, $room_id_1, $room_id_2, $next );
 
       my $filter = {
-         room => { timeline => { limit => 1 } },
+         room => { timeline => { limit => 1 }, include_leave => JSON::true }
       };
 
       matrix_create_filter( $user, {} )->then( sub {
@@ -126,7 +130,9 @@
 
       my ( $filter_id, $room_id, $next );
 
-      matrix_create_filter( $user, {} )->then( sub {
+      matrix_create_filter( $user,
+         { room => { include_leave => JSON::true } }
+      )->then( sub {
          ( $filter_id ) = @_;
 
          matrix_create_room( $user );
@@ -167,6 +173,7 @@
          room => {
             timeline => { types => [ "m.room.message" ] },
             state => { types => [ "a.madeup.test.state" ] },
+            include_leave => JSON::true,
          },
       };
 

diff --git a/tests/31sync/10archived-ban.pl b/tests/31sync/10archived-ban.pl
@@ -7,9 +7,11 @@
 
       my ( $filter_id_a, $filter_id_b, $room_id );
 
+      my $filter = { room => { include_leave => JSON::true } };
+
       Future->needs_all(
-         matrix_create_filter( $user_a, {} ),
-         matrix_create_filter( $user_b, {} ),
+         matrix_create_filter( $user_a, $filter ),
+         matrix_create_filter( $user_b, $filter ),
       )->then( sub {
          ( $filter_id_a, $filter_id_b ) = @_;
 
@@ -47,9 +49,11 @@
 
       my ( $filter_id_a, $filter_id_b, $room_id, $next_b );
 
+      my $filter = { room => { include_leave => JSON::true } };
+
       Future->needs_all(
-         matrix_create_filter( $user_a, {} ),
-         matrix_create_filter( $user_b, {} ),
+         matrix_create_filter( $user_a, $filter ),
+         matrix_create_filter( $user_b, $filter ),
       )->then( sub {
          ( $filter_id_a, $filter_id_b ) = @_;
 
@@ -92,9 +96,11 @@
 
       my ( $filter_id_a, $filter_id_b, $room_id, $next_b );
 
+      my $filter = { room => { include_leave => JSON::true } };
+
       Future->needs_all(
-         matrix_create_filter( $user_a, {} ),
-         matrix_create_filter( $user_b, {} ),
+         matrix_create_filter( $user_a, $filter ),
+         matrix_create_filter( $user_b, $filter ),
       )->then( sub {
          ( $filter_id_a, $filter_id_b ) = @_;