From 9ad111320fc0e882687670bd393a9b8dd9019ea0 Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@gmail.com>
Date: Tue, 3 Feb 2015 20:30:15 +0000
Subject: move UI config to test folder and allow optionally to define a local
 config that will not be commited

---
 tests/UI/.gitignore      |  2 +-
 tests/UI/config.dist.js  | 58 ++++++++++++++++++++++++++++++++++++++++++++++++
 tests/UI/config.local.js | 49 ----------------------------------------
 3 files changed, 59 insertions(+), 50 deletions(-)
 create mode 100644 tests/UI/config.dist.js
 delete mode 100644 tests/UI/config.local.js

(limited to 'tests/UI')

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.dist.js b/tests/UI/config.dist.js
new file mode 100644
index 0000000000..93aa763cf1
--- /dev/null
+++ b/tests/UI/config.dist.js
@@ -0,0 +1,58 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * UI tests config
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+/**
+ * The root Piwik URL to test against.
+ */
+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 = {
+    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';
+
+/**
+ * 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";
+
+/**
+ * The directory that stores processed screenshots. Relative to the UI repo's root directory.
+ */
+exports.processedScreenshotsDir = "./processed-ui-screenshots";
+
+/**
+ * The directory that stores screenshot diffs. Relative to the UI repo's root directory.
+ */
+exports.screenshotDiffDir = "./screenshot-diffs";
diff --git a/tests/UI/config.local.js b/tests/UI/config.local.js
deleted file mode 100644
index 7b6474790c..0000000000
--- a/tests/UI/config.local.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/*!
- * Piwik - free/libre analytics platform
- *
- * UI tests config
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-
-/**
- * The root Piwik URL to test against.
- *
- * 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 = {
-    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';
- */
-
-/**
- * The directory that stores expected screenshots. Relative to the UI repo's root directoriy.
- *
- * exports.expectedScreenshotsDir = "./expected-ui-screenshots";
- */
-
-/**
- * The directory that stores processed screenshots. Relative to the UI repo's root directory.
- *
- * 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
-- 
cgit v1.2.3