Jonny Borges
Committed by GitHub

Merge pull request #2848 from tshedor/master

fix: respect query and required parameters
@@ -700,9 +700,7 @@ class GetDelegate extends RouterDelegate<RouteDecoder> @@ -700,9 +700,7 @@ class GetDelegate extends RouterDelegate<RouteDecoder>
700 RouteDecoder decoder, PageSettings arguments) { 700 RouteDecoder decoder, PageSettings arguments) {
701 final parameters = 701 final parameters =
702 arguments.params.isEmpty ? arguments.query : arguments.params; 702 arguments.params.isEmpty ? arguments.query : arguments.params;
703 - if (arguments.params.isEmpty) {  
704 arguments.params.addAll(arguments.query); 703 arguments.params.addAll(arguments.query);
705 - }  
706 if (decoder.parameters.isEmpty) { 704 if (decoder.parameters.isEmpty) {
707 decoder.parameters.addAll(parameters); 705 decoder.parameters.addAll(parameters);
708 } 706 }
@@ -160,6 +160,14 @@ void main() { @@ -160,6 +160,14 @@ void main() {
160 160
161 expect(Get.parameters['id'], '1234'); 161 expect(Get.parameters['id'], '1234');
162 expect(Get.parameters['name'], 'ana'); 162 expect(Get.parameters['name'], 'ana');
  163 +
  164 + Get.toNamed('/last/1234/ana/profile?job=dev');
  165 +
  166 + await tester.pumpAndSettle();
  167 +
  168 + expect(Get.parameters['id'], '1234');
  169 + expect(Get.parameters['name'], 'ana');
  170 + expect(Get.parameters['job'], 'dev');
163 }, 171 },
164 ); 172 );
165 173