move UI config to test folder and allow optionally to define a local config that will not be commited

2 files changed, 24 insertions, 15 deletions

diff --git a/tests/UI/.gitignore b/tests/UI/.gitignore
index f24618e3ec..7ad59df613 100644
--- a/tests/UI/.gitignore
+++ b/tests/UI/.gitignore
@@ -7,4 +7,4 @@ screenshot-diffs/jquery.js
 screenshot-diffs/resemble.js
 .idea/*
 php_errors.log
-config.local.js
\ No newline at end of file
+config.js
\ No newline at end of file
diff --git a/tests/UI/config.local.js b/tests/UI/config.dist.js
index 7b6474790c..93aa763cf1 100644
--- a/tests/UI/config.local.js
+++ b/tests/UI/config.dist.js
@@ -9,41 +9,50 @@
 
 /**
  * The root Piwik URL to test against.
- *
- * exports.piwikUrl = "http://localhost/";
  */
+exports.piwikUrl = "http://localhost/";
 
 /**
  * Data for the $_SERVER variable in the setup/teardown PHP scripts. Should be the same as
  * the values in your phpunit.xml file.
- *
- * exports.phpServer = {
+ */
+exports.phpServer = {
     HTTP_HOST: 'localhost',
     REQUEST_URI: '/',
     REMOTE_ADDR: '127.0.0.1'
 };
- */
 
 /**
  * The path to the PHP executable to execute when setting up & tearing down the database.
- *
- * exports.php = 'php';
  */
+exports.php = 'php';
+
+/**
+ * The folder in tests/lib that holds mocha.
+ */
+exports.mocha = 'mocha-1.17.1';
+
+/**
+ * The folder in tests/lib that holds chai.
+ */
+exports.chai = 'chai-1.9.0';
+
+/**
+ * The mocha reporter to use.
+ */
+exports.reporter = "spec";
 
 /**
  * The directory that stores expected screenshots. Relative to the UI repo's root directoriy.
- *
- * exports.expectedScreenshotsDir = "./expected-ui-screenshots";
  */
+exports.expectedScreenshotsDir = "./expected-ui-screenshots";
 
 /**
  * The directory that stores processed screenshots. Relative to the UI repo's root directory.
- *
- * exports.processedScreenshotsDir = "./processed-ui-screenshots";
  */
+exports.processedScreenshotsDir = "./processed-ui-screenshots";
 
 /**
  * The directory that stores screenshot diffs. Relative to the UI repo's root directory.
- *
- * exports.screenshotDiffDir = "./screenshot-diffs";
- */
\ No newline at end of file
+ */
+exports.screenshotDiffDir = "./screenshot-diffs";