Merge pull request #10461 from piwik/3.0-m07

Merge master to 3.x-dev

.gitattributes

+tests/UI/expected-screenshots/*.png filter=lfs diff=lfs merge=lfs
+plugins/*/tests/UI/expected-screenshots/*.png filter=lfs diff=lfs merge=lfs
+
 # auto detect text files and perform LF normalization
 * text eol=lf
 
@@ -40,4 +43,4 @@
 *.WOFF2 binary
 
 # Custom for Visual Studio
-*.cs     diff=csharp
+*.cs     diff=csharp
\ No newline at end of file

.gitmodules

@@ -26,10 +26,6 @@
     path = plugins/QueuedTracking
     url = https://github.com/piwik/plugin-QueuedTracking.git
     branch = master
-[submodule "tests/UI/expected-ui-screenshots"]
-    path = tests/UI/expected-ui-screenshots
-    url = https://github.com/piwik/piwik-ui-tests.git
-    branch = master
 [submodule "tests/travis"]
     path = tests/travis
     url = https://github.com/piwik/travis-scripts
@@ -58,5 +54,4 @@
     url = https://github.com/piwik/piwik-log-analytics.git
     branch = master
 
-# Note: do not add new plugin submodules here, but a few lines above
-
+# Note: do not add new plugin submodules here, but a few lines above
\ No newline at end of file

.travis.yml

@@ -88,6 +88,9 @@ cache:
   directories:
     - "travis_phantomjs"
 
+before_install:
+  - ./tests/travis/install_git_lfs.sh
+
 install:
   - git fetch -q
 

plugins/CoreConsole/Commands/GenerateTest.php

@@ -156,8 +156,8 @@ class GenerateTest extends GeneratePluginBase
                 '/tests',
                 '/tests/UI',
                 '/tests/UI/.gitignore',
-                '/tests/UI/expected-ui-screenshots',
-                '/tests/UI/expected-ui-screenshots/.gitkeep',
+                '/tests/UI/expected-screenshots',
+                '/tests/UI/expected-screenshots/.gitkeep',
                 '/tests/UI/SimpleUITest_spec.js',
             );
         }

plugins/PrivacyManager/DoNotTrackHeaderChecker.php

@@ -49,8 +49,10 @@ class DoNotTrackHeaderChecker
 
             // this is an optional supplement to the site's tracking status resource at:
             //     /.well-known/dnt
-            // per Tracking Preference Expression (draft)
-            Common::sendHeader('Tk: 1');
+            // per Tracking Preference Expression
+            
+            //Tracking Perference Expression has been updated to require Tk: N rather than Tk: 1
+            Common::sendHeader('Tk: N');
         }
     }
 

plugins/TestRunner/Commands/SyncScreenshots.php

@@ -47,7 +47,7 @@ class SyncScreenshots extends ConsoleCommand
         $this->setName('tests:sync-ui-screenshots');
         $this->setAliases(array('development:sync-ui-test-screenshots'));
         $this->setDescription('For Piwik core devs. Copies screenshots '
-                            . 'from travis artifacts to the tests/UI/expected-ui-screenshots/ folder');
+                            . 'from travis artifacts to the tests/UI/expected-screenshots/ folder');
         $this->addArgument('buildnumber', InputArgument::REQUIRED, 'Travis build number you want to sync.');
         $this->addArgument('screenshotsRegex', InputArgument::OPTIONAL,
             'A regex to use when selecting screenshots to copy. If not supplied all screenshots are copied.', '.*');
@@ -147,15 +147,7 @@ git push";
 
         if ($repository === 'piwik/piwik') {
             $commands .= "
-cd ..
-git pull
-git add expected-ui-screenshots/
-git status
-git commit -m 'UI tests: ...' # Copy paste the good commit message
-echo -e \"\n--> Check the commit above is correct... <---\n\"
-sleep 7
-git push
-cd ../../";
+cd ../../../";
         } else {
             $commands .= "
 cd ../../../../../";
@@ -169,18 +161,25 @@ cd ../../../../../";
         $plugin = $this->getPluginName($repository);
 
         if (empty($plugin)) {
-            return PIWIK_DOCUMENT_ROOT . '/tests/UI/expected-ui-screenshots/';
+            return PIWIK_DOCUMENT_ROOT . "/tests/UI/expected-screenshots/";
         }
 
-        $downloadTo = PIWIK_DOCUMENT_ROOT . "/plugins/$plugin/tests/UI/expected-ui-screenshots/";
-        if(is_dir($downloadTo)) {
-            return $downloadTo;
-        }
+        $possibleSubDirs = array(
+            'expected-screenshots',
+            'expected-ui-screenshots'
+        );
+
+        foreach ($possibleSubDirs as $subDir) {
+            $downloadTo = PIWIK_DOCUMENT_ROOT . "/plugins/$plugin/tests/UI/$subDir/";
+            if (is_dir($downloadTo)) {
+                return $downloadTo;
+            }
 
-        // Maybe the plugin is using folder "Test/" instead of "tests/"
-        $downloadTo = str_replace("tests/", "Test/", $downloadTo);
-        if(is_dir($downloadTo)) {
-            return $downloadTo;
+            // Maybe the plugin is using folder "Test/" instead of "tests/"
+            $downloadTo = str_replace("tests/", "Test/", $downloadTo);
+            if (is_dir($downloadTo)) {
+                return $downloadTo;
+            }
         }
         throw new \Exception("Download to path could not be found: $downloadTo");
     }

plugins/UserCountryMap/Controller.php

@@ -50,7 +50,16 @@ class Controller extends \Piwik\Plugin\Controller
 
         $period = Common::getRequestVar('period');
         $date = Common::getRequestVar('date');
-        $segment = $segmentOverride ? : Request::getRawSegmentFromRequest() ? : '';
+
+        if (!empty($segmentOverride)) {
+            $segment = $segmentOverride;
+        } else {
+            $segment = Request::getRawSegmentFromRequest();
+            if (empty($segment)) {
+                $segment = '';
+            }
+        }
+        
         $token_auth = Piwik::getCurrentUserTokenAuth();
 
         $view = new View('@UserCountryMap/visitorMap');

tests/PHPUnit/Integration/ReleaseCheckListTest.php

@@ -64,6 +64,8 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase
     public function test_pngFilesIconsShouldBeInPngFormat()
     {
         $files = Filesystem::globr(PIWIK_INCLUDE_PATH . '/plugins', '*.png');
+        // filter expected screenshots as they might not be checked out and downloaded when stored in git-lfs
+        $files = array_filter($files, function($value) { return !preg_match('/expected-screenshots/', $value); });
         $this->checkFilesAreInPngFormat($files);
         $files = Filesystem::globr(PIWIK_INCLUDE_PATH . '/core', '*.png');
         $this->checkFilesAreInPngFormat($files);

tests/README.screenshots.md

@@ -33,12 +33,12 @@ To fix a broken build, follow these steps:
      * If a change is not wanted, revert or fix your commit.
      * If a change is correct, then you can set the new screenshot as the expected screenshot.
        To do so, in the diffviewer.html page click on the "Processed" link for this screenshot.
-       Then "Save this file as" and save it in the piwik/tests/UI/expected-ui-screenshots/ directory.
+       Then "Save this file as" and save it in the piwik/tests/UI/expected-screenshots/ directory.
        (If the screenshot test is for a plugin and not Piwik Core, the expected screenshot should be added to the
-       plugin's expected screenshot directory. For example: piwik/plugins/DBStats/tests/UI/expected-ui-screenshots.)
+       plugin's expected screenshot directory. For example: piwik/plugins/DBStats/tests/UI/expected-screenshots.)
 
      _Note: When determining whether a screenshot is correct, the data displayed is not important. Report data correctness is verified through System and other PHP tests. The UI tests should only test UI behavior._
- * Push the changes (to your code and/or to the expected-ui-screenshots directory.
+ * Push the changes (to your code and/or to the expected-screenshots directory).
  * Wait for next Test build [on travis](https://travis-ci.org/piwik/piwik). Hopefully, the build should be green!
 
 _Note: the `tests:sync-ui-screenshots` console command can be used to speed up the process. Run `./console tests:sync-ui-screenshots -h` to learn more._

tests/UI/config.dist.js

@@ -45,7 +45,7 @@ exports.reporter = "spec";
 /**
  * The directory that stores expected screenshots. Relative to the UI repo's root directoriy.
  */
-exports.expectedScreenshotsDir = "./expected-ui-screenshots";
+exports.expectedScreenshotsDir = ["./expected-screenshots", "./expected-ui-screenshots"];
 
 /**
  * The directory that stores processed screenshots. Relative to the UI repo's root directory.