Skip to content

Commit 2bdc020

Browse files
pietroidpietroid
authored
chore: bumping flutter version to 3.29.0 and bumping example dependencies (#88)
* chore: bumping flutter version to 3.29.0 and bumping example dependencies * fix: reformatting files * fix formatting * fixing formatting in examples
1 parent 62c0e9e commit 2bdc020

15 files changed

+437
-433
lines changed

‎.github/workflows/main.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
flutter-version:
2323
# The version of Flutter to use should use the minimum Dart SDK version supported by the package,
2424
# refer to https://docs.flutter.dev/development/tools/sdk/releases.
25-
- "3.24.0"
25+
- "3.29.0"
2626
- "3.x"
2727
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
2828
with:

‎example/lib/ui/home_screen.dart‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,7 @@ class _HomeScreenState extends State<HomeScreen> {
7070
final monospaceFontFamily = Platform.isIOS ? 'Courier' : 'monospace';
7171

7272
return Scaffold(
73-
appBar: AppBar(
74-
title: const Text('Mockingjay Example'),
75-
),
73+
appBar: AppBar(title: const Text('Mockingjay Example')),
7674
body: Center(
7775
child: DefaultTextStyle.merge(
7876
textAlign: TextAlign.center,
@@ -91,7 +89,8 @@ class _HomeScreenState extends State<HomeScreen> {
9189
TextSpan(
9290
children: [
9391
const TextSpan(
94-
text: 'Use one of the following buttons to trigger a '
92+
text:
93+
'Use one of the following buttons to trigger a '
9594
'navigation change.\n'
9695
'Check out the test files in the ',
9796
),

‎example/lib/ui/pincode_screen.dart‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@ class _PincodeScreenState extends State<PincodeScreen> {
5151
final monospaceFontFamily = Platform.isIOS ? 'Courier' : 'monospace';
5252

5353
return Scaffold(
54-
appBar: AppBar(
55-
title: const Text('Pincode Screen'),
56-
),
54+
appBar: AppBar(title: const Text('Pincode Screen')),
5755
body: Center(
5856
child: DefaultTextStyle.merge(
5957
textAlign: TextAlign.center,

‎example/lib/ui/quiz_dialog.dart‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import 'package:flutter/cupertino.dart';
22

3-
enum QuizOption {
4-
pizza,
5-
hamburger,
6-
}
3+
enum QuizOption { pizza, hamburger }
74

85
class QuizDialog extends StatelessWidget {
96
const QuizDialog({super.key});

‎example/pubspec.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ version: 0.0.1
44
homepage: https://github.com/VeryGoodOpenSource/mockingjay
55

66
environment:
7-
sdk: ^3.5.0
7+
sdk: ^3.7.0
88

99
dependencies:
10-
bloc: ^8.1.4
10+
bloc: ^9.0.0
1111
equatable: ^2.0.5
1212
flutter:
1313
sdk: flutter
14-
flutter_bloc: ^8.1.6
14+
flutter_bloc: ^9.1.0
1515
universal_io: ^2.2.2
1616

1717
dev_dependencies:
18-
bloc_test: ^9.1.7
18+
bloc_test: ^10.0.0
1919
flutter_test:
2020
sdk: flutter
2121
mockingjay:

‎example/test/helpers.dart‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,11 @@ import 'package:flutter/material.dart';
22
import 'package:flutter_test/flutter_test.dart';
33

44
extension WidgetTesterX on WidgetTester {
5-
Future<void> pumpTest({
6-
required WidgetBuilder builder,
7-
}) async {
5+
Future<void> pumpTest({required WidgetBuilder builder}) async {
86
await pumpWidget(
97
MaterialApp(
108
title: 'Mock Navigator Test',
11-
home: Scaffold(
12-
body: Builder(
13-
builder: builder,
14-
),
15-
),
9+
home: Scaffold(body: Builder(builder: builder)),
1610
),
1711
);
1812
}

‎example/test/ui/home_screen_test.dart‎

Lines changed: 107 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ class FakeRoute<T> extends Fake implements Route<T> {}
1010

1111
void main() {
1212
group('HomeScreen', () {
13-
const showPincodeScreenTextButtonKey =
14-
Key('homeScreen_showPincodeScreen_textButton');
15-
const showQuizDialogTextButtonKey =
16-
Key('homeScreen_showQuizDialog_textButton');
13+
const showPincodeScreenTextButtonKey = Key(
14+
'homeScreen_showPincodeScreen_textButton',
15+
);
16+
const showQuizDialogTextButtonKey = Key(
17+
'homeScreen_showQuizDialog_textButton',
18+
);
1719

1820
late MockNavigator navigator;
1921

@@ -39,10 +41,7 @@ void main() {
3941
},
4042
);
4143

42-
expect(
43-
find.byKey(showPincodeScreenTextButtonKey),
44-
findsOneWidget,
45-
);
44+
expect(find.byKey(showPincodeScreenTextButtonKey), findsOneWidget);
4645
});
4746

4847
testWidgets('navigates to PincodeScreen when pressed', (tester) async {
@@ -55,9 +54,7 @@ void main() {
5554
},
5655
);
5756

58-
await tester.tap(
59-
find.byKey(showPincodeScreenTextButtonKey),
60-
);
57+
await tester.tap(find.byKey(showPincodeScreenTextButtonKey));
6158

6259
verify(
6360
() => navigator.push<String?>(
@@ -91,37 +88,32 @@ void main() {
9188
);
9289
});
9390

94-
testWidgets(
95-
'displays snackbar when no pincode was submitted',
96-
(tester) async {
97-
when(
98-
() => navigator.push<String?>(
99-
any(
100-
that: isRoute<String?>(
101-
whereName: equals('/pincode_screen'),
102-
),
103-
),
104-
),
105-
).thenAnswer((_) async => null);
106-
107-
await tester.pumpTest(
108-
builder: (context) {
109-
return MockNavigatorProvider(
110-
navigator: navigator,
111-
child: const HomeScreen(),
112-
);
113-
},
114-
);
115-
116-
await tester.tap(find.byKey(showPincodeScreenTextButtonKey));
117-
await tester.pumpAndSettle();
118-
119-
expect(
120-
find.widgetWithText(SnackBar, 'No pincode submitted. 😲'),
121-
findsOneWidget,
122-
);
123-
},
124-
);
91+
testWidgets('displays snackbar when no pincode was submitted', (
92+
tester,
93+
) async {
94+
when(
95+
() => navigator.push<String?>(
96+
any(that: isRoute<String?>(whereName: equals('/pincode_screen'))),
97+
),
98+
).thenAnswer((_) async => null);
99+
100+
await tester.pumpTest(
101+
builder: (context) {
102+
return MockNavigatorProvider(
103+
navigator: navigator,
104+
child: const HomeScreen(),
105+
);
106+
},
107+
);
108+
109+
await tester.tap(find.byKey(showPincodeScreenTextButtonKey));
110+
await tester.pumpAndSettle();
111+
112+
expect(
113+
find.widgetWithText(SnackBar, 'No pincode submitted. 😲'),
114+
findsOneWidget,
115+
);
116+
});
125117
});
126118

127119
group('show quiz dialog button', () {
@@ -132,10 +124,7 @@ void main() {
132124
},
133125
);
134126

135-
expect(
136-
find.byKey(showQuizDialogTextButtonKey),
137-
findsOneWidget,
138-
);
127+
expect(find.byKey(showQuizDialogTextButtonKey), findsOneWidget);
139128
});
140129

141130
testWidgets('shows quiz dialog when pressed', (tester) async {
@@ -155,83 +144,78 @@ void main() {
155144
).called(1);
156145
});
157146

158-
testWidgets(
159-
'displays snackbar when pizza was selected',
160-
(tester) async {
161-
when(
162-
() => navigator.push<QuizOption>(any(that: isRoute<QuizOption>())),
163-
).thenAnswer((_) async => QuizOption.pizza);
164-
165-
await tester.pumpTest(
166-
builder: (context) {
167-
return MockNavigatorProvider(
168-
navigator: navigator,
169-
child: const HomeScreen(),
170-
);
171-
},
172-
);
173-
174-
await tester.tap(find.byKey(showQuizDialogTextButtonKey));
175-
await tester.pumpAndSettle();
176-
177-
expect(
178-
find.widgetWithText(SnackBar, 'Pizza all the way! 🍕'),
179-
findsOneWidget,
180-
);
181-
},
182-
);
183-
184-
testWidgets(
185-
'displays snackbar when hamburger was selected',
186-
(tester) async {
187-
when(
188-
() => navigator.push<QuizOption>(any(that: isRoute<QuizOption>())),
189-
).thenAnswer((_) async => QuizOption.hamburger);
190-
191-
await tester.pumpTest(
192-
builder: (context) {
193-
return MockNavigatorProvider(
194-
navigator: navigator,
195-
child: const HomeScreen(),
196-
);
197-
},
198-
);
199-
200-
await tester.tap(find.byKey(showQuizDialogTextButtonKey));
201-
await tester.pumpAndSettle();
202-
203-
expect(
204-
find.widgetWithText(SnackBar, 'Hamburger all the way! 🍔'),
205-
findsOneWidget,
206-
);
207-
},
208-
);
209-
210-
testWidgets(
211-
'displays snackbar when no answer was selected',
212-
(tester) async {
213-
when(
214-
() => navigator.push<QuizOption>(any(that: isRoute<QuizOption>())),
215-
).thenAnswer((_) async => null);
216-
217-
await tester.pumpTest(
218-
builder: (context) {
219-
return MockNavigatorProvider(
220-
navigator: navigator,
221-
child: const HomeScreen(),
222-
);
223-
},
224-
);
225-
226-
await tester.tap(find.byKey(showQuizDialogTextButtonKey));
227-
await tester.pumpAndSettle();
228-
229-
expect(
230-
find.widgetWithText(SnackBar, 'No answer selected. 😲'),
231-
findsOneWidget,
232-
);
233-
},
234-
);
147+
testWidgets('displays snackbar when pizza was selected', (tester) async {
148+
when(
149+
() => navigator.push<QuizOption>(any(that: isRoute<QuizOption>())),
150+
).thenAnswer((_) async => QuizOption.pizza);
151+
152+
await tester.pumpTest(
153+
builder: (context) {
154+
return MockNavigatorProvider(
155+
navigator: navigator,
156+
child: const HomeScreen(),
157+
);
158+
},
159+
);
160+
161+
await tester.tap(find.byKey(showQuizDialogTextButtonKey));
162+
await tester.pumpAndSettle();
163+
164+
expect(
165+
find.widgetWithText(SnackBar, 'Pizza all the way! 🍕'),
166+
findsOneWidget,
167+
);
168+
});
169+
170+
testWidgets('displays snackbar when hamburger was selected', (
171+
tester,
172+
) async {
173+
when(
174+
() => navigator.push<QuizOption>(any(that: isRoute<QuizOption>())),
175+
).thenAnswer((_) async => QuizOption.hamburger);
176+
177+
await tester.pumpTest(
178+
builder: (context) {
179+
return MockNavigatorProvider(
180+
navigator: navigator,
181+
child: const HomeScreen(),
182+
);
183+
},
184+
);
185+
186+
await tester.tap(find.byKey(showQuizDialogTextButtonKey));
187+
await tester.pumpAndSettle();
188+
189+
expect(
190+
find.widgetWithText(SnackBar, 'Hamburger all the way! 🍔'),
191+
findsOneWidget,
192+
);
193+
});
194+
195+
testWidgets('displays snackbar when no answer was selected', (
196+
tester,
197+
) async {
198+
when(
199+
() => navigator.push<QuizOption>(any(that: isRoute<QuizOption>())),
200+
).thenAnswer((_) async => null);
201+
202+
await tester.pumpTest(
203+
builder: (context) {
204+
return MockNavigatorProvider(
205+
navigator: navigator,
206+
child: const HomeScreen(),
207+
);
208+
},
209+
);
210+
211+
await tester.tap(find.byKey(showQuizDialogTextButtonKey));
212+
await tester.pumpAndSettle();
213+
214+
expect(
215+
find.widgetWithText(SnackBar, 'No answer selected. 😲'),
216+
findsOneWidget,
217+
);
218+
});
235219
});
236220
});
237221
}

0 commit comments

Comments
 (0)