Skip to content

Use v1 and v3 endpoints for /thirdparty tests #1310

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

Merged
clokep merged 3 commits into from
Apr 3, 2023
Merged

Use v1 and v3 endpoints for /thirdparty tests #1310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
943b3ea
Use v1 and v3 endpoints
S7evinK Oct 26, 2022
1644a30
Merge branch 'develop' into s7evink/thirdparty
clokep Mar 28, 2023
c313242
Update other paths to modern path-names.
clokep Mar 28, 2023
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 lib/SyTest/ApplicationService.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ sub new
my %futures_by_type;

my $f = repeat {
$await_http->( qr{^\Q$path\E/transactions/\d+$}, sub { 1 },
$await_http->( qr{^\Q$path\E/_matrix/app/v1/transactions/\d+$}, sub { 1 },
timeout => 0,
)->then( sub {
my ( $request ) = @_;
Expand Down
4 changes: 2 additions & 2 deletions tests/60app-services/03passive.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
my $localpart = "astest-03passive-1";
my $user_id = "\@$localpart:$server_name";

require_stub $appserv->await_http_request( "/users/$user_id", sub { 1 } )
require_stub $appserv->await_http_request( "/_matrix/app/v1/users/$user_id", sub { 1 } )
->then( sub {
my ( $request ) = @_;

Expand Down Expand Up @@ -52,7 +52,7 @@
do => sub {
my ( $as_user, $appserv, $local_user, $room_id, $room_alias ) = @_;

require_stub $appserv->await_http_request( "/rooms/$room_alias", sub { 1 } )
require_stub $appserv->await_http_request( "/_matrix/app/v1/rooms/$room_alias", sub { 1 } )
->then( sub {
my ( $request ) = @_;

Expand Down
10 changes: 5 additions & 5 deletions tests/60app-services/05lookup3pe.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use List::UtilsBy qw( sort_by );

use constant AS_PREFIX => "/_matrix/app/unstable";
use constant AS_PREFIX => "/_matrix/app/v1";

sub stub_empty_result
{
Expand Down Expand Up @@ -59,7 +59,7 @@ sub stub_empty_result

do_request_json_for( $user,
method => "GET",
uri => "/unstable/thirdparty/protocols"
uri => "/v3/thirdparty/protocols"
)->then( sub {
my ( $body ) = @_;

Expand Down Expand Up @@ -107,7 +107,7 @@ sub stub_empty_result

do_request_json_for( $user,
method => "GET",
uri => "/unstable/thirdparty/protocol/ymca"
uri => "/v3/thirdparty/protocol/ymca"
)->then( sub {
my ( $body ) = @_;

Expand Down Expand Up @@ -172,7 +172,7 @@ sub stub_empty_result

do_request_json_for( $user,
method => "GET",
uri => "/unstable/thirdparty/user/ymca",
uri => "/v3/thirdparty/user/ymca",

params => {
field1 => "ONE",
Expand Down Expand Up @@ -237,7 +237,7 @@ sub stub_empty_result

do_request_json_for( $user,
method => "GET",
uri => "/unstable/thirdparty/location/ymca",
uri => "/v3/thirdparty/location/ymca",

params => {
field3 => "THREE",
Expand Down