Merge branch 'master' of https://github.com/VTimofeenko/confluence_po…

…ster
VTimofeenko · Feb 14, 2021 · a3645db · a3645db
2 parents 9375cdf + 7a85dd5
commit a3645db
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/confluence_poster/main.py b/confluence_poster/main.py
@@ -176,7 +176,8 @@ def post_page(
         )
         raise typer.Exit(1)
 
-    posted_pages[0].page_file_format = file_format
+    if file_format is not AllowedFileFormat.none:
+        posted_pages[0].page_file_format = file_format
 
     if upload_files:
         if len(posted_pages) > 1:

diff --git a/tests/command tests/flag tests/test_post_page_file_format_flag.py b/tests/command tests/flag tests/test_post_page_file_format_flag.py
@@ -58,3 +58,19 @@ def test_error_if_multiple_pages(tmp_path):
     )
     assert "Consider adding it to the config file." in result.stdout
     assert result.exit_code == 1
+
+
+def test_not_guessing_file_format_specified(make_one_page_config, tmp_path):
+    config_file, config = make_one_page_config
+    config_file = mk_tmp_file(
+        tmp_path=tmp_path,
+        config_to_clone=config_file,
+        key_to_update="pages.page1.page_file_format",
+        value_to_update="markdown",
+    )
+    result: Result = run_with_config(
+        config_file=config_file,
+        input=create_single_page_input,
+    )
+    assert result.exit_code == 0
+    assert "Trying to determine" not in result.stdout