diff options
Diffstat (limited to 'cli/tests')
| -rw-r--r-- | cli/tests/integration/fmt_tests.rs | 23 | ||||
| -rw-r--r-- | cli/tests/testdata/fmt/badly_formatted.ipynb | 105 | ||||
| -rw-r--r-- | cli/tests/testdata/fmt/badly_formatted_fixed.ipynb | 106 | ||||
| -rw-r--r-- | cli/tests/testdata/fmt/expected_fmt_check_verbose_tests_dir.out | 2 |
4 files changed, 231 insertions, 5 deletions
diff --git a/cli/tests/integration/fmt_tests.rs b/cli/tests/integration/fmt_tests.rs index b8c77c529..5d555abf5 100644 --- a/cli/tests/integration/fmt_tests.rs +++ b/cli/tests/integration/fmt_tests.rs @@ -27,18 +27,24 @@ fn fmt_test() { testdata_fmt_dir.join("badly_formatted.json"); let badly_formatted_json = t.path().join("badly_formatted.json"); badly_formatted_original_json.copy(&badly_formatted_json); - // First, check formatting by ignoring the badly formatted file. + let fixed_ipynb = testdata_fmt_dir.join("badly_formatted_fixed.ipynb"); + let badly_formatted_original_ipynb = + testdata_fmt_dir.join("badly_formatted.ipynb"); + let badly_formatted_ipynb = t.path().join("badly_formatted.ipynb"); + badly_formatted_original_ipynb.copy(&badly_formatted_ipynb); + + // First, check formatting by ignoring the badly formatted file. let output = context .new_command() .current_dir(&testdata_fmt_dir) .args_vec(vec![ "fmt".to_string(), format!( - "--ignore={badly_formatted_js},{badly_formatted_md},{badly_formatted_json}", + "--ignore={badly_formatted_js},{badly_formatted_md},{badly_formatted_json},{badly_formatted_ipynb}", ), format!( - "--check {badly_formatted_js} {badly_formatted_md} {badly_formatted_json}", + "--check {badly_formatted_js} {badly_formatted_md} {badly_formatted_json} {badly_formatted_ipynb}", ), ]) .run(); @@ -57,6 +63,7 @@ fn fmt_test() { badly_formatted_js.to_string(), badly_formatted_md.to_string(), badly_formatted_json.to_string(), + badly_formatted_ipynb.to_string(), ]) .run(); @@ -72,6 +79,7 @@ fn fmt_test() { badly_formatted_js.to_string(), badly_formatted_md.to_string(), badly_formatted_json.to_string(), + badly_formatted_ipynb.to_string(), ]) .run(); @@ -81,12 +89,15 @@ fn fmt_test() { let expected_js = fixed_js.read_to_string(); let expected_md = fixed_md.read_to_string(); let expected_json = fixed_json.read_to_string(); + let expected_ipynb = fixed_ipynb.read_to_string(); let actual_js = badly_formatted_js.read_to_string(); let actual_md = badly_formatted_md.read_to_string(); let actual_json = badly_formatted_json.read_to_string(); + let actual_ipynb = badly_formatted_ipynb.read_to_string(); assert_eq!(expected_js, actual_js); assert_eq!(expected_md, actual_md); assert_eq!(expected_json, actual_json); + assert_eq!(expected_ipynb, actual_ipynb); } #[test] @@ -198,6 +209,12 @@ itest!(fmt_stdin_json { output_str: Some("{ \"key\": \"value\" }\n"), }); +itest!(fmt_stdin_ipynb { + args: "fmt --ext=ipynb -", + input: Some(include_str!("../testdata/fmt/badly_formatted.ipynb")), + output_str: Some(include_str!("../testdata/fmt/badly_formatted_fixed.ipynb")), +}); + itest!(fmt_stdin_check_formatted { args: "fmt --check -", input: Some("const a = 1;\n"), diff --git a/cli/tests/testdata/fmt/badly_formatted.ipynb b/cli/tests/testdata/fmt/badly_formatted.ipynb new file mode 100644 index 000000000..c8600564f --- /dev/null +++ b/cli/tests/testdata/fmt/badly_formatted.ipynb @@ -0,0 +1,105 @@ +{ + "cells": [ + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "# Hello Markdown\n", + "this isn't formatted properly" + ] + }, + { + "cell_type": "code", + "execution_count": 5, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Hello World\n" + ] + } + ], + "source": [ + "console.log(\"Hello World\"\n", + "\n", + ");" + ] + }, + { + "cell_type": "raw", + "metadata": {}, + "source": [ + "raw text\n", + " here too\n" + ] + }, + { + "cell_type": "code", + "execution_count": 6, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "alice\n" + ] + } + ], + "source": [ + "function hello(name: string ) {\n", + " console.log(name);\n", + "};\n", + "\n", + "hello( \"alice\");\n" + ] + }, + { + "cell_type": "code", + "execution_count": 7, + "metadata": {}, + "outputs": [], + "source": [ + "function foo(): number {\n", + " return 2;\n", + "}\n" + ] + }, + { + "cell_type": "code", + "execution_count": 8, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong\n" + ] + } + ], + "source": [ + "console.log(\"loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong\");" + ] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Deno", + "language": "typescript", + "name": "deno" + }, + "language_info": { + "file_extension": ".ts", + "mimetype": "text/x.typescript", + "name": "typescript", + "nb_converter": "script", + "pygments_lexer": "typescript", + "version": "5.2.2" + } + }, + "nbformat": 4, + "nbformat_minor": 2 +} diff --git a/cli/tests/testdata/fmt/badly_formatted_fixed.ipynb b/cli/tests/testdata/fmt/badly_formatted_fixed.ipynb new file mode 100644 index 000000000..a26a95e24 --- /dev/null +++ b/cli/tests/testdata/fmt/badly_formatted_fixed.ipynb @@ -0,0 +1,106 @@ +{ + "cells": [ + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "# Hello Markdown\n", + "\n", + "this isn't formatted properly" + ] + }, + { + "cell_type": "code", + "execution_count": 5, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Hello World\n" + ] + } + ], + "source": [ + "console.log(\"Hello World\");" + ] + }, + { + "cell_type": "raw", + "metadata": {}, + "source": [ + "raw text\n", + " here too\n" + ] + }, + { + "cell_type": "code", + "execution_count": 6, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "alice\n" + ] + } + ], + "source": [ + "function hello(name: string) {\n", + " console.log(name);\n", + "}\n", + "\n", + "hello(\"alice\");" + ] + }, + { + "cell_type": "code", + "execution_count": 7, + "metadata": {}, + "outputs": [], + "source": [ + "function foo(): number {\n", + " return 2;\n", + "}" + ] + }, + { + "cell_type": "code", + "execution_count": 8, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong\n" + ] + } + ], + "source": [ + "console.log(\n", + " \"loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong\",\n", + ");" + ] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Deno", + "language": "typescript", + "name": "deno" + }, + "language_info": { + "file_extension": ".ts", + "mimetype": "text/x.typescript", + "name": "typescript", + "nb_converter": "script", + "pygments_lexer": "typescript", + "version": "5.2.2" + } + }, + "nbformat": 4, + "nbformat_minor": 2 +} diff --git a/cli/tests/testdata/fmt/expected_fmt_check_verbose_tests_dir.out b/cli/tests/testdata/fmt/expected_fmt_check_verbose_tests_dir.out deleted file mode 100644 index 04cd5ec64..000000000 --- a/cli/tests/testdata/fmt/expected_fmt_check_verbose_tests_dir.out +++ /dev/null @@ -1,2 +0,0 @@ -[WILDCARD] -error: Found 1 not formatted file in [WILDCARD] files |