Merge branch 'master' into 3.x-dev

Conflicts:
	core/Version.php
	tests/UI/expected-ui-screenshots
	tests/lib/screenshot-testing/support/chai-extras.js

2 files changed, 47 insertions, 1 deletions

diff --git a/tests/PHPUnit/Fixtures/OneVisitWithSiteSearch.php b/tests/PHPUnit/Fixtures/OneVisitWithSiteSearch.php
new file mode 100644
index 0000000000..af78854901
--- /dev/null
+++ b/tests/PHPUnit/Fixtures/OneVisitWithSiteSearch.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Piwik\Tests\Fixtures;
+
+use Piwik\Tests\Framework\Fixture;
+
+class OneVisitWithSiteSearch extends Fixture
+{
+    public $dateTime = '2012-01-11 07:22:33';
+    public $idSite = 1;
+
+    public function setUp()
+    {
+        $this->setUpWebsitesAndGoals();
+        $this->trackVisits();
+    }
+
+    public function tearDown()
+    {
+        // empty
+    }
+
+    private function setUpWebsitesAndGoals()
+    {
+        if (!self::siteCreated($idSite = 1)) {
+            self::createWebsite($this->dateTime);
+        }
+    }
+
+    private function trackVisits()
+    {
+        $tracker = self::getTracker($this->idSite, $this->dateTime, true);
+
+        $tracker->setTokenAuth(self::getTokenAuth());
+        $tracker->setUrl('http://example.org/sites/search.html');
+        $tracker->setForceVisitDateTime($this->dateTime);
+
+        self::checkResponse(
+            $tracker->doTrackSiteSearch(
+                'title%3A"test"+AND+body%3A"test"+AND+spaceCategory%3AALL+AND+startIndex%3A0+AND+pageSize%3A10',
+                '',
+                3
+            )
+        );
+    }
+}
diff --git a/tests/PHPUnit/Fixtures/UITestFixture.php b/tests/PHPUnit/Fixtures/UITestFixture.php
index 0792a4e448..d7e7e3c291 100644
--- a/tests/PHPUnit/Fixtures/UITestFixture.php
+++ b/tests/PHPUnit/Fixtures/UITestFixture.php
@@ -31,7 +31,7 @@ use Piwik\Config as PiwikConfig;
  */
 class UITestFixture extends SqlDump
 {
-    const FIXTURE_LOCATION = '/tests/resources/OmniFixture-dump.sql.gz';
+    const FIXTURE_LOCATION = '/tests/resources/OmniFixture-dump.sql';
 
     public function __construct()
     {