diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2019-12-01 14:00:49 +1100 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2020-01-24 09:54:29 -0600 |
| commit | 471daeea559ada7ac215806d55f2f686e7389608 (patch) | |
| tree | c283027795a31511782327a4307a6a639e325762 /tests | |
| parent | 297c61e41f23caacb39d8c00957fd5ec050c9cbf (diff) | |
| download | libgit2-471daeea559ada7ac215806d55f2f686e7389608.tar.gz | |
net: refactor gitno redirect handling
Move the redirect handling into `git_net_url` for consistency.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/network/redirect.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/network/redirect.c b/tests/network/redirect.c index ce0a080dd..7ce1310db 100644 --- a/tests/network/redirect.c +++ b/tests/network/redirect.c @@ -18,7 +18,7 @@ void test_network_redirect__redirect_http(void) { cl_git_pass(git_net_url_parse(&conndata, "http://example.com/foo/bar/baz")); - cl_git_pass(gitno_connection_data_handle_redirect(&conndata, + cl_git_pass(git_net_url_apply_redirect(&conndata, "http://example.com/foo/bar/baz", "bar/baz")); cl_assert_equal_s(conndata.scheme, "http"); cl_assert_equal_s(conndata.host, "example.com"); @@ -32,7 +32,7 @@ void test_network_redirect__redirect_ssl(void) { cl_git_pass(git_net_url_parse(&conndata, "https://example.com/foo/bar/baz")); - cl_git_pass(gitno_connection_data_handle_redirect(&conndata, + cl_git_pass(git_net_url_apply_redirect(&conndata, "https://example.com/foo/bar/baz", "bar/baz")); cl_assert_equal_s(conndata.scheme, "https"); cl_assert_equal_s(conndata.host, "example.com"); @@ -46,7 +46,7 @@ void test_network_redirect__redirect_leaves_root_path(void) { cl_git_pass(git_net_url_parse(&conndata, "https://example.com/foo/bar/baz")); - cl_git_pass(gitno_connection_data_handle_redirect(&conndata, + cl_git_pass(git_net_url_apply_redirect(&conndata, "https://example.com/foo/bar/baz", "/foo/bar/baz")); cl_assert_equal_s(conndata.scheme, "https"); cl_assert_equal_s(conndata.host, "example.com"); @@ -60,7 +60,7 @@ void test_network_redirect__redirect_encoded_username_password(void) { cl_git_pass(git_net_url_parse(&conndata, "https://user%2fname:pass%40word%zyx%v@example.com/foo/bar/baz")); - cl_git_pass(gitno_connection_data_handle_redirect(&conndata, + cl_git_pass(git_net_url_apply_redirect(&conndata, "https://user%2fname:pass%40word%zyx%v@example.com/foo/bar/baz", "bar/baz")); cl_assert_equal_s(conndata.scheme, "https"); cl_assert_equal_s(conndata.host, "example.com"); @@ -73,7 +73,7 @@ void test_network_redirect__redirect_encoded_username_password(void) void test_network_redirect__redirect_cross_host_denied(void) { cl_git_pass(git_net_url_parse(&conndata, "https://bar.com/bar/baz")); - cl_git_fail_with(gitno_connection_data_handle_redirect(&conndata, + cl_git_fail_with(git_net_url_apply_redirect(&conndata, "https://foo.com/bar/baz", NULL), -1); } @@ -81,7 +81,7 @@ void test_network_redirect__redirect_cross_host_denied(void) void test_network_redirect__redirect_http_downgrade_denied(void) { cl_git_pass(git_net_url_parse(&conndata, "https://foo.com/bar/baz")); - cl_git_fail_with(gitno_connection_data_handle_redirect(&conndata, + cl_git_fail_with(git_net_url_apply_redirect(&conndata, "http://foo.com/bar/baz", NULL), -1); } @@ -89,7 +89,7 @@ void test_network_redirect__redirect_http_downgrade_denied(void) void test_network_redirect__redirect_relative(void) { cl_git_pass(git_net_url_parse(&conndata, "http://foo.com/bar/baz/biff")); - cl_git_pass(gitno_connection_data_handle_redirect(&conndata, + cl_git_pass(git_net_url_apply_redirect(&conndata, "/zap/baz/biff?bam", NULL)); cl_assert_equal_s(conndata.scheme, "http"); cl_assert_equal_s(conndata.host, "foo.com"); @@ -102,7 +102,7 @@ void test_network_redirect__redirect_relative(void) void test_network_redirect__redirect_relative_ssl(void) { cl_git_pass(git_net_url_parse(&conndata, "https://foo.com/bar/baz/biff")); - cl_git_pass(gitno_connection_data_handle_redirect(&conndata, + cl_git_pass(git_net_url_apply_redirect(&conndata, "/zap/baz/biff?bam", NULL)); cl_assert_equal_s(conndata.scheme, "https"); cl_assert_equal_s(conndata.host, "foo.com"); @@ -115,7 +115,7 @@ void test_network_redirect__redirect_relative_ssl(void) void test_network_redirect__service_query_no_query_params_in_location(void) { cl_git_pass(git_net_url_parse(&conndata, "https://foo.com/bar/info/refs?service=git-upload-pack")); - cl_git_pass(gitno_connection_data_handle_redirect(&conndata, + cl_git_pass(git_net_url_apply_redirect(&conndata, "/baz/info/refs", "/info/refs?service=git-upload-pack")); cl_assert_equal_s(conndata.path, "/baz"); } @@ -123,7 +123,7 @@ void test_network_redirect__service_query_no_query_params_in_location(void) void test_network_redirect__service_query_with_query_params_in_location(void) { cl_git_pass(git_net_url_parse(&conndata, "https://foo.com/bar/info/refs?service=git-upload-pack")); - cl_git_pass(gitno_connection_data_handle_redirect(&conndata, + cl_git_pass(git_net_url_apply_redirect(&conndata, "/baz/info/refs?service=git-upload-pack", "/info/refs?service=git-upload-pack")); cl_assert_equal_s(conndata.path, "/baz"); } |