From edbf162bf09be3da14f791e2179781059af74431 Mon Sep 17 00:00:00 2001 From: noah morrison Date: Mon, 17 Nov 2014 15:13:55 -0500 Subject: [PATCH] Moved test files to tests/ --- entei.py | 3 ++- test_spec.py | 4 ++-- data.json => tests/data.json | 0 partial.mustache => tests/partial.mustache | 0 test.mustache => tests/test.mustache | 0 test.rendered => tests/test.rendered | 0 6 files changed, 4 insertions(+), 3 deletions(-) rename data.json => tests/data.json (100%) rename partial.mustache => tests/partial.mustache (100%) rename test.mustache => tests/test.mustache (100%) rename test.rendered => tests/test.rendered (100%) diff --git a/entei.py b/entei.py index 7dd92a6..a19e03f 100755 --- a/entei.py +++ b/entei.py @@ -360,7 +360,7 @@ def render(template='', data={}, partials_path='.', partials_ext='mustache', return output -def main(data, template): +def main(data, template, **kwargs): data = data template = template @@ -371,6 +371,7 @@ def main(data, template): 'data': json.load(data_file) } + args.update(kwargs) return render(**args) if __name__ == '__main__': diff --git a/test_spec.py b/test_spec.py index 1d37a40..5b76979 100755 --- a/test_spec.py +++ b/test_spec.py @@ -62,8 +62,8 @@ class ExpandedCoverage(unittest.TestCase): self.assertRaises(entei.UnclosedSection, entei.render, **test2) def test_main(self): - result = entei.main('data.json', 'test.mustache') - with open('test.rendered', 'r') as f: + result = entei.main('tests/data.json', 'tests/test.mustache', partials_path='tests') + with open('tests/test.rendered', 'r') as f: expected = f.read() self.assertEqual(result, expected) diff --git a/data.json b/tests/data.json similarity index 100% rename from data.json rename to tests/data.json diff --git a/partial.mustache b/tests/partial.mustache similarity index 100% rename from partial.mustache rename to tests/partial.mustache diff --git a/test.mustache b/tests/test.mustache similarity index 100% rename from test.mustache rename to tests/test.mustache diff --git a/test.rendered b/tests/test.rendered similarity index 100% rename from test.rendered rename to tests/test.rendered -- 2.47.3