Merge pull request #37 from sbtqa/regexes_common_style

bring regexes to common style
sbtqa · May 11, 2018 · 3cbc372 · 3cbc372
2 parents e5ec909 + 79b1dd0
commit 3cbc372
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/ru/sbtqa/tag/apifactory/stepdefs/en/StepDefs.java b/src/main/java/ru/sbtqa/tag/apifactory/stepdefs/en/StepDefs.java
@@ -12,7 +12,7 @@ public class StepDefs extends GenericStepDefs {
      * {@inheritDoc}
      */
     @Override
-    @And("^user sends request (?:for|to|about) \\((.*?)\\)$")
+    @And("^user sends request (?:for|to|about) \\(([^)]*)\\)$")
     public void userSendRequestNoParams(String action) throws ApiException {
         super.userSendRequestNoParams(action);
     }
@@ -21,7 +21,7 @@ public void userSendRequestNoParams(String action) throws ApiException {
      * {@inheritDoc}
      */
     @Override
-    @And("^user sends request (?:for|to|about) \\((.*?)\\) with parameters:?$")
+    @And("^user sends request (?:for|to|about) \\(([^)]*)\\) with parameters:?$")
     public void userSendRequestTableParam(String action, DataTable dataTable) throws ApiException {
         super.userSendRequestTableParam(action, dataTable);
     }

diff --git a/src/main/java/ru/sbtqa/tag/apifactory/stepdefs/ru/StepDefs.java b/src/main/java/ru/sbtqa/tag/apifactory/stepdefs/ru/StepDefs.java
@@ -12,7 +12,7 @@ public class StepDefs extends GenericStepDefs {
      * {@inheritDoc}
      */
     @Override
-    @И("^(?:пользователь |он |)отправляет запрос \\((.*?)\\)$")
+    @И("^(?:пользователь |он )?отправляет запрос \\(([^)]*)\\)$")
     public void userSendRequestNoParams(String action) throws ApiException {
         super.userSendRequestNoParams(action);
     }
@@ -21,7 +21,7 @@ public void userSendRequestNoParams(String action) throws ApiException {
      * {@inheritDoc}
      */
     @Override
-    @И("^(?:пользователь |он |)отправляет запрос \\((.*?)\\) с параметрами:?$")
+    @И("^(?:пользователь |он )?отправляет запрос \\(([^)]*)\\) с параметрами:?$")
     public void userSendRequestTableParam(String action, DataTable dataTable) throws ApiException {
         super.userSendRequestTableParam(action, dataTable);
     }