Merge pull request #84 from olexale/bugfix/combine-params-and-datatable

Refactor generic step generator

example/test/songs.feature

@@ -1,7 +1,7 @@
 Feature: Songs
 
   Scenario: Available songs
-    Given the following songs
+    Given the following {'Good'} songs
       | 'artist'      | 'title'              |
       | 'The Beatles' | 'Let It Be'          |
       | 'Camel'       | 'Slow yourself down' |

example/test/step/the_following_songs.dart

@@ -1,7 +1,8 @@
 import 'package:bdd_widget_test/data_table.dart' as bdd;
 import 'package:flutter_test/flutter_test.dart';
 
-/// Usage: the following songs
-Future<void> theFollowingSongs(WidgetTester tester, bdd.DataTable dataTable) async {
+/// Usage: the following {'Good'} songs
+Future<void> theFollowingSongs(
+    WidgetTester tester, String param1, bdd.DataTable dataTable) async {
   throw UnimplementedError();
 }

lib/src/step/generic_step.dart

@@ -31,25 +31,16 @@ Future<void> $methodName($testerType $customTesterName${_getMethodParameters(raw
 ''';
 
   String _getMethodParameters(String stepLine, bool hadDataTable) {
-    if (hadDataTable) {
-      return ', bdd.DataTable dataTable';
-    }
-
     final params = parseRawStepLine(stepLine).skip(1);
-    if (params.isNotEmpty) {
-      return params
-          .mapIndexed(
-            (index, p) => ', ${_getGenericParameterType(p)} param${index + 1}',
-          )
-          .join();
-    }
-
     final examples = examplesRegExp.allMatches(stepLine);
-    if (examples.isNotEmpty) {
-      return examples.map((p) => ', dynamic ${p.group(1)}').join();
-    }
 
-    return '';
+    return [
+      ...params.mapIndexed(
+        (index, p) => ', ${_getGenericParameterType(p)} param${index + 1}',
+      ),
+      ...examples.map((p) => ', dynamic ${p.group(1)}'),
+      if (hasDataTable) ', bdd.DataTable dataTable',
+    ].join();
   }
 
   String _getGenericParameterType(String parameter) {

test/data_tables_test.dart

@@ -1,4 +1,5 @@
 import 'package:bdd_widget_test/src/feature_file.dart';
+import 'package:bdd_widget_test/src/step_file.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
@@ -435,4 +436,53 @@ void main() {
 
     expect(feature.dartContent, expectedFeatureDart);
   });
+  test('Data table with parameters', () {
+    const featureFile = '''
+Feature: Testing feature
+  Scenario: Testing scenario
+    Given the following {'Good'} songs
+    | artist           | title                |
+    | 'The Beatles'    | 'Let It Be'          |
+    | 'Camel'          | 'Slow yourself down' |
+''';
+
+    const expectedFeatureDart = '''
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: unused_import, directives_ordering
+
+import 'package:bdd_widget_test/data_table.dart' as bdd;
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import './step/the_following_songs.dart';
+
+void main() {
+  group(\'\'\'Testing feature\'\'\', () {
+    testWidgets(\'\'\'Testing scenario\'\'\', (tester) async {
+      await theFollowingSongs(tester, 'Good', const bdd.DataTable([[artist, title], ['The Beatles', 'Let It Be'], ['Camel', 'Slow yourself down']]));
+    });
+  });
+}
+''';
+    const expectedStep = '''
+import 'package:bdd_widget_test/data_table.dart' as bdd;
+import 'package:flutter_test/flutter_test.dart';
+
+/// Usage: the following {'Good'} songs
+Future<void> theFollowingSongs(WidgetTester tester, String param1, bdd.DataTable dataTable) async {
+  throw UnimplementedError();
+}
+''';
+
+    final feature = FeatureFile(
+      featureDir: 'test.feature',
+      package: 'test',
+      input: featureFile,
+    );
+    expect(feature.dartContent, expectedFeatureDart);
+    expect(
+      (feature.getStepFiles().first as NewStepFile).dartContent,
+      expectedStep,
+    );
+  });
 }