Merge branch 'staging' into property-declaration-in-cms-installer-man…

…ifest-library

# Conflicts:
#	libraries/cms/installer/manifest.php

.gitignore

@@ -153,3 +153,19 @@ Desktop.ini
 /libraries/vendor/simplepie/simplepie/build
 /libraries/vendor/simplepie/simplepie/idn/ReadMe.txt
 /libraries/vendor/simplepie/simplepie/composer.json
+
+# System Test related files
+tests/codeception/acceptance.suite.yml
+tests/codeception/_support/_generated/*TesterActions.php
+tests/codeception/joomla-cms*
+tests/codeception/_output*
+selenium-server-standalone.jar
+selenium.log
+tests/codeception/cache
+tests/codeception/_output
+tests/codeception/vendor
+composer.phar
+
+# Build related
+RoboFile.ini
+

RoboFile.dist.ini

@@ -0,0 +1,6 @@
+; If you want to setup your test website (document root) in a different folder, you can do that here.
+; You can also set an absolute path, i.e. /path/to/my/cms/folder
+cmsPath = tests/codeception/joomla-cms
+
+; (Linux / Mac only) If you want to set a different owner for the CMS root folder, you can set it here.
+localUser =