Remove the SiteSpecificUserAgentExcludeEnabled setting (#15089)

11 files changed, 12 insertions, 37 deletions

diff --git a/tests/PHPUnit/Fixtures/InvalidVisits.php b/tests/PHPUnit/Fixtures/InvalidVisits.php
index 6f3f44c961..7891e69a0d 100644
--- a/tests/PHPUnit/Fixtures/InvalidVisits.php
+++ b/tests/PHPUnit/Fixtures/InvalidVisits.php
@@ -51,7 +51,6 @@ class InvalidVisits extends Fixture
         $dateTime = $this->dateTime;
         $idSite = $this->idSite;
 
-        API::getInstance()->setSiteSpecificUserAgentExcludeEnabled(true);
         API::getInstance()->setGlobalExcludedUserAgents('globalexcludeduseragent');
         Cache::regenerateCacheWebsiteAttributes([1]);
 
diff --git a/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php b/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php
index 499006675a..ed4a717aa8 100644
--- a/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php
+++ b/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php
@@ -27,7 +27,6 @@ class OneVisitorTwoVisits extends Fixture
 
     public $useThirdPartyCookies = false;
     public $useSiteSearch = false;
-    public $excludeMozilla = false;
     public $simulateIntegerOverflow = false;
     public $maxUnsignedIntegerValue = '4294967295';
 
@@ -81,10 +80,6 @@ class OneVisitorTwoVisits extends Fixture
         $dateTime = $this->dateTime;
         $idSite = $this->idSite;
 
-        if ($this->excludeMozilla) {
-            APISitesManager::getInstance()->setSiteSpecificUserAgentExcludeEnabled(false);
-        }
-
         self::createSuperUser();
         $t = self::getTracker($idSite, $dateTime, $defaultInit = true);
 
@@ -114,9 +109,7 @@ class OneVisitorTwoVisits extends Fixture
             $timezone = null,
             $currency = null,
             $group = null,
-            $startDate = null,
-            // test that visit won't be excluded since site-specific exclude is not enabled
-            $excludedUserAgents = $this->excludeMozilla ? 'mozilla' : null
+            $startDate = null
         );
 
         // Record 1st page view
diff --git a/tests/PHPUnit/Integration/Tracker/VisitTest.php b/tests/PHPUnit/Integration/Tracker/VisitTest.php
index f522cf5282..e62f6e6482 100644
--- a/tests/PHPUnit/Integration/Tracker/VisitTest.php
+++ b/tests/PHPUnit/Integration/Tracker/VisitTest.php
@@ -241,8 +241,6 @@ class VisitTest extends IntegrationTestCase
      */
     public function testIsVisitorUserAgentExcluded($excludedUserAgent, $tests)
     {
-        API::getInstance()->setSiteSpecificUserAgentExcludeEnabled(true);
-
         $idsite = API::getInstance()->addSite("name", "http://piwik.net/", $ecommerce = 0,
             $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, $excludedIp = null,
             $excludedQueryParameters = null, $timezone = null, $currency = null, $group = null, $startDate = null,
@@ -276,7 +274,6 @@ class VisitTest extends IntegrationTestCase
             'http://valid.domain/page' => false,
             'https://valid.domain/page' => false,
         );
-        API::getInstance()->setSiteSpecificUserAgentExcludeEnabled(true);
 
         $idsite = API::getInstance()->addSite("name", "http://piwik.net/");
 
diff --git a/tests/PHPUnit/System/DuplicateActionsTest.php b/tests/PHPUnit/System/DuplicateActionsTest.php
index 6b4d0c8667..a0179ed9d2 100644
--- a/tests/PHPUnit/System/DuplicateActionsTest.php
+++ b/tests/PHPUnit/System/DuplicateActionsTest.php
@@ -84,4 +84,3 @@ class DuplicateActionsTest extends SystemTestCase
 }
 
 DuplicateActionsTest::$fixture = new OneVisitorTwoVisits();
-DuplicateActionsTest::$fixture->excludeMozilla = true;
\ No newline at end of file
diff --git a/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php b/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php
index 823c643eb3..96a81bea52 100644
--- a/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php
+++ b/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php
@@ -242,4 +242,3 @@ class OneVisitorTwoVisitsTest extends SystemTestCase
 }
 
 OneVisitorTwoVisitsTest::$fixture = new OneVisitorTwoVisits();
-OneVisitorTwoVisitsTest::$fixture->excludeMozilla = true;
diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Tour.getChallenges.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Tour.getChallenges.xml
index b345e66e27..9f122821af 100644
--- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Tour.getChallenges.xml
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Tour.getChallenges.xml
@@ -4,7 +4,7 @@
 		<id>track_data</id>
 		<name>Embed tracking code</name>
 		<description>Matomo offers you various ways to embed the tracking code for your website, mobile app, and even for any device or application.</description>
-		<isCompleted>1</isCompleted>
+		<isCompleted>0</isCompleted>
 		<isSkipped>0</isSkipped>
 		<url>index.php?module=CoreAdminHome&amp;action=trackingCodeGenerator</url>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Tour.getLevel.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Tour.getLevel.xml
index ef46d821fa..bd57da48fb 100644
--- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Tour.getLevel.xml
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Tour.getLevel.xml
@@ -6,6 +6,6 @@
 		<currentLevelName>Matomo Beginner</currentLevelName>
 		<nextLevelName>Matomo Intermediate</nextLevelName>
 		<numLevelsTotal>5</numLevelsTotal>
-		<challengesNeededForNextLevel>4</challengesNeededForNextLevel>
+		<challengesNeededForNextLevel>5</challengesNeededForNextLevel>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_range.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_range.xml
index a232e03046..05d0ce3953 100644
--- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_range.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
-	<nb_visits_returning>2</nb_visits_returning>
-	<nb_actions_returning>2</nb_actions_returning>
+	<nb_visits_returning>1</nb_visits_returning>
+	<nb_actions_returning>1</nb_actions_returning>
 	<nb_visits_converted_returning>1</nb_visits_converted_returning>
-	<bounce_count_returning>2</bounce_count_returning>
+	<bounce_count_returning>1</bounce_count_returning>
 	<sum_visit_length_returning>0</sum_visit_length_returning>
 	<max_actions_returning>1</max_actions_returning>
 	<bounce_rate_returning>100%</bounce_rate_returning>
diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_year.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_year.xml
index a232e03046..05d0ce3953 100644
--- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_year.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
-	<nb_visits_returning>2</nb_visits_returning>
-	<nb_actions_returning>2</nb_actions_returning>
+	<nb_visits_returning>1</nb_visits_returning>
+	<nb_actions_returning>1</nb_actions_returning>
 	<nb_visits_converted_returning>1</nb_visits_converted_returning>
-	<bounce_count_returning>2</bounce_count_returning>
+	<bounce_count_returning>1</bounce_count_returning>
 	<sum_visit_length_returning>0</sum_visit_length_returning>
 	<max_actions_returning>1</max_actions_returning>
 	<bounce_rate_returning>100%</bounce_rate_returning>
diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest_multipleOldNew__VisitFrequency.get_month.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest_multipleOldNew__VisitFrequency.get_month.xml
index 9b5f22a3ea..b6f12222e6 100644
--- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest_multipleOldNew__VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest_multipleOldNew__VisitFrequency.get_month.xml
@@ -21,17 +21,5 @@
 	<result date="2012-09" />
 	<result date="2012-10" />
 	<result date="2012-11" />
-	<result date="2012-12">
-		<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
-		<nb_users_returning>0</nb_users_returning>
-		<nb_visits_returning>1</nb_visits_returning>
-		<nb_actions_returning>1</nb_actions_returning>
-		<nb_visits_converted_returning>0</nb_visits_converted_returning>
-		<bounce_count_returning>1</bounce_count_returning>
-		<sum_visit_length_returning>0</sum_visit_length_returning>
-		<max_actions_returning>1</max_actions_returning>
-		<bounce_rate_returning>100%</bounce_rate_returning>
-		<nb_actions_per_visit_returning>1</nb_actions_per_visit_returning>
-		<avg_time_on_site_returning>0</avg_time_on_site_returning>
-	</result>
+	<result date="2012-12" />
 </results>
\ No newline at end of file
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png
index 8aef5fff08..453a2aa9c0 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:133871b188135c4975b0a5b203c21a2a2141a9784272e79b6632c7223c48088e
-size 4959074
+oid sha256:fba29ae0960d5f150636b462d060d3407573d9aa31e4467e98b5d80a38e94ecb
+size 4943071