Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests/lib
diff options
context:
space:
mode:
authordiosmosis <diosmosis@users.noreply.github.com>2018-06-01 21:44:31 +0300
committerStefan Giehl <stefan@piwik.org>2018-06-01 21:44:31 +0300
commit89715269ed0ba616e2f508ef4cf6d43367cc8b1b (patch)
tree22e08461f8ce072c44c9e8060af5d28ac49a7a21 /tests/lib
parent4eb38fd6eaaef6643a794aba4457143434a68e14 (diff)
Fix some UI tests, including random failure + allow --piwik-domain use in tests:run-ui (#13027)
* Forward --piwik-domain to sub-commands from tests:run-ui. * temp commit debugging * Predictable screenshots for realtime map in dashboard. * Fix translation regression. * Update UI test case & screenshots. * Remove it.only * update screenshot * removes unused use statements
Diffstat (limited to 'tests/lib')
-rw-r--r--tests/lib/screenshot-testing/support/test-environment.js9
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/lib/screenshot-testing/support/test-environment.js b/tests/lib/screenshot-testing/support/test-environment.js
index 01914c8c24..ffe43cb431 100644
--- a/tests/lib/screenshot-testing/support/test-environment.js
+++ b/tests/lib/screenshot-testing/support/test-environment.js
@@ -191,6 +191,10 @@ TestingEnvironment.prototype.setupFixture = function (fixtureClass, done) {
args.push('--plugins=' + options['plugin']);
}
+ if (options['piwik-domain']) {
+ args.push('--piwik-domain=' + options['piwik-domain']);
+ }
+
var self = this;
this.executeConsoleCommand('tests:setup-fixture', args, function (code) {
self.reload();
@@ -250,6 +254,11 @@ TestingEnvironment.prototype.teardownFixture = function (fixtureClass, done) {
console.log(" Tearing down fixture " + fixtureClass + "...");
var args = [fixtureClass || DEFAULT_UI_TEST_FIXTURE_NAME, "--teardown", '--server-global=' + JSON.stringify(config.phpServer)];
+
+ if (options['piwik-domain']) {
+ args.push('--piwik-domain=' + options['piwik-domain']);
+ }
+
this.executeConsoleCommand('tests:setup-fixture', args, function (code) {
if (code) {
done(new Error("Failed to teardown fixture " + fixtureClass + " (error code = " + code + ")"));