Merge pull request #2621 from timber/2.x-update-tests-fix

timber · Jul 29, 2022 · f2fcd45 · f2fcd45
2 parents e6facc2 + 67c72fc
commit f2fcd45
Show file tree

Hide file tree

Showing 54 changed files with 4,934 additions and 5,236 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -15,3 +15,6 @@ b2474ccd46f9374d52f00c8a195be2266463cf4f
 
 # Coding Style: Updated Spaces
 73123a96d3fc055f08da036b0121b469a75e3371
+
+# Tests indentation
+f0216ce423bb133ce668774a5f75ca86455b7280
diff --git a/composer.json b/composer.json
@@ -100,7 +100,7 @@
     ],
     "test": "phpunit",
     "test:codecov": "phpunit --coverage-clover ./build/logs/clover.xml",
-    "test:make-pot": "wp i18n make-pot src tests/languages/timber.pot --domain=",
+    "test:make-pot": "wp i18n make-pot src tests/languages/timber.pot --domain= && wp i18n make-pot ./tests/assets/translations ./tests/languages/timber-test.pot --domain=timber-test",
     "test:no-cov": "phpunit --no-coverage"
   }
 }
diff --git a/tests/assets/Sport.php b/tests/assets/Sport.php
@@ -1,9 +1,9 @@
 <?php
 
- class Sport extends \Timber\Post
- {
-     public function channel()
-     {
-         return 'ESPN';
-     }
- }
+class Sport extends \Timber\Post
+{
+    public function channel()
+    {
+        return 'ESPN';
+    }
+}
diff --git a/tests/assets/languages/en_US.mo b/tests/assets/languages/en_US.mo
diff --git a/tests/assets/languages/en_US.po b/tests/assets/languages/en_US.po
diff --git a/tests/assets/my-sidebar.php b/tests/assets/my-sidebar.php
@@ -1,5 +1,5 @@
 <?php
 
-    echo 'Panic! at the Disco';
-    echo ' from ';
-    echo 2015 - 10;
+echo 'Panic! at the Disco';
+echo ' from ';
+echo 2015 - 10;
diff --git a/tests/assets/translations/timber-test.php b/tests/assets/translations/timber-test.php
@@ -0,0 +1,8 @@
+<?php
+
+/**
+ * This file is used to setup translations that can be read by a POT-file creation script and then be saved in
+ * /tests/languages/timber-test.pot
+ */
+
+__('thingy', 'timber-test');