Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
25b56569
Unverified
Commit
25b56569
authored
Jun 24, 2019
by
Jonah Williams
Committed by
GitHub
Jun 24, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reland: rename web device (#34885)
parent
8dbfc82b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
14 deletions
+28
-14
web_dev_mode_tests.dart
dev/devicelab/lib/tasks/web_dev_mode_tests.dart
+1
-1
web_device.dart
packages/flutter_tools/lib/src/web/web_device.dart
+6
-6
devices_test.dart
packages/flutter_tools/test/web/devices_test.dart
+21
-7
No files found.
dev/devicelab/lib/tasks/web_dev_mode_tests.dart
View file @
25b56569
...
...
@@ -17,7 +17,7 @@ final Directory flutterGalleryDir = dir(path.join(flutterDirectory.path, 'exampl
TaskFunction
createWebDevModeTest
(
)
{
return
()
async
{
final
List
<
String
>
options
=
<
String
>[
'--hot'
,
'-d'
,
'
web
'
,
'--verbose'
,
'--resident'
,
'--target=lib/main.dart'
,
'--hot'
,
'-d'
,
'
chrome
'
,
'--verbose'
,
'--resident'
,
'--target=lib/main.dart'
,
];
setLocalEngineOptionIfNecessary
(
options
);
int
hotRestartCount
=
0
;
...
...
packages/flutter_tools/lib/src/web/web_device.dart
View file @
25b56569
...
...
@@ -27,9 +27,9 @@ class WebApplicationPackage extends ApplicationPackage {
Directory
get
webSourcePath
=>
flutterProject
.
directory
.
childDirectory
(
'web'
);
}
class
Web
Device
extends
Device
{
Web
Device
()
:
super
(
'
web
'
,
class
Chrome
Device
extends
Device
{
Chrome
Device
()
:
super
(
'
chrome
'
,
category:
Category
.
web
,
platformType:
PlatformType
.
web
,
ephemeral:
false
,
...
...
@@ -74,7 +74,7 @@ class WebDevice extends Device {
bool
isSupported
()
=>
flutterWebEnabled
&&
canFindChrome
();
@override
String
get
name
=>
'
web
'
;
String
get
name
=>
'
Chrome
'
;
@override
DevicePortForwarder
get
portForwarder
=>
const
NoOpDevicePortForwarder
();
...
...
@@ -143,9 +143,9 @@ class WebDevice extends Device {
}
class
WebDevices
extends
PollingDeviceDiscovery
{
WebDevices
()
:
super
(
'
web
'
);
WebDevices
()
:
super
(
'
chrome
'
);
final
WebDevice
_webDevice
=
Web
Device
();
final
ChromeDevice
_webDevice
=
Chrome
Device
();
@override
bool
get
canListAnything
=>
flutterWebEnabled
;
...
...
packages/flutter_tools/test/web/devices_test.dart
View file @
25b56569
...
...
@@ -13,7 +13,7 @@ import '../src/common.dart';
import
'../src/context.dart'
;
void
main
(
)
{
group
(
Web
Device
,
()
{
group
(
Chrome
Device
,
()
{
MockChromeLauncher
mockChromeLauncher
;
MockPlatform
mockPlatform
;
MockProcessManager
mockProcessManager
;
...
...
@@ -26,16 +26,30 @@ void main() {
return
null
;
});
});
test
(
'Defaults'
,
()
async
{
final
ChromeDevice
chromeDevice
=
ChromeDevice
();
expect
(
chromeDevice
.
name
,
'Chrome'
);
expect
(
chromeDevice
.
id
,
'chrome'
);
expect
(
chromeDevice
.
supportsHotReload
,
true
);
expect
(
chromeDevice
.
supportsHotRestart
,
true
);
expect
(
chromeDevice
.
supportsStartPaused
,
true
);
expect
(
chromeDevice
.
supportsFlutterExit
,
true
);
expect
(
chromeDevice
.
supportsScreenshot
,
false
);
expect
(
await
chromeDevice
.
isLocalEmulator
,
false
);
});
testUsingContext
(
'Invokes version command on non-Windows platforms'
,
()
async
{
when
(
mockPlatform
.
isWindows
).
thenReturn
(
false
);
when
(
mockProcessManager
.
canRun
(
'chrome.foo'
)).
thenReturn
(
true
);
when
(
mockProcessManager
.
run
(<
String
>[
'chrome.foo'
,
'--version'
])).
thenAnswer
((
Invocation
invocation
)
async
{
return
MockProcessResult
(
0
,
'ABC'
);
});
final
WebDevice
webDevice
=
Web
Device
();
final
ChromeDevice
chromeDevice
=
Chrome
Device
();
expect
(
web
Device
.
isSupported
(),
true
);
expect
(
await
web
Device
.
sdkNameAndVersion
,
'ABC'
);
expect
(
chrome
Device
.
isSupported
(),
true
);
expect
(
await
chrome
Device
.
sdkNameAndVersion
,
'ABC'
);
},
overrides:
<
Type
,
Generator
>{
Platform:
()
=>
mockPlatform
,
ProcessManager:
()
=>
mockProcessManager
,
...
...
@@ -53,10 +67,10 @@ void main() {
])).
thenAnswer
((
Invocation
invocation
)
async
{
return
MockProcessResult
(
0
,
r'HKEY_CURRENT_USER\Software\Google\Chrome\BLBeacon\ version REG_SZ 74.0.0 A'
);
});
final
WebDevice
webDevice
=
Web
Device
();
final
ChromeDevice
chromeDevice
=
Chrome
Device
();
expect
(
web
Device
.
isSupported
(),
true
);
expect
(
await
web
Device
.
sdkNameAndVersion
,
'Google Chrome 74.0.0'
);
expect
(
chrome
Device
.
isSupported
(),
true
);
expect
(
await
chrome
Device
.
sdkNameAndVersion
,
'Google Chrome 74.0.0'
);
},
overrides:
<
Type
,
Generator
>{
Platform:
()
=>
mockPlatform
,
ProcessManager:
()
=>
mockProcessManager
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment