Skip to content

Commit c37e11b

Browse files
authored
[Decoupling] Port PR (#186667) from flutter/flutter to material_ui and cupertino_ui (#11964)
Most Material and Cupertino code was copied over from flutter/flutter in #11888, but a few PRs landed after that copy. This PR copies one of those PRs to this repo. This PR is the first PR to be ported over. Reviewers please let me know if the process of porting PRs like this looks alright to you! Ports over flutter/flutter#186667. Part of flutter/flutter#188441 and flutter/flutter#188395.
1 parent 74f506e commit c37e11b

5 files changed

Lines changed: 11 additions & 25 deletions

File tree

packages/material_ui/temporarily_disabled_tests/elevated_button_test.dart renamed to packages/material_ui/test/elevated_button_test.dart

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

5-
@Skip(
6-
'This file is skipped due to a cross-import that needs to be fixed. Tracked in https://github.com/flutter/flutter/issues/177028.',
7-
)
85
import 'package:flutter/foundation.dart';
96
import 'package:flutter/gestures.dart';
10-
import 'package:material_ui/material_ui.dart';
117
import 'package:flutter/rendering.dart';
128
import 'package:flutter_test/flutter_test.dart';
9+
import 'package:material_ui/material_ui.dart';
1310

14-
import '../widgets/semantics_tester.dart';
11+
import 'semantics_tester.dart';
1512

1613
void main() {
1714
TextStyle iconStyle(WidgetTester tester, IconData icon) {

packages/material_ui/temporarily_disabled_tests/filled_button_test.dart renamed to packages/material_ui/test/filled_button_test.dart

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

5-
@Skip(
6-
'This file is skipped due to a cross-import that needs to be fixed. Tracked in https://github.com/flutter/flutter/issues/177028.',
7-
)
85
import 'package:flutter/foundation.dart';
96
import 'package:flutter/gestures.dart';
10-
import 'package:material_ui/material_ui.dart';
117
import 'package:flutter/rendering.dart';
128
import 'package:flutter_test/flutter_test.dart';
9+
import 'package:material_ui/material_ui.dart';
1310

14-
import '../widgets/semantics_tester.dart';
11+
import 'semantics_tester.dart';
1512

1613
void main() {
1714
TextStyle iconStyle(WidgetTester tester, IconData icon) {

packages/material_ui/temporarily_disabled_tests/material_button_test.dart renamed to packages/material_ui/test/material_button_test.dart

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

5-
@Skip(
6-
'This file is skipped due to a cross-import that needs to be fixed. Tracked in https://github.com/flutter/flutter/issues/177028.',
7-
)
85
import 'package:flutter/foundation.dart' show kIsWeb;
96
import 'package:flutter/gestures.dart';
10-
import 'package:material_ui/material_ui.dart';
117
import 'package:flutter/rendering.dart';
128
import 'package:flutter_test/flutter_test.dart';
13-
import '../widgets/semantics_tester.dart';
9+
import 'package:material_ui/material_ui.dart';
10+
11+
import 'semantics_tester.dart';
1412

1513
void main() {
1614
setUp(() {

packages/material_ui/temporarily_disabled_tests/outlined_button_test.dart renamed to packages/material_ui/test/outlined_button_test.dart

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

5-
@Skip(
6-
'This file is skipped due to a cross-import that needs to be fixed. Tracked in https://github.com/flutter/flutter/issues/177028.',
7-
)
85
// This file is run as part of a reduced test set in CI on Mac and Windows
96
// machines.
107
@Tags(<String>['reduced-test-set'])
118
library;
129

1310
import 'package:flutter/foundation.dart';
1411
import 'package:flutter/gestures.dart';
15-
import 'package:material_ui/material_ui.dart';
1612
import 'package:flutter/rendering.dart';
1713
import 'package:flutter_test/flutter_test.dart';
14+
import 'package:material_ui/material_ui.dart';
1815

19-
import '../widgets/semantics_tester.dart';
16+
import 'semantics_tester.dart';
2017

2118
void main() {
2219
TextStyle iconStyle(WidgetTester tester, IconData icon) {

packages/material_ui/temporarily_disabled_tests/text_button_test.dart renamed to packages/material_ui/test/text_button_test.dart

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

5-
@Skip(
6-
'This file is skipped due to a cross-import that needs to be fixed. Tracked in https://github.com/flutter/flutter/issues/177028.',
7-
)
85
import 'package:flutter/foundation.dart';
96
import 'package:flutter/gestures.dart';
10-
import 'package:material_ui/material_ui.dart';
117
import 'package:flutter/rendering.dart';
128
import 'package:flutter_test/flutter_test.dart';
9+
import 'package:material_ui/material_ui.dart';
1310

14-
import '../widgets/semantics_tester.dart';
11+
import 'semantics_tester.dart';
1512

1613
void main() {
1714
TextStyle iconStyle(WidgetTester tester, IconData icon) {

0 commit comments

Comments
 (0)