Merge pull request #89 from mrrobot47/update/debugging

Update for EE::launch changes in core

Author: rahulsprajapati

.travis.yml

@@ -20,7 +20,7 @@ before_script:
 
 script:
   - cd "$TRAVIS_BUILD_DIR/../easyengine"
-  - ./vendor/bin/behat
+  - sudo ./vendor/bin/behat
 
 after_script:
   - cat /opt/easyengine/ee.log

features/bootstrap/FeatureContext.php

@@ -1,10 +1,48 @@
 <?php
+/**
+ * Behat tests.
+ *
+ * @package ee-cli
+ */
 
-include_once(__DIR__ . '/../../php/class-ee.php');
-include_once(__DIR__ . '/../../php/utils.php');
+/* Start: Loading required files to enable EE::launch() in tests. */
+define( 'EE_ROOT', __DIR__ . '/../..' );
 
+include_once( EE_ROOT . '/php/class-ee.php' );
+include_once( EE_ROOT . '/php/EE/Runner.php' );
+include_once( EE_ROOT . '/php/utils.php' );
+
+define( 'EE', true );
+define( 'EE_VERSION', trim( file_get_contents( EE_ROOT . '/VERSION' ) ) );
 define( 'EE_CONF_ROOT', '/opt/easyengine' );
 
+require_once EE_ROOT . '/php/bootstrap.php';
+
+if ( ! class_exists( 'EE\Runner' ) ) {
+	require_once EE_ROOT . '/php/EE/Runner.php';
+}
+
+if ( ! class_exists( 'EE\Configurator' ) ) {
+	require_once EE_ROOT . '/php/EE/Configurator.php';
+}
+
+$logger_dir = EE_ROOT . '/php/EE/Loggers';
+$iterator   = new \DirectoryIterator( $logger_dir );
+
+// Make sure the base class is declared first.
+include_once "$logger_dir/Base.php";
+
+foreach ( $iterator as $filename ) {
+	if ( '.php' !== pathinfo( $filename, PATHINFO_EXTENSION ) ) {
+		continue;
+	}
+
+	include_once "$logger_dir/$filename";
+}
+$runner = \EE::get_runner();
+$runner->init_logger();
+/* End. Loading required files to enable EE::launch() in tests. */
+
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\AfterFeatureScope;
 use Behat\Behat\Hook\Scope\AfterScenarioScope;

features/redirect.feature

@@ -1,14 +1,14 @@
 Feature: Site Redirection
 
   Scenario: no_www-no_ssl redirection works properly
-    When I run 'sudo bin/ee site create example.test'
+    When I run 'bin/ee site create example.test'
     Then Request on 'localhost' with header 'Host: www.example.test' should contain following headers:
     | header                         |
     | HTTP/1.1 301 Moved Permanently |
     | Location: http://example.test/ |
 
   Scenario: www-no_ssl redirection works properly
-    When I run 'sudo bin/ee site create www.example1.test'
+    When I run 'bin/ee site create www.example1.test'
     Then Request on 'localhost' with header 'Host: example1.test' should contain following headers:
     | header                              |
     | HTTP/1.1 301 Moved Permanently      |

features/site.feature

@@ -1,16 +1,8 @@
 Feature: Site Command
 
-  Scenario: ee throws error when run without root
-    Given 'bin/ee' is installed
-    When I run 'bin/ee'
-    Then STDERR should return exactly
-    """
-    Error: Please run `ee` with root privileges.
-    """
-
   Scenario: ee executable is command working correctly
     Given 'bin/ee' is installed
-    When I run 'sudo bin/ee'
+    When I run 'bin/ee'
     Then STDOUT should return something like
     """
     NAME
@@ -19,28 +11,28 @@ Feature: Site Command
     """
 
   Scenario: Check site command is present
-    When I run 'sudo bin/ee site'
+    When I run 'bin/ee site'
     Then STDOUT should return something like
     """
     usage: ee site
     """
 
   Scenario: Create html site successfully
-    When I run 'sudo bin/ee site create site.test --type=html'
+    When I run 'bin/ee site create site.test --type=html'
     Then The site 'site.test' should have webroot
       And Request on 'site.test' should contain following headers:
         | header           |
         | HTTP/1.1 200 OK  |
 
   Scenario: List the sites
-    When I run 'sudo bin/ee site list --format=text'
+    When I run 'bin/ee site list --format=text'
     Then STDOUT should return exactly
     """
     site.test
     """
 
   Scenario: Delete the sites
-    When I run 'sudo bin/ee site delete site.test --yes'
+    When I run 'bin/ee site delete site.test --yes'
     Then STDOUT should return something like
     """
     Site site.test deleted.