Skip to content

Commit 41a70e3

Browse files
vasilich6107vasilich6107
committed
test fixes
flutter-version: 3.27.4 bugfix rf18
1 parent 40a2276 commit 41a70e3

File tree

85 files changed

+736
-533
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+736
-533
lines changed

‎.github/workflows/pr-check-annotation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup Flutter
1919
uses: subosito/flutter-action@v2
2020
with:
21-
flutter-version: 3.27.4
21+
flutter-version: 3.32.2
2222
channel: stable
2323
cache: true
2424
- name: Check out repository code

‎.github/workflows/pr-check-example.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup Flutter
1919
uses: subosito/flutter-action@v2
2020
with:
21-
flutter-version: 3.27.4
21+
flutter-version: 3.32.2
2222
channel: stable
2323
cache: true
2424
- name: Check out repository code

‎.github/workflows/pr-check-generator-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup Flutter
1919
uses: subosito/flutter-action@v2
2020
with:
21-
flutter-version: 3.27.4
21+
flutter-version: 3.32.2
2222
channel: stable
2323
cache: true
2424
- name: Check out repository code

‎.github/workflows/pr-check-generator.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup Flutter
1919
uses: subosito/flutter-action@v2
2020
with:
21-
flutter-version: 3.27.4
21+
flutter-version: 3.32.2
2222
channel: stable
2323
cache: true
2424
- name: Check out repository code

‎packages/generator_tests/test/doc/animated_url_list_output_test.dart‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ void main() {
99
group('reactive_forms_generator', () {
1010
test(
1111
'Animated URL list Output',
12-
() async {
12+
() async {
1313
return testGenerator(
1414
fileName: fileName,
1515
model: '''
@@ -106,7 +106,7 @@ class ReactiveAnimatedUrlLisOForm extends StatelessWidget {
106106
required this.form,
107107
required this.child,
108108
this.canPop,
109-
this.onPopInvoked,
109+
this.onPopInvokedWithResult,
110110
}) : super(key: key);
111111
112112
final Widget child;
@@ -115,7 +115,8 @@ class ReactiveAnimatedUrlLisOForm extends StatelessWidget {
115115
116116
final bool Function(FormGroup formGroup)? canPop;
117117
118-
final void Function(FormGroup formGroup, bool didPop)? onPopInvoked;
118+
final ReactiveFormPopInvokedWithResultCallback<dynamic>?
119+
onPopInvokedWithResult;
119120
120121
static AnimatedUrlLisOForm? of(
121122
BuildContext context, {
@@ -142,7 +143,7 @@ class ReactiveAnimatedUrlLisOForm extends StatelessWidget {
142143
stream: form.form.statusChanged,
143144
child: ReactiveFormPopScope(
144145
canPop: canPop,
145-
onPopInvoked: onPopInvoked,
146+
onPopInvokedWithResult: onPopInvokedWithResult,
146147
child: child,
147148
),
148149
);
@@ -163,7 +164,7 @@ class AnimatedUrlLisOFormBuilder extends StatefulWidget {
163164
this.model,
164165
this.child,
165166
this.canPop,
166-
this.onPopInvoked,
167+
this.onPopInvokedWithResult,
167168
required this.builder,
168169
this.initState,
169170
}) : super(key: key);
@@ -174,7 +175,8 @@ class AnimatedUrlLisOFormBuilder extends StatefulWidget {
174175
175176
final bool Function(FormGroup formGroup)? canPop;
176177
177-
final void Function(FormGroup formGroup, bool didPop)? onPopInvoked;
178+
final ReactiveFormPopInvokedWithResultCallback<dynamic>?
179+
onPopInvokedWithResult;
178180
179181
final Widget Function(
180182
BuildContext context, AnimatedUrlLisOForm formModel, Widget? child)
@@ -262,7 +264,7 @@ class _AnimatedUrlLisOFormBuilderState
262264
child: ReactiveFormBuilder(
263265
form: () => _formModel.form,
264266
canPop: widget.canPop,
265-
onPopInvoked: widget.onPopInvoked,
267+
onPopInvokedWithResult: widget.onPopInvokedWithResult,
266268
builder: (context, formGroup, child) =>
267269
widget.builder(context, _formModel, widget.child),
268270
child: widget.child,

‎packages/generator_tests/test/doc/animated_url_list_test.dart‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ void main() {
99
group('reactive_forms_generator', () {
1010
test(
1111
'Animated URL list',
12-
() async {
12+
() async {
1313
return testGenerator(
1414
fileName: fileName,
1515
model: '''
@@ -106,7 +106,7 @@ class ReactiveAnimatedUrlListForm extends StatelessWidget {
106106
required this.form,
107107
required this.child,
108108
this.canPop,
109-
this.onPopInvoked,
109+
this.onPopInvokedWithResult,
110110
}) : super(key: key);
111111
112112
final Widget child;
@@ -115,7 +115,8 @@ class ReactiveAnimatedUrlListForm extends StatelessWidget {
115115
116116
final bool Function(FormGroup formGroup)? canPop;
117117
118-
final void Function(FormGroup formGroup, bool didPop)? onPopInvoked;
118+
final ReactiveFormPopInvokedWithResultCallback<dynamic>?
119+
onPopInvokedWithResult;
119120
120121
static AnimatedUrlListForm? of(
121122
BuildContext context, {
@@ -142,7 +143,7 @@ class ReactiveAnimatedUrlListForm extends StatelessWidget {
142143
stream: form.form.statusChanged,
143144
child: ReactiveFormPopScope(
144145
canPop: canPop,
145-
onPopInvoked: onPopInvoked,
146+
onPopInvokedWithResult: onPopInvokedWithResult,
146147
child: child,
147148
),
148149
);
@@ -163,7 +164,7 @@ class AnimatedUrlListFormBuilder extends StatefulWidget {
163164
this.model,
164165
this.child,
165166
this.canPop,
166-
this.onPopInvoked,
167+
this.onPopInvokedWithResult,
167168
required this.builder,
168169
this.initState,
169170
}) : super(key: key);
@@ -174,7 +175,8 @@ class AnimatedUrlListFormBuilder extends StatefulWidget {
174175
175176
final bool Function(FormGroup formGroup)? canPop;
176177
177-
final void Function(FormGroup formGroup, bool didPop)? onPopInvoked;
178+
final ReactiveFormPopInvokedWithResultCallback<dynamic>?
179+
onPopInvokedWithResult;
178180
179181
final Widget Function(
180182
BuildContext context, AnimatedUrlListForm formModel, Widget? child)
@@ -262,7 +264,7 @@ class _AnimatedUrlListFormBuilderState
262264
child: ReactiveFormBuilder(
263265
form: () => _formModel.form,
264266
canPop: widget.canPop,
265-
onPopInvoked: widget.onPopInvoked,
267+
onPopInvokedWithResult: widget.onPopInvokedWithResult,
266268
builder: (context, formGroup, child) =>
267269
widget.builder(context, _formModel, widget.child),
268270
child: widget.child,

‎packages/generator_tests/test/doc/annotateless_output_test.dart‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ void main() {
99
group('reactive_forms_generator', () {
1010
test(
1111
'Form with annotateless fields',
12-
() async {
12+
() async {
1313
return testGenerator(
1414
fileName: fileName,
1515
model: '''
@@ -96,7 +96,7 @@ class ReactiveAnnotatelessOForm extends StatelessWidget {
9696
required this.form,
9797
required this.child,
9898
this.canPop,
99-
this.onPopInvoked,
99+
this.onPopInvokedWithResult,
100100
}) : super(key: key);
101101
102102
final Widget child;
@@ -105,7 +105,8 @@ class ReactiveAnnotatelessOForm extends StatelessWidget {
105105
106106
final bool Function(FormGroup formGroup)? canPop;
107107
108-
final void Function(FormGroup formGroup, bool didPop)? onPopInvoked;
108+
final ReactiveFormPopInvokedWithResultCallback<dynamic>?
109+
onPopInvokedWithResult;
109110
110111
static AnnotatelessOForm? of(
111112
BuildContext context, {
@@ -132,7 +133,7 @@ class ReactiveAnnotatelessOForm extends StatelessWidget {
132133
stream: form.form.statusChanged,
133134
child: ReactiveFormPopScope(
134135
canPop: canPop,
135-
onPopInvoked: onPopInvoked,
136+
onPopInvokedWithResult: onPopInvokedWithResult,
136137
child: child,
137138
),
138139
);
@@ -153,7 +154,7 @@ class AnnotatelessOFormBuilder extends StatefulWidget {
153154
this.model,
154155
this.child,
155156
this.canPop,
156-
this.onPopInvoked,
157+
this.onPopInvokedWithResult,
157158
required this.builder,
158159
this.initState,
159160
}) : super(key: key);
@@ -164,7 +165,8 @@ class AnnotatelessOFormBuilder extends StatefulWidget {
164165
165166
final bool Function(FormGroup formGroup)? canPop;
166167
167-
final void Function(FormGroup formGroup, bool didPop)? onPopInvoked;
168+
final ReactiveFormPopInvokedWithResultCallback<dynamic>?
169+
onPopInvokedWithResult;
168170
169171
final Widget Function(
170172
BuildContext context, AnnotatelessOForm formModel, Widget? child) builder;
@@ -250,7 +252,7 @@ class _AnnotatelessOFormBuilderState extends State<AnnotatelessOFormBuilder> {
250252
child: ReactiveFormBuilder(
251253
form: () => _formModel.form,
252254
canPop: widget.canPop,
253-
onPopInvoked: widget.onPopInvoked,
255+
onPopInvokedWithResult: widget.onPopInvokedWithResult,
254256
builder: (context, formGroup, child) =>
255257
widget.builder(context, _formModel, widget.child),
256258
child: widget.child,

‎packages/generator_tests/test/doc/annotateless_test.dart‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ void main() {
99
group('reactive_forms_generator', () {
1010
test(
1111
'Form with annotateless fields',
12-
() async {
12+
() async {
1313
return testGenerator(
1414
fileName: fileName,
1515
model: '''
@@ -93,7 +93,7 @@ class ReactiveAnnotatelessForm extends StatelessWidget {
9393
required this.form,
9494
required this.child,
9595
this.canPop,
96-
this.onPopInvoked,
96+
this.onPopInvokedWithResult,
9797
}) : super(key: key);
9898
9999
final Widget child;
@@ -102,7 +102,8 @@ class ReactiveAnnotatelessForm extends StatelessWidget {
102102
103103
final bool Function(FormGroup formGroup)? canPop;
104104
105-
final void Function(FormGroup formGroup, bool didPop)? onPopInvoked;
105+
final ReactiveFormPopInvokedWithResultCallback<dynamic>?
106+
onPopInvokedWithResult;
106107
107108
static AnnotatelessForm? of(
108109
BuildContext context, {
@@ -129,7 +130,7 @@ class ReactiveAnnotatelessForm extends StatelessWidget {
129130
stream: form.form.statusChanged,
130131
child: ReactiveFormPopScope(
131132
canPop: canPop,
132-
onPopInvoked: onPopInvoked,
133+
onPopInvokedWithResult: onPopInvokedWithResult,
133134
child: child,
134135
),
135136
);
@@ -150,7 +151,7 @@ class AnnotatelessFormBuilder extends StatefulWidget {
150151
this.model,
151152
this.child,
152153
this.canPop,
153-
this.onPopInvoked,
154+
this.onPopInvokedWithResult,
154155
required this.builder,
155156
this.initState,
156157
}) : super(key: key);
@@ -161,7 +162,8 @@ class AnnotatelessFormBuilder extends StatefulWidget {
161162
162163
final bool Function(FormGroup formGroup)? canPop;
163164
164-
final void Function(FormGroup formGroup, bool didPop)? onPopInvoked;
165+
final ReactiveFormPopInvokedWithResultCallback<dynamic>?
166+
onPopInvokedWithResult;
165167
166168
final Widget Function(
167169
BuildContext context, AnnotatelessForm formModel, Widget? child) builder;
@@ -247,7 +249,7 @@ class _AnnotatelessFormBuilderState extends State<AnnotatelessFormBuilder> {
247249
child: ReactiveFormBuilder(
248250
form: () => _formModel.form,
249251
canPop: widget.canPop,
250-
onPopInvoked: widget.onPopInvoked,
252+
onPopInvokedWithResult: widget.onPopInvokedWithResult,
251253
builder: (context, formGroup, child) =>
252254
widget.builder(context, _formModel, widget.child),
253255
child: widget.child,

‎packages/generator_tests/test/doc/array_nullable_output_test.dart‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class ReactiveArrayNullableOForm extends StatelessWidget {
109109
required this.form,
110110
required this.child,
111111
this.canPop,
112-
this.onPopInvoked,
112+
this.onPopInvokedWithResult,
113113
}) : super(key: key);
114114
115115
final Widget child;
@@ -118,7 +118,8 @@ class ReactiveArrayNullableOForm extends StatelessWidget {
118118
119119
final bool Function(FormGroup formGroup)? canPop;
120120
121-
final void Function(FormGroup formGroup, bool didPop)? onPopInvoked;
121+
final ReactiveFormPopInvokedWithResultCallback<dynamic>?
122+
onPopInvokedWithResult;
122123
123124
static ArrayNullableOForm? of(
124125
BuildContext context, {
@@ -145,7 +146,7 @@ class ReactiveArrayNullableOForm extends StatelessWidget {
145146
stream: form.form.statusChanged,
146147
child: ReactiveFormPopScope(
147148
canPop: canPop,
148-
onPopInvoked: onPopInvoked,
149+
onPopInvokedWithResult: onPopInvokedWithResult,
149150
child: child,
150151
),
151152
);
@@ -166,7 +167,7 @@ class ArrayNullableOFormBuilder extends StatefulWidget {
166167
this.model,
167168
this.child,
168169
this.canPop,
169-
this.onPopInvoked,
170+
this.onPopInvokedWithResult,
170171
required this.builder,
171172
this.initState,
172173
}) : super(key: key);
@@ -177,7 +178,8 @@ class ArrayNullableOFormBuilder extends StatefulWidget {
177178
178179
final bool Function(FormGroup formGroup)? canPop;
179180
180-
final void Function(FormGroup formGroup, bool didPop)? onPopInvoked;
181+
final ReactiveFormPopInvokedWithResultCallback<dynamic>?
182+
onPopInvokedWithResult;
181183
182184
final Widget Function(
183185
BuildContext context, ArrayNullableOForm formModel, Widget? child)
@@ -264,7 +266,7 @@ class _ArrayNullableOFormBuilderState extends State<ArrayNullableOFormBuilder> {
264266
child: ReactiveFormBuilder(
265267
form: () => _formModel.form,
266268
canPop: widget.canPop,
267-
onPopInvoked: widget.onPopInvoked,
269+
onPopInvokedWithResult: widget.onPopInvokedWithResult,
268270
builder: (context, formGroup, child) =>
269271
widget.builder(context, _formModel, widget.child),
270272
child: widget.child,

0 commit comments

Comments
 (0)