Merge branch 'develop'

Author: mbtamuli

.travis.yml

@@ -8,6 +8,7 @@ env:
     - TEST_COMMAND=$(echo $TRAVIS_REPO_SLUG | cut -d/ -f 2) # Get command name to be tested
 
 before_script:
+  - sudo curl -L https://github.com/docker/compose/releases/download/1.22.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
   - |
     # Remove Xdebug for a huge performance increase:
     if [ -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini ]; then
@@ -33,3 +34,8 @@ notifications:
   email:
     on_success: never
     on_failure: change
+
+addons:
+  apt:
+    packages:
+      - docker-ce

ci/prepare.sh

@@ -10,17 +10,21 @@ rm ee
 cd ..
 git clone https://github.com/EasyEngine/easyengine.git easyengine --depth=1
 cd easyengine
-echo 'travis_test' > VERSION
 
 # Copy tests to EE repo
 rm -r features
 cp -R ../$TEST_COMMAND/features .
 
+# Update repo branches
+if [[ "$TRAVIS_BRANCH" != "master" ]]; then
+    sed -i 's/\(easyengine\/.*\):\ \".*\"/\1:\ \"dev-develop\"/' composer.json
+fi
+
 # Install composer dependencies and update them for tests
 composer update
 
 # Place the command inside EE repo
-sudo rm -r vendor/easyengine/$TEST_COMMAND
+sudo rm -rf vendor/easyengine/$TEST_COMMAND
 cp -R ../$TEST_COMMAND vendor/easyengine/
 
 # Create phar and test it

composer.json

@@ -1,8 +1,8 @@
 {
-    "name": "easyengine/site-wp-command",
-    "description": "EasyEngine package for WordPress site creation.",
+    "name": "easyengine/site-type-wp",
+    "description": "EasyEngine site type package for WordPress site creation.",
     "type": "ee-cli-package",
-    "homepage": "https://github.com/easyengine/site-wp-command",
+    "homepage": "https://github.com/easyengine/site-type-wp",
     "license": "MIT",
     "authors": [],
     "minimum-stability": "dev",
@@ -11,7 +11,10 @@
         "psr-4": {
             "": "src/"
         },
-        "files": [ "site-wp-command.php" ]
+        "files": [ "site-type-wp.php" ]
+    },
+    "require-dev": {
+        "wp-cli/mustangostang-spyc": "^0.6.3"
     },
     "extra": {
         "branch-alias": {

features/bootstrap/FeatureContext.php

@@ -65,6 +65,8 @@ public function __construct()
 	{
 		$this->commands = [];
 		$this->ee_path = getcwd();
+		$config_contents = \Mustangostang\Spyc::YAMLDump(['le-mail' => 'abc@example.com']);
+		file_put_contents( EE_CONF_ROOT . '/config.yml', $config_contents );
 	}
 
 	/**
@@ -403,7 +405,8 @@ public static function cleanup(AfterFeatureScope $scope)
 			'www.example1.test',
 			'example2.test',
 			'www.example3.test',
-			'labels.test'
+			'labels.test',
+			'wpcache.test',
 		];
 
 		$result = EE::launch( 'sudo bin/ee site list --format=text',false, true );

features/redirect.feature

@@ -2,14 +2,16 @@ Feature: Site Redirection
 
   Scenario: no_www-no_ssl redirection works properly
     When I run 'bin/ee site create example.test --type=wp'
-    Then Request on 'localhost' with header 'Host: www.example.test' should contain following headers:
+    Then After delay of 5 seconds
+    And 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 'bin/ee site create www.example1.test --type=wp'
-    Then Request on 'localhost' with header 'Host: example1.test' should contain following headers:
+    Then After delay of 5 seconds
+    And Request on 'localhost' with header 'Host: example1.test' should contain following headers:
     | header                              |
     | HTTP/1.1 301 Moved Permanently      |
     | Location: http://www.example1.test/ |

features/site.feature

@@ -19,7 +19,8 @@ Feature: Site Command
 
   Scenario: Create wp site successfully
     When I run 'bin/ee site create wp.test --type=wp'
-    Then The site 'wp.test' should have webroot
+    Then After delay of 5 seconds
+      And The site 'wp.test' should have webroot
       And The site 'wp.test' should have WordPress
       And Request on 'wp.test' should contain following headers:
         | header           |
@@ -28,7 +29,8 @@ Feature: Site Command
   Scenario: Create wpsubdir site successfully
     When I run 'bin/ee site create wpsubdir.test --type=wp --mu=subdir'
       And I create subsite '1' in 'wpsubdir.test'
-    Then The site 'wpsubdir.test' should have webroot
+    Then After delay of 5 seconds
+      And The site 'wpsubdir.test' should have webroot
       And The site 'wpsubdir.test' should have WordPress
       And The site 'wpsubdir.test' should be 'subdir' multisite
       And Request on 'wpsubdir.test' should contain following headers:
@@ -38,20 +40,31 @@ Feature: Site Command
   Scenario: Create wpsubdom site successfully
     When I run 'bin/ee site create wpsubdom.test --type=wp --mu=subdom'
       And I create subsite '1' in 'wpsubdom.test'
-    Then The site 'wpsubdom.test' should have webroot
+    Then After delay of 5 seconds
+      And The site 'wpsubdom.test' should have webroot
       And The site 'wpsubdom.test' should have WordPress
       And The site 'wpsubdom.test' should be 'subdomain' multisite
       And Request on 'wpsubdom.test' should contain following headers:
         | header           |
         | HTTP/1.1 200 OK  |
 
+  Scenario: Create wp site successfully
+    When I run 'bin/ee site create wpcache.test --type=wp --cache'
+    Then After delay of 5 seconds
+    And The site 'wpcache.test' should have webroot
+    And The site 'wpcache.test' should have WordPress
+    And Request on 'wpcache.test' should contain following headers:
+      | header           |
+      | HTTP/1.1 200 OK  |
+
   Scenario: List the sites
     When I run 'bin/ee site list --format=text'
     Then STDOUT should return exactly
     """
     wp.test
     wpsubdir.test
     wpsubdom.test
+    wpcache.test
     """
 
   Scenario: Delete the sites

site-wp-command.php renamed to site-type-wp.php

@@ -13,4 +13,4 @@
 	require_once $autoload;
 }
 
-EE::add_command( 'wp', 'Site_WP_Command' );
+Site_Command::add_site_type( 'wp', 'EE\Site\Type\WordPress' );