Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--tests/PHPUnit/Integration/ReleaseCheckListTest.php5
-rw-r--r--tmp/.gitkeep0
3 files changed, 7 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 3ae135722d..6180aa71bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,7 +28,8 @@ php_errors.log
/plugins/*/tests/UI/screenshot-diffs
/plugins/*/Test/UI/screenshot-diffs
/robots.txt
-/tmp/
+/tmp/*
+!/tmp/.gitkeep
/vendor/
/.cache
/.externalToolBuilders
diff --git a/tests/PHPUnit/Integration/ReleaseCheckListTest.php b/tests/PHPUnit/Integration/ReleaseCheckListTest.php
index 189a560c85..2c92d75c61 100644
--- a/tests/PHPUnit/Integration/ReleaseCheckListTest.php
+++ b/tests/PHPUnit/Integration/ReleaseCheckListTest.php
@@ -300,6 +300,11 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase
$this->assertTrue(preg_match($pattern, $contents) == 0);
}
+ public function testTmpDirectoryContainsGitKeep()
+ {
+ $this->assertFileExists(PIWIK_DOCUMENT_ROOT . '/tmp/.gitkeep');
+ }
+
private function checkFilesAreInPngFormat($files)
{
$this->checkFilesAreInFormat($files, "png");
diff --git a/tmp/.gitkeep b/tmp/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tmp/.gitkeep