Add more tests to avoid regression

timber · Sep 19, 2018 · 726a2d2 · 726a2d2
1 parent aea48b9
commit 726a2d2
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 0 deletions.
diff --git a/bin/install-wp-tests.sh b/bin/install-wp-tests.sh
diff --git a/tests/namespaced/test-namespaced.twig b/tests/namespaced/test-namespaced.twig
@@ -0,0 +1 @@
+This is a namespaced template.
diff --git a/tests/test-timber-loader.php b/tests/test-timber-loader.php
@@ -130,4 +130,38 @@ function testTwigLoadsFromLocationWithNamespace(){
 			$this->assertEquals('<img src="" />', trim($str));
 		}
 
+		function testTwigLoadsFromLocationWithAndWithoutNamespaces(){
+			Timber::$locations = array( 'namespaced' => __DIR__.'/namespaced', __DIR__ . '/assets' );
+
+			// Namespaced location
+			$str = Timber::compile('@namespaced/test-namespaced.twig');
+			$this->assertEquals('This is a namespaced template.', trim($str));
+
+			// Non namespaced location
+			$str = Timber::compile('thumb-test.twig');
+			$this->assertEquals('<img src="" />', trim($str));
+		}
+
+		function testTwigLoadsFromLocationWithAndWithoutNamespacesAndDirs(){
+			Timber::$dirname = array('foo', 'views');
+			Timber::$locations = array( 'namespaced' => __DIR__.'/namespaced', __DIR__ . '/assets' );
+
+			// Namespaced location
+			$str = Timber::compile('@namespaced/test-namespaced.twig');
+			$this->assertEquals('This is a namespaced template.', trim($str));
+
+			// Non namespaced location
+			$str = Timber::compile('thumb-test.twig');
+			$this->assertEquals('<img src="" />', trim($str));
+
+			if (!file_exists(get_template_directory().'/foo')) {
+				mkdir(get_template_directory().'/foo', 0777, true);
+			}
+			copy(__DIR__.'/assets/single-foo.twig', get_template_directory().'/foo/single-foo.twig');
+
+			// Dir
+			$str = Timber::compile('single-foo.twig');
+			$this->assertEquals('I am single-foo', trim($str));
+		}
+
 	}