Fix regular expressions for parameters parsing

Author: olexale

README.md

@@ -61,7 +61,7 @@ Feature: Counter
 
   Scenario: Plus button increases the counter
     Given the app is running
-    When I tap on {Icons.add} icon
+    When I tap {Icons.add} icon
     Then I see {1} text
 ```
 

lib/src/feature_generator.dart

@@ -37,7 +37,7 @@ String generateFeatureDart(List<BddLine> lines, List<StepFile> steps) {
           '    testWidgets(\'${scenario.first.value}\', (WidgetTester tester) async {');
 
       for (final step in scenario.skip(1)) {
-        sb.writeln('      await ${_generateStepCall(step.value)};');
+        sb.writeln('      await ${getStepMethodCall(step.value)};');
       }
 
       sb.writeln('    });');
@@ -48,19 +48,6 @@ String generateFeatureDart(List<BddLine> lines, List<StepFile> steps) {
   return sb.toString();
 }
 
-String _generateStepCall(String stepLine) {
-  final name = getStepMethodName(stepLine);
-
-  final regExp = RegExp(r'(?<=\{)\S+(?=\})', caseSensitive: false);
-  final params = regExp.allMatches(stepLine);
-  if (params.isEmpty) {
-    return '$name(tester)';
-  }
-
-  final methodParameters = params.map((p) => p.group(0)).join(', ');
-  return '$name(tester, $methodParameters)';
-}
-
 List<List<T>> splitWhen<T>(Iterable<T> original, bool Function(T) predicate) =>
     original.fold(<List<T>>[], (previousValue, element) {
       if (predicate(element)) {

lib/src/regex.dart

@@ -0,0 +1,4 @@
+final parametersRegExp = RegExp(r'\{(.*?)\}', caseSensitive: false);
+final charactersAndNumbersRegExp = RegExp(r'[^\w\s\d]+');
+final repeatingSpacesRegExp = RegExp(r'\s+');
+final parametersValueRegExp = RegExp(r'(?<=\{).+?(?=\})', caseSensitive: false);

lib/src/step/generic_step.dart

@@ -1,8 +1,6 @@
+import 'package:bdd_widget_test/src/regex.dart';
 import 'package:bdd_widget_test/src/step/bdd_step.dart';
 
-final _parametersValueRegExp =
-    RegExp(r'(?<=\{)\S+(?=\})', caseSensitive: false);
-
 class GenericStep implements BddStep {
   GenericStep(this.methodName, this.rawLine);
 
@@ -19,7 +17,7 @@ ${getStepSignature(rawLine)} {
 ''';
 
   String getStepSignature(String stepLine) {
-    final params = _parametersValueRegExp.allMatches(stepLine);
+    final params = parametersValueRegExp.allMatches(stepLine);
     if (params.isEmpty) {
       return 'Future<void> $methodName(WidgetTester tester) async';
     }

lib/src/step_generator.dart

@@ -1,3 +1,4 @@
+import 'package:bdd_widget_test/src/regex.dart';
 import 'package:bdd_widget_test/src/step/bdd_step.dart';
 import 'package:bdd_widget_test/src/step/dismiss_the_page.dart';
 import 'package:bdd_widget_test/src/step/generic_step.dart';
@@ -10,10 +11,6 @@ import 'package:bdd_widget_test/src/step/i_tap_text.dart';
 import 'package:bdd_widget_test/src/step/the_app_is_running_step.dart';
 import 'package:strings/strings.dart';
 
-final parametersRegExp = RegExp(r'\{\S+\}', caseSensitive: false);
-final charactersAndNumbersRegExp = RegExp(r'[^\w\s\d]+');
-final repeatingSpacesRegExp = RegExp(r'\s+');
-
 String getStepFilename(String stepText) {
   final step = getStepMethodName(stepText);
   var u = underscore(step);
@@ -31,6 +28,19 @@ String getStepMethodName(String stepText) {
   return c;
 }
 
+String getStepMethodCall(String stepLine) {
+  final name = getStepMethodName(stepLine);
+
+  // final regExp = RegExp(r'(?<=\{)\S+(?=\})', caseSensitive: false);
+  final params = parametersValueRegExp.allMatches(stepLine);
+  if (params.isEmpty) {
+    return '$name(tester)';
+  }
+
+  final methodParameters = params.map((p) => p.group(0)).join(', ');
+  return '$name(tester, $methodParameters)';
+}
+
 String generateStepDart(String package, String line) {
   final methodName = getStepMethodName(line);
   final bddStep = _getStep(methodName, package, line);

pubspec.yaml

@@ -1,6 +1,6 @@
 name: bdd_widget_test
 description: A BDD-style widget testing library. Generates Flutter widget tests from *.feature files.
-version: 0.1.0+1
+version: 0.1.1
 author: Oleksandr Leuschenko <olexa.le@gmail.com>
 homepage: https://github.com/olexale/bdd_widget_test
 

test/feature_test.dart

@@ -56,7 +56,7 @@ void main() {
   group('Testing feature', () {
     testWidgets('Testing scenario', (WidgetTester tester) async {
       await theAppIsRunning(tester);
-      await iSeeText(tester, 0);
+      await iSeeText(tester, 'nice param');
       await iSeeIcon(tester, Icons.add);
     });
   });

test/step/i_see_text_test.dart

@@ -7,7 +7,7 @@ void main() {
     const featureFile = '''
 Feature: Testing feature
     Scenario: Testing scenario
-        When I see {0} text
+        When I see {'some text 42'} text
     ''';
 
     const expectedSteps = '''

test/testing_data.dart

@@ -8,7 +8,7 @@ const featureFile = '''
 Feature: Testing feature
     Scenario: Testing scenario
         Given the app is running
-        Then I see {0} text
+        Then I see {'nice param'} text
 
         And I see {Icons.add} icon
 ''';