Refs #4739, remove old capture.js file, add section about screenshot …

…testing config to README and remove unused constant from Config.php.
matomo-org · Mar 4, 2014 · bb5e2b3 · bb5e2b3
1 parent 64071b3
commit bb5e2b3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 376 deletions.
diff --git a/core/Config.php b/core/Config.php
@@ -40,8 +40,6 @@
  */
 class Config extends Singleton
 {
-    const RELATIVE_CONFIG_OVERRIDE_PATH = 'tmp/test.config.ini';
-
     public static $defaultLocalConfigPath = '/config/config.ini.php';
     public static $defaultCommonConfigPath = '/config/common.config.ini.php';
     public static $defaultGlobalConfigPath = '/config/global.ini.php';

diff --git a/tests/README.screenshots.md b/tests/README.screenshots.md
@@ -62,6 +62,10 @@ Removing this font may be useful if your generated screenshots' fonts do not mat
 
     $ sudo apt-get remove ttf-bitstream-vera
 
+### Configuring screenshot testing library
+
+The screenshot testing library's configuration resides in the tests/lib/screenshot-testing/config.js file. If your development environment's PHP executable isn't named 'php' or your dev Piwik install isn't at http://localhost/, you may need to edit the contents of this file.
+
 ## Running Tests
 
 You can test the UI by running the following command in the root piwik directory:

diff --git a/tests/resources/screenshot-capture/capture.js b/tests/resources/screenshot-capture/capture.js