Fixes #4260 Make Campaign name + Keyword lowercase also in the Goal c…

…onversion logs + integration test Thanks for the report!
matomo-org · Feb 16, 2014 · 56cb86a · 56cb86a
1 parent 7bd88b8
commit 56cb86a
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 29 deletions.
diff --git a/core/Tracker/GoalManager.php b/core/Tracker/GoalManager.php
@@ -314,6 +314,9 @@ public function recordGoals($idSite, $visitorInformation, $visitCustomVariables,
                 $time = $referrerTimestamp;
             }
         }
+        $name = Common::mb_strtolower($name);
+        $keyword = Common::mb_strtolower($keyword);
+
         $goal += array(
             'referer_type'              => $type,
             'referer_name'              => $name,

diff --git a/core/Tracker/Referrer.php b/core/Tracker/Referrer.php
@@ -285,10 +285,10 @@ protected function detectReferrerCampaign()
         $this->detectReferrerCampaignFromLandingUrl();
         $this->detectCampaignKeywordFromReferrerUrl();
 
-        // if we detected a campaign but there is still no keyword set, we set the keyword to the Referrer host
         if ($this->typeReferrerAnalyzed != Common::REFERRER_TYPE_CAMPAIGN) {
             return false;
         }
+        // if we detected a campaign but there is still no keyword set, we set the keyword to the Referrer host
         if(empty($this->keywordReferrerAnalyzed)) {
             $this->keywordReferrerAnalyzed = $this->referrerHost;
         }

diff --git a/tests/PHPUnit/Integration/PeriodIsRange_DateIsLastN_MetadataAndNormalAPITest.php b/tests/PHPUnit/Integration/PeriodIsRange_DateIsLastN_MetadataAndNormalAPITest.php
@@ -14,39 +14,18 @@ class Test_Piwik_Integration_PeriodIsRange_DateIsLastN_MetadataAndNormalAPI exte
 {
     public static $fixture = null;
 
-    static $shouldSkipTestThisTime = false;
-
     public static function setUpBeforeClass()
     {
-        self::$shouldSkipTestThisTime = in_array(date('G'), array(22, 23));
-
-        if (self::$shouldSkipTestThisTime) {
-            print("\nSKIPPED test PeriodIsRange_DateIsLastN_MetadataAndNormalAPI since it fails around midnight...\n");
-            return;
-        }
-
-        self::$fixture->dateTime = Date::factory('now')->getDateTime();
+        self::$fixture->dateTime = Date::factory('today')->getDateTime();
         parent::setUpBeforeClass();
     }
 
-    public static function tearDownAfterClass()
-    {
-        if (self::$shouldSkipTestThisTime) {
-            return;
-        }
-
-        parent::tearDownAfterClass();
-    }
-
     /**
      * @dataProvider getApiForTesting
      * @group        Integration
      */
     public function testApi($api, $params)
     {
-        if (self::$shouldSkipTestThisTime) {
-            return;
-        }
         $this->runApiTests($api, $params);
     }
 
@@ -84,8 +63,11 @@ public function getApiForTesting()
             foreach ($dates as $date) {
                 $result[] = array($apiToCall, array('idSite'    => $idSite, 'date' => $date,
                                                     'periods'   => array('range'), 'segment' => $segment,
-                    // testing getLastVisitsForVisitor requires a visitor ID
-                                                    'visitorId' => $visitorId));
+                                                    // testing getLastVisitsForVisitor requires a visitor ID
+                                                    'visitorId' => $visitorId,
+                                                    'otherRequestParameters' => array(
+                                                        'lastMinutes' => 60 * 24,
+                                                    )));
             }
         }
 

diff --git a/.../test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/.../test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
@@ -392,4 +392,4 @@
 
 
 	</row>
-</result>
+</result>
diff --git a/.../expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/.../expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
@@ -266,4 +266,4 @@
 	</lastVisits>
 
 
-</result>
+</result>
diff --git a/...ted/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getCampaigns_range.xml b/...ted/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getCampaigns_range.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
-		<label>CAMPAIGN NAME - YEAH!</label>
+		<label>campaign name - yeah!</label>
 		<goals>
 			<row idgoal='1'>
 				<nb_conversions>1</nb_conversions>
@@ -14,7 +14,7 @@
 		<nb_visits>0</nb_visits>
 		<subtable>
 			<row>
-				<label>CAMPAIGN KEYWORD - RIGHT...</label>
+				<label>campaign keyword - right...</label>
 				<goals>
 					<row idgoal='1'>
 						<nb_conversions>1</nb_conversions>