From cba83cec9c3cdafd75004932b6768c48a15f116f Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Tue, 9 Sep 2014 23:21:12 +1200
Subject: [PATCH] Make test case a bit more robust by setting both user Id and
visitor id set refs #3490
---
tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorIdAndUserId.php | 1 +
tests/PHPUnit/UI | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorIdAndUserId.php b/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorIdAndUserId.php
index 7076ecf7fb..30accf676d 100644
--- a/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorIdAndUserId.php
+++ b/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorIdAndUserId.php
@@ -179,6 +179,7 @@ class FewVisitsWithSetVisitorId extends Fixture
$t->setUrl('http://example.org/index.htm');
$userId = 'new-user-id@one-weeklater';
$t->setUserId($userId);
+ $t->setVisitorId('6ccebef4faef4969'); // this should be ignored and User ID prevail
self::checkResponse($t->doTrackPageView('A page view by ' . $userId));
$t->setForceVisitDateTime($oneWeekLater->addHour(0.8)->getDatetime());
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
index 27e0ac1bb3..2d9a1e519c 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit 27e0ac1bb3c011a5ff33753192f289b0f453fe56
+Subproject commit 2d9a1e519c5e3d80ec22aad76aa178ca2097b925
--
GitLab