From 5197c5867a9ce66f84ab5872bde671b0f4d51cfc Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@gmail.com>
Date: Tue, 3 Feb 2015 22:32:19 +0000
Subject: [PATCH] fixed some mentions of piwik-ui-tests repo which I just
disabled on Travis
---
README.md | 2 +-
tests/README.screenshots.md | 12 ++++++------
tests/UI/screenshot-diffs/diffgenerator.js | 2 +-
tests/lib/screenshot-testing/support/diff-viewer.js | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/README.md b/README.md
index 4d3302298d..49ec6f8ae4 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ We are grateful if you can share the Job Description with your friends and colle
The Piwik project uses an ever-expanding comprehensive set of thousands of unit and integration tests and dozens of system [tests](https://github.com/piwik/piwik/tree/master/tests),
running on the hosted distributed continuous integration platform Travis-CI.
-Build status (master branch) [](https://travis-ci.org/piwik/piwik) - Screenshot tests Build [](https://travis-ci.org/piwik/piwik-ui-tests)
+Build status (master branch) [](https://travis-ci.org/piwik/piwik)
Code Coverage: [](https://scrutinizer-ci.com/g/piwik/piwik/?branch=master)
diff --git a/tests/README.screenshots.md b/tests/README.screenshots.md
index 07ed286537..8769dc738b 100644
--- a/tests/README.screenshots.md
+++ b/tests/README.screenshots.md
@@ -18,7 +18,7 @@ then you should update the expected screenshots accordingly.
To fix a broken build, follow these steps:
- * Go to the UI tests travis build: [https://travis-ci.org/piwik/piwik-ui-tests](https://travis-ci.org/piwik/piwik-ui-tests)
+ * Go to the Tests travis build: [https://travis-ci.org/piwik/piwik](https://travis-ci.org/piwik/piwik) and select the build containing `TEST_SUITE=UITests`
* Find the build you are interested in. The UI tests build will be run for each commit in each branch, so if you're
looking to resolve a specific failure, you'll have to find the build for the commit you've made.
* In the build output, at the beginning of the test output, there will be a link to a image diff viewer. It will look something
@@ -38,7 +38,7 @@ To fix a broken build, follow these steps:
_Note: When determining whether a screenshot is correct, the data displayed is not important. Report data correctness is verified through System and other PHP tests. The UI tests should only test UI behavior._
* Push the changes (to your code and/or to the expected-ui-screenshots directory.
- * Wait for next UI Tests build [on travis](https://travis-ci.org/piwik/piwik-ui-tests). Hopefully, the build should be green!
+ * Wait for next Test build [on travis](https://travis-ci.org/piwik/piwik). Hopefully, the build should be green!
_Note: the **development:sync-ui-test-screenshots** console command can be used to speed up the process. Run **./console help development:sync-ui-test-screenshots** to learn more._
@@ -110,7 +110,7 @@ The following options may be useful if you plan on running the UI tests locally
UI screenshot tests are run directly by phantomjs and are written using [mocha](http://visionmedia.github.io/mocha/) and [chai](http://chaijs.com).
-To create a new test, first decide whether it will belong to Piwik Core or a plugin. If it will belong to Piwik Core, the test should be placed within the [piwik-ui-tests](https://github.com/piwik/piwik-ui-tests) repository. Otherwise, it should be placed within tests/UI sub-directory of your plugin.
+To create a new test, first decide whether it will belong to Piwik Core or a plugin. If it will belong to Piwik Core, the test should be placed within the `/tests/UI` directory. Otherwise, it should be placed within `tests/UI sub-directory of your plugin.
All test files should have \_spec.js file name suffixes (for example, **ActionsDataTable\_spec.js**).
@@ -230,9 +230,9 @@ _Note: the Piwik environment is not initialized when the **TestingEnvironment.ad
The following are examples of test environment manipulation:
- * [Overlay_spec.js](https://github.com/piwik/piwik-ui-tests/blob/master/specs/Overlay_spec.js)
- * [Dashboard_spec.js](https://github.com/piwik/piwik-ui-tests/blob/master/specs/Dashboard_spec.js)
- * [Login_spec.js](https://github.com/piwik/piwik-ui-tests/blob/master/specs/Login_spec.js)
+ * [Overlay_spec.js](https://github.com/piwik/piwik/blob/master/tests/UI/specs/Overlay_spec.js)
+ * [Dashboard_spec.js](https://github.com/piwik/piwik/blob/master/tests/UI/specs/Dashboard_spec.js)
+ * [Login_spec.js](https://github.com/piwik/piwik/blob/master/tests/UI/specs/Login_spec.js)
## Learn more
diff --git a/tests/UI/screenshot-diffs/diffgenerator.js b/tests/UI/screenshot-diffs/diffgenerator.js
index f88ece732e..78063a6674 100644
--- a/tests/UI/screenshot-diffs/diffgenerator.js
+++ b/tests/UI/screenshot-diffs/diffgenerator.js
@@ -34,7 +34,7 @@ function compareImages(expected, expectedGithub, processed)
$('.processed').attr('src', encodeURI(processed));
$('.expected').attr('src', encodeURI(expected));
- $('.expectedGithub').attr('src', 'https://raw.githubusercontent.com/piwik/piwik-ui-tests/master/expected-ui-screenshots/' + encodeURI(expectedGithub));
+ $('.expectedGithub').attr('src', 'https://raw.githubusercontent.com/piwik/piwik-ui-tests/master/' + encodeURI(expectedGithub));
}
function getUrlQueryParam(sParam) {
diff --git a/tests/lib/screenshot-testing/support/diff-viewer.js b/tests/lib/screenshot-testing/support/diff-viewer.js
index 9fff623930..7910887fdd 100644
--- a/tests/lib/screenshot-testing/support/diff-viewer.js
+++ b/tests/lib/screenshot-testing/support/diff-viewer.js
@@ -21,7 +21,7 @@ DiffViewerGenerator.prototype.getDiffPath = function (testInfo) {
return path.resolve(path.join(baseDir, config.screenshotDiffDir, testInfo.name + '.png'));
};
-// TODO: diff output path shouldn't be stored in piwik-ui-tests repo
+// TODO: diff output path shouldn't be stored in piwik repo
DiffViewerGenerator.prototype.getUrlForPath = function (path) {
return fs.relpath(path, this.diffDir);
};
--
GitLab