-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2447 from nextcloud/chore/nextcloud/remove-deprec…
…ated-useragent-cookiejar
- Loading branch information
Showing
7 changed files
with
6 additions
and
261 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,2 @@ | ||
| export 'cookie_jar_client.dart'; | ||
| export 'date_time.dart'; | ||
| export 'http_date_parser.dart'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,140 +1,10 @@ | ||
| import 'package:cookie_jar/cookie_jar.dart'; | ||
| import 'package:http/http.dart'; | ||
| import 'package:http/testing.dart'; | ||
| import 'package:http_client_conformance_tests/http_client_conformance_tests.dart'; | ||
| import 'package:nextcloud/nextcloud.dart'; | ||
| import 'package:test/test.dart'; | ||
|
|
||
| void main() { | ||
| final uri = Uri.parse('http://example.com'); | ||
| group(NextcloudClient, () { | ||
| group( | ||
| 'Client conformance tests', | ||
| () { | ||
| testAll( | ||
| () => NextcloudClient(Uri()), | ||
| canReceiveSetCookieHeaders: true, | ||
| canSendCookieHeaders: true, | ||
| ); | ||
| }, | ||
| onPlatform: const { | ||
| 'browser': [Skip()], | ||
| }, | ||
| ); | ||
|
|
||
| group('Cookies', () { | ||
| late CookieJar cookieJar; | ||
| setUp(() { | ||
| cookieJar = CookieJar(); | ||
| }); | ||
|
|
||
| test('Cookies', () async { | ||
| final mockedClient = MockClient((request) async { | ||
| expect(request.headers['cookie'], equals('a=b; a2=b2; a3=b3')); | ||
|
|
||
| return Response( | ||
| '', | ||
| 200, | ||
| headers: { | ||
| 'set-cookie': Cookie('c', 'd').toString(), | ||
| }, | ||
| ); | ||
| }); | ||
|
|
||
| final client = NextcloudClient( | ||
| uri, | ||
| httpClient: mockedClient, | ||
| // ignore: deprecated_member_use_from_same_package | ||
| cookieJar: cookieJar, | ||
| ); | ||
|
|
||
| await cookieJar.saveFromResponse(uri, [ | ||
| Cookie('a', 'b'), | ||
| Cookie('a2', 'b2'), | ||
| Cookie('a3', 'b3'), | ||
| ]); | ||
| await client.get(uri); | ||
|
|
||
| final cookies = await cookieJar.loadForRequest(uri); | ||
| expect(cookies, hasLength(4)); | ||
| expect(cookies[0].name, 'a'); | ||
| expect(cookies[0].value, 'b'); | ||
| expect(cookies.last.name, 'c'); | ||
| expect(cookies.last.value, 'd'); | ||
| }); | ||
|
|
||
| test('No cookies', () async { | ||
| final mockedClient = MockClient((request) async { | ||
| expect(request.headers['cookie'], isNull); | ||
| return Response('', 200); | ||
| }); | ||
|
|
||
| final client = NextcloudClient( | ||
| uri, | ||
| httpClient: mockedClient, | ||
| // ignore: deprecated_member_use_from_same_package | ||
| cookieJar: cookieJar, | ||
| ); | ||
|
|
||
| await client.get(uri); | ||
| }); | ||
| }); | ||
|
|
||
| group('headers', () { | ||
| test('raw request base headers', () async { | ||
| final mockedClient = MockClient((request) async { | ||
| expect( | ||
| request.headers, | ||
| equals({ | ||
| 'user-agent': 'Neon', | ||
| }), | ||
| ); | ||
|
|
||
| return Response( | ||
| '', | ||
| 200, | ||
| ); | ||
| }); | ||
|
|
||
| final client = NextcloudClient( | ||
| uri, | ||
| httpClient: mockedClient, | ||
| // ignore: deprecated_member_use_from_same_package | ||
| userAgent: 'Neon', | ||
| ); | ||
|
|
||
| await client.get(uri); | ||
| }); | ||
|
|
||
| test('request overwrites base headers', () async { | ||
| final mockedClient = MockClient((request) async { | ||
| expect( | ||
| request.headers, | ||
| equals({ | ||
| 'user-agent': 'Cookbook', | ||
| }), | ||
| ); | ||
|
|
||
| return Response( | ||
| '', | ||
| 200, | ||
| ); | ||
| }); | ||
|
|
||
| final client = NextcloudClient( | ||
| uri, | ||
| httpClient: mockedClient, | ||
| // ignore: deprecated_member_use_from_same_package | ||
| userAgent: 'Neon', | ||
| ); | ||
|
|
||
| await client.get( | ||
| uri, | ||
| headers: { | ||
| 'user-agent': 'Cookbook', | ||
| }, | ||
| ); | ||
| }); | ||
| }); | ||
| }); | ||
| testAll( | ||
| () => NextcloudClient(Uri()), | ||
| canReceiveSetCookieHeaders: true, | ||
| canSendCookieHeaders: true, | ||
| ); | ||
| } |
This file was deleted.
Oops, something went wrong.