Skip to content

[webview_flutter_web] Migrate to package:web. #6792

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
auto-submit merged 20 commits into from
Jul 10, 2024
Merged

[webview_flutter_web] Migrate to package:web. #6792

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
61b792d
Fix Web
ThomasAunvik May 15, 2024
5775d2e
Attempt to fix tests
ThomasAunvik May 23, 2024
efbad89
Do not create iframe mock
ThomasAunvik May 24, 2024
d622bb5
Refactoring
ThomasAunvik May 24, 2024
2e11ac2
Webview Flutter Web Changelog
ThomasAunvik May 24, 2024
ab527d9
Sort directives
ThomasAunvik May 24, 2024
39b12b6
Return Response instead, closing client on finally
ThomasAunvik May 24, 2024
5e378c4
Fix mock response headers to return valid object
ThomasAunvik May 24, 2024
516c357
Set SDK requirement to ^3.3.0
ThomasAunvik May 24, 2024
d03c9fc
Mock IFrame
ThomasAunvik May 24, 2024
bd2d8a7
Mock object of the fake iframe class
ThomasAunvik May 24, 2024
4d4f6d7
Add License to missing file
ThomasAunvik May 24, 2024
b77d3fb
Pubspec Flutter Version, Getters and Setters for in par with implemen…
ThomasAunvik May 24, 2024
a890b22
Implement HttpRequestFactory with fetch. Remove package:http dep.
ditman Jul 9, 2024
4ee87cc
Use the web.Response API.
ditman Jul 9, 2024
87c7243
Fake web.Response and IFrames with the new JS-interop style (without …
ditman Jul 9, 2024
e01a712
Regenerate/clean mocks.
ditman Jul 9, 2024
befc2d8
Remove webview_flutter_web from Wasm exclusion list.
ditman Jul 9, 2024
ba4a2e5
Roll a full minor version. Update CHANGELOG.
ditman Jul 9, 2024
da0b903
Apply suggestions from code review
ditman Jul 9, 2024
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
Mock object of the fake iframe class
  • Loading branch information
@ThomasAunvik @ditman
ThomasAunvik authored and ditman committed Jul 9, 2024
commit bd2d8a74ac05b8c1271e76e2181a19d1838d1af8
13 changes: 7 additions & 6 deletions packages/webview_flutter/webview_flutter_web/test/legacy/webview_flutter_web_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import 'mock_fake_iframe_element.dart';
import 'webview_flutter_web_test.mocks.dart';

@GenerateMocks(<Type>[
FakeIFrameElement,
BuildContext,
CreationParams,
WebViewPlatformCallbacksHandler,
Expand Down Expand Up @@ -46,7 +47,7 @@ void main() {
group('WebWebViewPlatformController', () {
test('loadUrl sets url on iframe src attribute', () {
// Setup
final FakeIFrameElement fakeElem = FakeIFrameElement();
final MockFakeIFrameElement fakeElem = MockFakeIFrameElement();
final MockHTMLIFrameElement mockElement =
createJSInteropWrapper<FakeIFrameElement>(fakeElem)
as MockHTMLIFrameElement;
Expand All @@ -64,7 +65,7 @@ void main() {
group('loadHtmlString', () {
test('loadHtmlString loads html into iframe', () {
// Setup
final FakeIFrameElement fakeElem = FakeIFrameElement();
final MockFakeIFrameElement fakeElem = MockFakeIFrameElement();
final MockHTMLIFrameElement mockElement =
createJSInteropWrapper<FakeIFrameElement>(fakeElem)
as MockHTMLIFrameElement;
Expand All @@ -82,7 +83,7 @@ void main() {

test('loadHtmlString escapes "#" correctly', () {
// Setup
final FakeIFrameElement fakeElem = FakeIFrameElement();
final MockFakeIFrameElement fakeElem = MockFakeIFrameElement();
final MockHTMLIFrameElement mockElement =
createJSInteropWrapper<FakeIFrameElement>(fakeElem)
as MockHTMLIFrameElement;
Expand All @@ -101,7 +102,7 @@ void main() {
group('loadRequest', () {
test('loadRequest throws ArgumentError on missing scheme', () {
// Setup
final FakeIFrameElement fakeElem = FakeIFrameElement();
final MockFakeIFrameElement fakeElem = MockFakeIFrameElement();
final MockHTMLIFrameElement mockElement =
createJSInteropWrapper<FakeIFrameElement>(fakeElem)
as MockHTMLIFrameElement;
Expand All @@ -124,7 +125,7 @@ void main() {
test('loadRequest makes request and loads response into iframe',
() async {
// Setup
final FakeIFrameElement fakeElem = FakeIFrameElement();
final MockFakeIFrameElement fakeElem = MockFakeIFrameElement();
final MockHTMLIFrameElement mockElement =
createJSInteropWrapper<FakeIFrameElement>(fakeElem)
as MockHTMLIFrameElement;
Expand Down Expand Up @@ -168,7 +169,7 @@ void main() {

test('loadRequest escapes "#" correctly', () async {
// Setup
final FakeIFrameElement fakeElem = FakeIFrameElement();
final MockFakeIFrameElement fakeElem = MockFakeIFrameElement();
final MockHTMLIFrameElement mockElement =
createJSInteropWrapper<FakeIFrameElement>(fakeElem)
as MockHTMLIFrameElement;
Expand Down
78 changes: 49 additions & 29 deletions packages/webview_flutter/webview_flutter_web/test/legacy/webview_flutter_web_test.mocks.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,22 @@
// Do not manually edit this file.

// ignore_for_file: no_leading_underscores_for_library_prefixes
import 'dart:async' as _i8;
import 'dart:typed_data' as _i10;
import 'dart:async' as _i9;
import 'dart:typed_data' as _i11;

import 'package:flutter/foundation.dart' as _i3;
import 'package:flutter/src/widgets/notification_listener.dart' as _i5;
import 'package:flutter/src/widgets/notification_listener.dart' as _i6;
import 'package:flutter/widgets.dart' as _i2;
import 'package:http/http.dart' as _i4;
import 'package:mockito/mockito.dart' as _i1;
import 'package:mockito/src/dummies.dart' as _i11;
import 'package:mockito/src/dummies.dart' as _i12;
import 'package:webview_flutter_platform_interface/src/legacy/platform_interface/webview_platform_callbacks_handler.dart'
as _i7;
as _i8;
import 'package:webview_flutter_platform_interface/src/legacy/types/types.dart'
as _i6;
import 'package:webview_flutter_web/src/http_request_factory.dart' as _i9;
as _i7;
import 'package:webview_flutter_web/src/http_request_factory.dart' as _i10;

import 'mock_fake_iframe_element.dart' as _i5;

// ignore_for_file: type=lint
// ignore_for_file: avoid_redundant_argument_values
Expand Down Expand Up @@ -88,6 +90,24 @@ class _FakeResponse_3 extends _i1.SmartFake implements _i4.Response {
);
}

/// A class which mocks [FakeIFrameElement].
///
/// See the documentation for Mockito's code generation for more information.
class MockFakeIFrameElement extends _i1.Mock implements _i5.FakeIFrameElement {
MockFakeIFrameElement() {
_i1.throwOnMissingStub(this);
}

@override
set src(String? _src) => super.noSuchMethod(
Invocation.setter(
#src,
_src,
),
returnValueForMissingStub: null,
);
}

/// A class which mocks [BuildContext].
///
/// See the documentation for Mockito's code generation for more information.
Expand Down Expand Up @@ -158,7 +178,7 @@ class MockBuildContext extends _i1.Mock implements _i2.BuildContext {
);

@override
void dispatchNotification(_i5.Notification? notification) =>
void dispatchNotification(_i6.Notification? notification) =>
super.noSuchMethod(
Invocation.method(
#dispatchNotification,
Expand Down Expand Up @@ -241,7 +261,7 @@ class MockBuildContext extends _i1.Mock implements _i2.BuildContext {
/// A class which mocks [CreationParams].
///
/// See the documentation for Mockito's code generation for more information.
class MockCreationParams extends _i1.Mock implements _i6.CreationParams {
class MockCreationParams extends _i1.Mock implements _i7.CreationParams {
MockCreationParams() {
_i1.throwOnMissingStub(this);
}
Expand All @@ -253,31 +273,31 @@ class MockCreationParams extends _i1.Mock implements _i6.CreationParams {
) as Set<String>);

@override
_i6.AutoMediaPlaybackPolicy get autoMediaPlaybackPolicy =>
_i7.AutoMediaPlaybackPolicy get autoMediaPlaybackPolicy =>
(super.noSuchMethod(
Invocation.getter(#autoMediaPlaybackPolicy),
returnValue:
_i6.AutoMediaPlaybackPolicy.require_user_action_for_all_media_types,
) as _i6.AutoMediaPlaybackPolicy);
_i7.AutoMediaPlaybackPolicy.require_user_action_for_all_media_types,
) as _i7.AutoMediaPlaybackPolicy);

@override
List<_i6.WebViewCookie> get cookies => (super.noSuchMethod(
List<_i7.WebViewCookie> get cookies => (super.noSuchMethod(
Invocation.getter(#cookies),
returnValue: <_i6.WebViewCookie>[],
) as List<_i6.WebViewCookie>);
returnValue: <_i7.WebViewCookie>[],
) as List<_i7.WebViewCookie>);
}

/// A class which mocks [WebViewPlatformCallbacksHandler].
///
/// See the documentation for Mockito's code generation for more information.
class MockWebViewPlatformCallbacksHandler extends _i1.Mock
implements _i7.WebViewPlatformCallbacksHandler {
implements _i8.WebViewPlatformCallbacksHandler {
MockWebViewPlatformCallbacksHandler() {
_i1.throwOnMissingStub(this);
}

@override
_i8.FutureOr<bool> onNavigationRequest({
_i9.FutureOr<bool> onNavigationRequest({
required String? url,
required bool? isForMainFrame,
}) =>
Expand All @@ -290,8 +310,8 @@ class MockWebViewPlatformCallbacksHandler extends _i1.Mock
#isForMainFrame: isForMainFrame,
},
),
returnValue: _i8.Future<bool>.value(false),
) as _i8.FutureOr<bool>);
returnValue: _i9.Future<bool>.value(false),
) as _i9.FutureOr<bool>);

@override
void onPageStarted(String? url) => super.noSuchMethod(
Expand Down Expand Up @@ -321,7 +341,7 @@ class MockWebViewPlatformCallbacksHandler extends _i1.Mock
);

@override
void onWebResourceError(_i6.WebResourceError? error) => super.noSuchMethod(
void onWebResourceError(_i7.WebResourceError? error) => super.noSuchMethod(
Invocation.method(
#onWebResourceError,
[error],
Expand All @@ -334,19 +354,19 @@ class MockWebViewPlatformCallbacksHandler extends _i1.Mock
///
/// See the documentation for Mockito's code generation for more information.
class MockHttpRequestFactory extends _i1.Mock
implements _i9.HttpRequestFactory {
implements _i10.HttpRequestFactory {
MockHttpRequestFactory() {
_i1.throwOnMissingStub(this);
}

@override
_i8.Future<_i4.Response> request(
_i9.Future<_i4.Response> request(
String? url, {
String? method,
bool? withCredentials,
String? mimeType,
Map<String, String>? requestHeaders,
_i10.Uint8List? sendData,
_i11.Uint8List? sendData,
}) =>
(super.noSuchMethod(
Invocation.method(
Expand All @@ -360,7 +380,7 @@ class MockHttpRequestFactory extends _i1.Mock
#sendData: sendData,
},
),
returnValue: _i8.Future<_i4.Response>.value(_FakeResponse_3(
returnValue: _i9.Future<_i4.Response>.value(_FakeResponse_3(
this,
Invocation.method(
#request,
Expand All @@ -374,7 +394,7 @@ class MockHttpRequestFactory extends _i1.Mock
},
),
)),
) as _i8.Future<_i4.Response>);
) as _i9.Future<_i4.Response>);
}

/// A class which mocks [Response].
Expand All @@ -386,15 +406,15 @@ class MockResponse extends _i1.Mock implements _i4.Response {
}

@override
_i10.Uint8List get bodyBytes => (super.noSuchMethod(
_i11.Uint8List get bodyBytes => (super.noSuchMethod(
Invocation.getter(#bodyBytes),
returnValue: _i10.Uint8List(0),
) as _i10.Uint8List);
returnValue: _i11.Uint8List(0),
) as _i11.Uint8List);

@override
String get body => (super.noSuchMethod(
Invocation.getter(#body),
returnValue: _i11.dummyValue<String>(
returnValue: _i12.dummyValue<String>(
this,
Invocation.getter(#body),
),
Expand Down