ISSUE-337: test

tests/features/bootstrap/BaseContext.php

@@ -56,7 +56,7 @@ public function spins($closure, $tries = 10)
     }
 
     /**
-     * @When something long is taking long but should output :text
+     * @When /^something long is taking long but should output :([^"]+)$/
      */
     public function somethingLongShouldOutput($text)
     {
@@ -68,7 +68,7 @@ public function somethingLongShouldOutput($text)
     }
 
     /**
-     * @Then do something on a button that might not be there yet
+     * @Then /^do something on a button that might not be there yet$/
      */
     public function doSomethingNotThereYet()
     {

tests/features/bootstrap/FeatureContext.php

@@ -125,7 +125,7 @@ protected function throwExpectationException($message)
     }
 
     /**
-     * @When something long is taking long but should output :text
+     * @When /^something long is taking long but should output :([^"]+)$/
      */
     public function somethingLongShouldOutput($text)
     {
@@ -137,7 +137,7 @@ public function somethingLongShouldOutput($text)
     }
 
     /**
-     * @Then do something on a button that might not be there yet
+     * @Then /^do something on a button that might not be there yet$/
      */
     public function doSomethingNotThereYet()
     {
@@ -203,15 +203,15 @@ public function getToken()
     }
 
     /**
-     * @When I fill in :arg1 with a valid username
+     * @When /^I fill in :arg1 with a valid username$/
      */
     public function iFillInWithAValidUsername($arg1)
     {
         $this->fillField($arg1, $this->params['admin_username']);
     }
 
     /**
-     * @When I fill in :arg1 with a valid password
+     * @When /^I fill in :arg1 with a valid password/
      */
     public function iFillInWithAValidPassword($arg1)
     {
@@ -258,7 +258,7 @@ public function iHaveNotYetCreatedCampaigns()
     }
 
     /**
-     * @Given /^I have subscriber with email "([^"]*)"/
+     * @Given /^I have subscriber with email "([^"]*)"$/
      */
     public function iHaveSubscriber($email)
     {
@@ -293,7 +293,7 @@ public function generateUrl($params)
 
     /**
      * @param $num
-     * @Then /^I wait for .* (second|seconds)/
+     * @Then /^I wait for .* (second|seconds)$/
      */
     public function iWaitForSeconds($num)
     {
@@ -310,16 +310,16 @@ public function iWaitForTheAjaxResponse()
     }
 
      /**
-     * @Given I go back
-     */
+      * @Given /^I go back$/
+      */
     public function iGoBack()
     {
         $this->getSession()->getDriver()->back();
     }
 
      /**
-     * @When I confirm the popup
-     */
+      * @When /^I confirm the popup$/
+      */
     public function iConfirmThePopup()
     {  
         $this->getSession()->getDriver()->getWebDriverSession()->accept_alert();

tests/features/bootstrap/MailContext.php

@@ -27,7 +27,7 @@ public function __construct($mail_dir)
      * Empty mails directory before scenario
      *
      * @BeforeScenario @emptySentMail
-     * @Then I have empty mailbox
+     * @Then /^I have empty mailbox$/
      */
     public function iHaveEmptyEmailBox()
     {
@@ -40,7 +40,7 @@ public function iHaveEmptyEmailBox()
     }
 
     /**
-     * @Given /I should have email sent with the following:/
+     * @Given /^I should have email sent with the following:$/
      */
     public function iHaveSentEmailWithTheFollowing(TableNode $node)
     {
@@ -86,7 +86,7 @@ public function iHaveSentEmailWithTheFollowing(TableNode $node)
 
 
     /**
-     * @Given /I should have email sent from address "(.*)"/
+     * @Given /^I should have email sent from address "(.*)"$/
      * @throws Exception
      */
     public function iHaveEmailSentFromAddress($from)
@@ -100,7 +100,7 @@ public function iHaveEmailSentFromAddress($from)
     }
 
     /**
-     * @Given /I should have email sent from "(.*)"/
+     * @Given /^I should have email sent from "(.*)"$/
      */
     public function iHaveEmailSentFrom($senderName)
     {
@@ -113,7 +113,7 @@ public function iHaveEmailSentFrom($senderName)
     }
 
     /**
-     * @Given /I should have email sent to address "(.*)"/
+     * @Given /^I should have email sent to address "(.*)"$/
      */
     public function iHaveEmailSentToAddress($to)
     {
@@ -126,7 +126,7 @@ public function iHaveEmailSentToAddress($to)
     }
 
     /**
-     * @Given /^I should have email sent to "(.*)"/
+     * @Given /^I should have email sent to "(.*)"$/
      */
     public function iHaveEmailSentToName($toName)
     {
@@ -139,7 +139,7 @@ public function iHaveEmailSentToName($toName)
     }
 
     /**
-     * @Given /I should have email sent contains "(.*)"/
+     * @Given /^I should have email sent contains "(.*)"$/
      * @throws AssertSentEmailException
      */
     public function iHaveEmailSentContains($expected)
@@ -225,4 +225,4 @@ private function getMailFiles()
 
 class AssertSentEmailException extends \Exception
 {
-}
+}

tests/features/bootstrap/ScreenshotContext.php

@@ -32,7 +32,7 @@ public function takeScreenshotAfterFailedStep($event)
     }
 
     /**
-     * @Then take a screenshot
+     * @Then /^take a screenshot$/
      */
     public function takeAScreenshot()
     {

tests/features/bootstrap/SubscriberContext.php

@@ -25,12 +25,11 @@ public function beforeScenario(BeforeScenarioScope $scope)
 
     /**
      * @param string $list
-     * @param array $table
-     *
-     * @Given /I have "(.*)" list with the following subscribers:/
+     * @param PyStringNode $stringNode
      * @throws Exception
+     * @Given /^I have "(.*)" list with the following subscribers:$/
      */
-    public function iHaveSubscribersForList($list, PyStringNode $stringNode)
+    public function iHaveSubscribersForList(string $list, PyStringNode $stringNode)
     {
         $rows = $stringNode->getStrings();
         $db = $this->featureContext->getMysqli();
@@ -137,9 +136,8 @@ public function iHaveList($name, $owner = null, $description=null)
     }
 
 
-
     /**
-     * @Given /I want to send campaign with title "(.*)"/
+     * @Given /^I want to send campaign with title "(.*)"$/
      */
     public function iWantToSendCampaignWithTitle($title)
     {
@@ -167,7 +165,7 @@ public function iWantToSendCampaignWithTitle($title)
 
     /**
      * @param $name
-     * @Given /^I check "(.*)" as target list/
+     * @Given /^I check "(.*)" as target list$/
      */
     public function iCheckAsTargetList($name)
     {