Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 44e80fd

Browse files
author
Nurhan Turgut
authored
skiping tests in Safari. LUCI recipe for Mac is ready. this is the only step left for stopping us running unit tests in Safari (#16550)
1 parent ca02b91 commit 44e80fd

6 files changed

Lines changed: 146 additions & 90 deletions

File tree

‎lib/web_ui/test/engine/semantics/semantics_helper_test.dart‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ void main() {
4343
expect(_placeholder.getBoundingClientRect().width, 1);
4444
expect(_placeholder.getBoundingClientRect().top, -1);
4545
expect(_placeholder.getBoundingClientRect().left, -1);
46-
});
46+
},
47+
// TODO(nurhan): https://github.com/flutter/flutter/issues/50590
48+
skip: browserEngine == BrowserEngine.webkit);
4749

4850
test('Not relevant events should be forwarded to the framework', () async {
4951
// Prework. Attach the placeholder to dom.
@@ -134,15 +136,20 @@ void main() {
134136

135137
expect(_placeholder.getBoundingClientRect().height, bodyHeight);
136138
expect(_placeholder.getBoundingClientRect().width, bodyWidht);
137-
});
139+
},
140+
// TODO(nurhan): https://github.com/flutter/flutter/issues/50590
141+
skip: browserEngine == BrowserEngine.webkit);
138142

139143
test('Not relevant events should be forwarded to the framework', () async {
140144
final html.Event event = html.TouchEvent('touchcancel');
141145
bool shouldForwardToFramework =
142146
mobileSemanticsEnabler.tryEnableSemantics(event);
143147

144148
expect(shouldForwardToFramework, true);
145-
}, // TODO(nurhan): https://github.com/flutter/flutter/issues/46638
146-
skip: (browserEngine == BrowserEngine.firefox));
149+
},
150+
// TODO(nurhan): https://github.com/flutter/flutter/issues/50590
151+
// TODO(nurhan): https://github.com/flutter/flutter/issues/46638
152+
skip: (browserEngine == BrowserEngine.firefox ||
153+
browserEngine == BrowserEngine.webkit));
147154
});
148155
}

‎lib/web_ui/test/engine/semantics/semantics_test.dart‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,9 @@ void _testVerticalScrolling() {
502502
expect(scrollable.scrollTop, 10);
503503

504504
semantics().semanticsEnabled = false;
505-
});
505+
},
506+
// TODO(nurhan): https://github.com/flutter/flutter/issues/50590
507+
skip: browserEngine == BrowserEngine.webkit);
506508
}
507509

508510
void _testHorizontalScrolling() {
@@ -623,7 +625,9 @@ void _testHorizontalScrolling() {
623625
expect(scrollable.scrollLeft, 10);
624626

625627
semantics().semanticsEnabled = false;
626-
});
628+
},
629+
// TODO(nurhan): https://github.com/flutter/flutter/issues/50590
630+
skip: browserEngine == BrowserEngine.webkit);
627631
}
628632

629633
void _testIncrementables() {
@@ -807,7 +811,9 @@ void _testTextField() {
807811

808812
semantics().semanticsEnabled = false;
809813
}, // TODO(nurhan): https://github.com/flutter/flutter/issues/46638
810-
skip: (browserEngine == BrowserEngine.firefox));
814+
// TODO(nurhan): https://github.com/flutter/flutter/issues/50590
815+
skip: (browserEngine == BrowserEngine.firefox ||
816+
browserEngine == BrowserEngine.webkit));
811817
}
812818

813819
void _testCheckables() {

‎lib/web_ui/test/paragraph_test.dart‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ void main() async {
5656
closeTo(paragraph.alphabeticBaseline * kAhemBaselineRatio, 3.0),
5757
);
5858
}
59-
});
59+
},
60+
// TODO(nurhan): https://github.com/flutter/flutter/issues/50590
61+
skip: browserEngine == BrowserEngine.webkit);
6062

6163
testEachMeasurement('predictably lays out a multi-line paragraph', () {
6264
for (double fontSize in <double>[10.0, 20.0, 30.0, 40.0]) {
@@ -83,7 +85,9 @@ void main() async {
8385
closeTo(paragraph.alphabeticBaseline * kAhemBaselineRatio, 3.0),
8486
);
8587
}
86-
});
88+
},
89+
// TODO(nurhan): https://github.com/flutter/flutter/issues/50590
90+
skip: browserEngine == BrowserEngine.webkit);
8791

8892
testEachMeasurement('predictably lays out a single-line rich paragraph', () {
8993
for (double fontSize in <double>[10.0, 20.0, 30.0, 40.0]) {
@@ -105,7 +109,9 @@ void main() async {
105109
expect(paragraph.maxIntrinsicWidth, fontSize * 10.0);
106110
}
107111
}, // TODO(nurhan): https://github.com/flutter/flutter/issues/46638
108-
skip: (browserEngine == BrowserEngine.firefox));
112+
// TODO(nurhan): https://github.com/flutter/flutter/issues/50590
113+
skip: (browserEngine == BrowserEngine.firefox ||
114+
browserEngine == BrowserEngine.webkit));
109115

110116
testEachMeasurement('predictably lays out a multi-line rich paragraph', () {
111117
for (double fontSize in <double>[10.0, 20.0, 30.0, 40.0]) {
@@ -128,7 +134,9 @@ void main() async {
128134
expect(paragraph.maxIntrinsicWidth, fontSize * 16.0);
129135
}
130136
}, // TODO(nurhan): https://github.com/flutter/flutter/issues/46638
131-
skip: (browserEngine == BrowserEngine.firefox));
137+
// TODO(nurhan): https://github.com/flutter/flutter/issues/50590
138+
skip: (browserEngine == BrowserEngine.firefox ||
139+
browserEngine == BrowserEngine.webkit));
132140

133141
testEachMeasurement('getPositionForOffset single-line', () {
134142
final ParagraphBuilder builder = ParagraphBuilder(ParagraphStyle(
@@ -221,7 +229,6 @@ void main() async {
221229
TextPosition(offset: 2, affinity: TextAffinity.upstream),
222230
);
223231

224-
225232
// Second line: "abcdefg\n"
226233

227234
// At the beginning of the second line.
@@ -245,7 +252,6 @@ void main() async {
245252
TextPosition(offset: 10, affinity: TextAffinity.upstream),
246253
);
247254

248-
249255
// Last (third) line: "ab"
250256

251257
// At the beginning of the last line.
@@ -299,7 +305,9 @@ void main() async {
299305
TextDirection.rtl,
300306
),
301307
);
302-
});
308+
},
309+
// TODO(nurhan): https://github.com/flutter/flutter/issues/50590
310+
skip: browserEngine == BrowserEngine.webkit);
303311

304312
testEachMeasurement(
305313
'getBoxesForRange return empty list for zero-length range', () {
@@ -419,5 +427,7 @@ void main() async {
419427

420428
expect(paragraph.width, 30);
421429
expect(paragraph.height, 10);
422-
});
430+
},
431+
// TODO(nurhan): https://github.com/flutter/flutter/issues/50590
432+
skip: browserEngine == BrowserEngine.webkit);
423433
}

‎lib/web_ui/test/text/measurement_test.dart‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
@TestOn('chrome || firefox')
6+
57
import 'package:ui/ui.dart' as ui;
68
import 'package:ui/src/engine.dart';
79

‎lib/web_ui/test/text_editing_test.dart‎

Lines changed: 80 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,9 @@ void main() {
404404
expect(document.activeElement, document.body);
405405

406406
editingElement.disable();
407-
});
407+
},
408+
// TODO(nurhan): https://github.com/flutter/flutter/issues/50590
409+
skip: browserEngine == BrowserEngine.webkit);
408410

409411
test('Does not dispose and recreate dom elements in persistent mode', () {
410412
editingElement =
@@ -441,7 +443,9 @@ void main() {
441443
expect(document.body.contains(editingElement.domElement), isTrue);
442444
// But the DOM element loses focus.
443445
expect(document.activeElement, document.body);
444-
});
446+
},
447+
// TODO(nurhan): https://github.com/flutter/flutter/issues/50590
448+
skip: browserEngine == BrowserEngine.webkit);
445449

446450
test('Refocuses when setting editing state', () {
447451
editingElement =
@@ -463,7 +467,9 @@ void main() {
463467
expect(document.activeElement, testInputElement);
464468

465469
editingElement.disable();
466-
});
470+
},
471+
// TODO(nurhan): https://github.com/flutter/flutter/issues/50590
472+
skip: browserEngine == BrowserEngine.webkit);
467473

468474
test('Works in multi-line mode', () {
469475
final TextAreaElement textarea = TextAreaElement();
@@ -506,7 +512,9 @@ void main() {
506512
expect(document.body.contains(editingElement.domElement), isTrue);
507513
// But the textarea loses focus.
508514
expect(document.activeElement, document.body);
509-
});
515+
},
516+
// TODO(nurhan): https://github.com/flutter/flutter/issues/50590
517+
skip: browserEngine == BrowserEngine.webkit);
510518

511519
test('Does not position or size its DOM element', () {
512520
editingElement.enable(
@@ -525,6 +533,7 @@ void main() {
525533
expect(editingElement.domElement.style.width, '');
526534
expect(editingElement.domElement.style.height, '');
527535
}
536+
528537
checkPlacementIsEmpty();
529538
editingElement.placeElement();
530539
checkPlacementIsEmpty();
@@ -689,7 +698,9 @@ void main() {
689698
);
690699
// Input element is removed from DOM.
691700
expect(document.getElementsByTagName('input'), hasLength(0));
692-
});
701+
},
702+
// TODO(nurhan): https://github.com/flutter/flutter/issues/50590
703+
skip: browserEngine == BrowserEngine.webkit);
693704

694705
test('setClient, setEditingState, show, setClient', () {
695706
final MethodCall setClient = MethodCall(
@@ -808,64 +819,67 @@ void main() {
808819

809820
// Confirm that [HybridTextEditing] didn't send any messages.
810821
expect(spy.messages, isEmpty);
811-
});
822+
},
823+
// TODO(nurhan): https://github.com/flutter/flutter/issues/50590
824+
skip: browserEngine == BrowserEngine.webkit);
812825

813826
test(
814-
'setClient, show, setEditableSizeAndTransform, setStyle, setEditingState, clearClient',
815-
() {
816-
final MethodCall setClient = MethodCall(
817-
'TextInput.setClient', <dynamic>[123, flutterSinglelineConfig]);
818-
sendFrameworkMessage(codec.encodeMethodCall(setClient));
819-
820-
const MethodCall show = MethodCall('TextInput.show');
821-
sendFrameworkMessage(codec.encodeMethodCall(show));
822-
823-
final MethodCall setSizeAndTransform =
824-
configureSetSizeAndTransformMethodCall(
825-
150,
826-
50,
827-
Matrix4.translationValues(
828-
10.0,
829-
20.0,
830-
30.0,
831-
).storage.toList());
832-
sendFrameworkMessage(codec.encodeMethodCall(setSizeAndTransform));
833-
834-
final MethodCall setStyle =
835-
configureSetStyleMethodCall(12, 'sans-serif', 4, 4, 1);
836-
sendFrameworkMessage(codec.encodeMethodCall(setStyle));
837-
838-
const MethodCall setEditingState =
839-
MethodCall('TextInput.setEditingState', <String, dynamic>{
840-
'text': 'abcd',
841-
'selectionBase': 2,
842-
'selectionExtent': 3,
843-
});
844-
sendFrameworkMessage(codec.encodeMethodCall(setEditingState));
845-
846-
final HtmlElement domElement = textEditing.editingElement.domElement;
847-
848-
checkInputEditingState(domElement, 'abcd', 2, 3);
849-
850-
// Check if the position is correct.
851-
expect(
852-
domElement.getBoundingClientRect(),
853-
Rectangle<double>.fromPoints(const Point<double>(10.0, 20.0),
854-
const Point<double>(160.0, 70.0)),
855-
);
856-
expect(
857-
domElement.style.transform,
858-
'matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 10, 20, 30, 1)',
859-
);
860-
expect(
861-
textEditing.editingElement.domElement.style.font,
862-
'500 12px sans-serif',
863-
);
864-
865-
const MethodCall clearClient = MethodCall('TextInput.clearClient');
866-
sendFrameworkMessage(codec.encodeMethodCall(clearClient));
867-
},
868-
);
827+
'setClient, show, setEditableSizeAndTransform, setStyle, setEditingState, clearClient',
828+
() {
829+
final MethodCall setClient = MethodCall(
830+
'TextInput.setClient', <dynamic>[123, flutterSinglelineConfig]);
831+
sendFrameworkMessage(codec.encodeMethodCall(setClient));
832+
833+
const MethodCall show = MethodCall('TextInput.show');
834+
sendFrameworkMessage(codec.encodeMethodCall(show));
835+
836+
final MethodCall setSizeAndTransform =
837+
configureSetSizeAndTransformMethodCall(
838+
150,
839+
50,
840+
Matrix4.translationValues(
841+
10.0,
842+
20.0,
843+
30.0,
844+
).storage.toList());
845+
sendFrameworkMessage(codec.encodeMethodCall(setSizeAndTransform));
846+
847+
final MethodCall setStyle =
848+
configureSetStyleMethodCall(12, 'sans-serif', 4, 4, 1);
849+
sendFrameworkMessage(codec.encodeMethodCall(setStyle));
850+
851+
const MethodCall setEditingState =
852+
MethodCall('TextInput.setEditingState', <String, dynamic>{
853+
'text': 'abcd',
854+
'selectionBase': 2,
855+
'selectionExtent': 3,
856+
});
857+
sendFrameworkMessage(codec.encodeMethodCall(setEditingState));
858+
859+
final HtmlElement domElement = textEditing.editingElement.domElement;
860+
861+
checkInputEditingState(domElement, 'abcd', 2, 3);
862+
863+
// Check if the position is correct.
864+
expect(
865+
domElement.getBoundingClientRect(),
866+
Rectangle<double>.fromPoints(
867+
const Point<double>(10.0, 20.0), const Point<double>(160.0, 70.0)),
868+
);
869+
expect(
870+
domElement.style.transform,
871+
'matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 10, 20, 30, 1)',
872+
);
873+
expect(
874+
textEditing.editingElement.domElement.style.font,
875+
'500 12px sans-serif',
876+
);
877+
878+
const MethodCall clearClient = MethodCall('TextInput.clearClient');
879+
sendFrameworkMessage(codec.encodeMethodCall(clearClient));
880+
},
881+
// TODO(nurhan): https://github.com/flutter/flutter/issues/50590
882+
skip: browserEngine == BrowserEngine.webkit);
869883

870884
test('input font set succesfully with null fontWeightIndex', () {
871885
final MethodCall setClient = MethodCall(
@@ -907,7 +921,9 @@ void main() {
907921
textEditing.editingElement.domElement.style.font, '12px sans-serif');
908922

909923
hideKeyboard();
910-
});
924+
},
925+
// TODO(nurhan): https://github.com/flutter/flutter/issues/50590
926+
skip: browserEngine == BrowserEngine.webkit);
911927

912928
test(
913929
'negative base offset and selection extent values in editing state is handled',
@@ -1172,7 +1188,8 @@ void main() {
11721188
EditingState _editingState;
11731189

11741190
setUp(() {
1175-
editingElement = GloballyPositionedTextEditingStrategy(HybridTextEditing());
1191+
editingElement =
1192+
GloballyPositionedTextEditingStrategy(HybridTextEditing());
11761193
editingElement.enable(
11771194
singlelineConfig,
11781195
onChange: trackEditingState,

0 commit comments

Comments
 (0)