improved behat smtp feature, fix travis build error

Author: kilip

.travis.yml

@@ -7,21 +7,21 @@ cache:
 matrix:
     include:
         - php: '5.4'
-          env: BROWSER=goutte
-        - php: '5.5'
-          env: BROWSER=goutte
+          env: BROWSER=goutte TAGS="~javascript && ~@first-run && ~@wip"
+        - php: '5.5' 
+          env: BROWSER=goutte TAGS="~javascript && ~@first-run && ~@wip"
         - php: '5.6'
-          env: BROWSER=goutte
+          env: BROWSER=goutte TAGS="~javascript && ~@first-run && ~@wip"
         - php: '7.0'
-          env: BROWSER=goutte
+          env: BROWSER=goutte TAGS="~javascript && ~@first-run && ~@wip"
         - php: '7.1'
-          env: BROWSER=goutte
+          env: BROWSER=goutte TAGS="~javascript && ~@first-run && ~@wip"
         - php: '7.1'
-          env: BROWSER=chrome
+          env: BROWSER=chrome TAGS="~@first-run && ~@wip"
         - php: '7.2'
-          env: BROWSER=goutte
+          env: BROWSER=goutte TAGS="~javascript && ~@first-run && ~@wip"
         - php: '7.2'
-          env: BROWSER=chrome
+          env: BROWSER=chrome TAGS="~@first-run && ~@wip"
 
 
 notifications:
@@ -44,7 +44,8 @@ install:
   - composer install --prefer-dist --no-interaction
 
   # start php server for non php >=5.4 version
-  - cp -fv ./tests/config.php.dist public_html/lists/config/config.php
+  - cp -fv tests/travis-ci/behat.yml behat.yml
+  - cp -fv tests/travis-ci/config.php public_html/lists/config/config.php
   - php -S localhost:8000 -t public_html > /dev/null 2>&1 &
 
   # start selenium and php server
@@ -55,8 +56,6 @@ install:
 
   # setup database and phplist
   - mkdir -p build/screenshot
-  - cp -f tests/travis-ci/behat.yml behat.yml
-  - cp -f tests/travis-ci/config.php public_html/lists/config/config.php
   - cd public_html/lists/admin/ui/ && wget https://github.com/phpList/phplist-ui-bootlist/archive/master.tar.gz
     && tar -xzf master.tar.gz && mv phplist-ui-bootlist-master phplist-ui-bootlist &&
     rm master.tar.gz && cd ../../../../
@@ -69,19 +68,24 @@ install:
 
 before_script:
   - sudo service postfix stop
+  - mkdir -p build/mails
+  - cd build/mails
   - smtp-sink -d "%d.%H.%M.%S" localhost:2500 1000 &
+  - cd ${TRAVIS_BUILD_DIR}
 
 script:
   # check syntax
   - ./vendor/bin/phpLint ./public_html
 
   # run setup feature first to create database
-  - ./vendor/bin/behat -fprogress -p $BROWSER --strict --tags=@first-run
+  - ./vendor/bin/behat -n -fprogress -p $BROWSER --strict --tags=@first-run
 
   # run all feature except @first-run
-  - ./vendor/bin/behat -fprogress -p $BROWSER --strict --tags="~@first-run && ~@wip"
+  - ./vendor/bin/behat -n -fprogress -p $BROWSER --strict --tags="${TAGS}"
 addons:
   chrome: stable
 
 after_failure:
+  - ls -l build/mails
+  - ls -l
   - IMGUR_CLIENT_ID=bec050c54e1bb52 ./bin/imgur-uploader.sh build/screenshot/*.png

default.behat.yml

@@ -9,14 +9,18 @@ default:
                 - FeatureContext:
                     # Set database access credentials
                     database:
-                        host: localhost
+                        host: 127.0.0.1
                         user: phplist
                         password: phplist
                         name: phplistdb
                     # Set admin user login credentials
                     admin:
                         username: admin
                         password: Mypassword123+
+                - MailContext:
+                    mail_dir: %paths.base%/build/mails
+                - SubscriberContext
+                - UserContext
     extensions:
         Bex\Behat\ScreenshotExtension:
             image_drivers:
@@ -27,21 +31,26 @@ default:
                     clear_screenshot_directory: true
 
         Behat\MinkExtension:
-            base_url:  'http://localhost:8000'
+            base_url:  'http://127.0.0.1:8000'
             default_session: goutte
             goutte: ~
             sessions:
                 default:
                     goutte: ~
                 chrome:
                     selenium2:
+                        browser: chrome
                         capabilities:
+                            browserName: chrome
                             browser: chrome
+                            version: ""
                             chrome:
                                 switches:
-                                    - "--window-size=2000,2000"
-                                    - "--disable-gpu"
                                     - "--headless"
+                                    - "--disable-gpu"
+                                    - "--window-size=2000,2000"
+                                    - "--lang=en"
+                                    - "--no-sandbox"
 
                 firefox:
                     selenium2:
@@ -64,4 +73,4 @@ firefox:
     extensions:
         Behat\MinkExtension:
             default_session: firefox
-            browser_name: firefox
+            browser_name: firefox

public_html/lists/config/config.php

@@ -16,7 +16,7 @@
 */
 
 // what is your Mysql database server hostname
-$database_host = 'localhost';
+$database_host = '127.0.0.1';
 
 // what is the name of the database we are using
 $database_name = 'phplistdb';
@@ -30,15 +30,10 @@
 // if you have an SMTP server, set it here. Otherwise it will use the normal php mail() function
 //# if your SMTP server is called "smtp.mydomain.com" you enter this below like this:
 //#
-//#     define("PHPMAILERHOST",'smtp.mydomain.com');
+define("PHPMAILERHOST",'127.0.0.1');
+define('PHPMAILERPORT',2500);
 
-define('PHPMAILERHOST', '');
-
-// if TEST is set to 1 (not 0) it will not actually send ANY messages, but display what it would have sent
-// this is here, to make sure you edited the config file and mails are not sent "accidentally"
-// on unmanaged systems
-
-define('TEST', 1);
+define('TEST', 0);
 
 /*
 

tests/config.php.dist

@@ -4,6 +4,7 @@
 
 use Behat\Behat\Context\Context;
 use Behat\Gherkin\Node\TableNode;
+use Behat\Gherkin\Node\PyStringNode;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 
 class SubscriberContext implements Context
@@ -27,16 +28,16 @@ public function beforeScenario(BeforeScenarioScope $scope)
      * @param array $table
      *
      * @Given /I have "(.*)" list with the following subscribers:/
+     * @throws Exception
      */
-    public function iHaveSubscribersForList($list,TableNode $table)
+    public function iHaveSubscribersForList($list, PyStringNode $stringNode)
     {
-
+        $rows = $stringNode->getStrings();
         $db = $this->featureContext->getMysqli();
-        $rows = $table->getRows();
         $list = $this->iHaveList($list);
         $table = 'phplist_listuser';
         foreach($rows as $row){
-            $subscriber = $this->iHaveSubscriber($row[0]);
+            $subscriber = $this->iHaveSubscriber($row);
 
             $select = sprintf(
                 'SELECT userid,listid from %s where userid=%s and listid=%s',

tests/features/bootstrap/SubscriberContext.php

@@ -1,4 +1,6 @@
 <?php
 
 $lib = __DIR__.'/../../../public_html/lists/admin';
+
+include_once $lib.'/inc/random_compat/random.php';
 include_once $lib.'/inc/UUID.php';

tests/features/bootstrap/bootstrap.php

@@ -21,19 +21,16 @@ Feature: SMTP Mail test
         And I should have email sent from "From Me"
         And I should have email sent to address "[email protected]"
         And I should have email sent contains "This is the Content of the Campaign"
-        # @todo: remove this failed test before pull request merged
-        And I should have email sent with the following:
-            | from         | Failed Name             |
-            | from address | fail.from@mydomain.com  |
-            | to address   | fail.to@pplist.dev      |
 
     @emptySentMail @javascript
     Scenario: Sending campaign with list subscribers
         Given I have logged in as an administrator
         And I have "smtp" list with the following subscribers:
-            | test1@phplist.dev |
-            | test2@phplist.dev |
-            | test3@phplist.dev |
+            """
+            [email protected]
+            [email protected]
+            [email protected]
+            """
         And I follow "Campaigns"
         And I follow "Send a campaign"
         And I follow "start a new campaign"