diff --git a/rojo-test/build-tests/csv_bug_145/default.project.json b/rojo-test/build-tests/csv_bug_145/default.project.json new file mode 100644 index 00000000..770ec7c3 --- /dev/null +++ b/rojo-test/build-tests/csv_bug_145/default.project.json @@ -0,0 +1,6 @@ +{ + "name": "csv_bug_145", + "tree": { + "$path": "folder" + } +} \ No newline at end of file diff --git a/test-projects/localization/src/integers-bug-145.csv b/rojo-test/build-tests/csv_bug_145/folder/normal.csv similarity index 100% rename from test-projects/localization/src/integers-bug-145.csv rename to rojo-test/build-tests/csv_bug_145/folder/normal.csv diff --git a/rojo-test/build-tests/csv_bug_147/default.project.json b/rojo-test/build-tests/csv_bug_147/default.project.json new file mode 100644 index 00000000..32bdf51a --- /dev/null +++ b/rojo-test/build-tests/csv_bug_147/default.project.json @@ -0,0 +1,6 @@ +{ + "name": "csv_bug_147", + "tree": { + "$path": "folder" + } +} \ No newline at end of file diff --git a/test-projects/localization/src/empty-column-bug-147.csv b/rojo-test/build-tests/csv_bug_147/folder/normal.csv similarity index 100% rename from test-projects/localization/src/empty-column-bug-147.csv rename to rojo-test/build-tests/csv_bug_147/folder/normal.csv diff --git a/rojo-test/src/build_test.rs b/rojo-test/src/build_test.rs index 660befa1..336430f9 100644 --- a/rojo-test/src/build_test.rs +++ b/rojo-test/src/build_test.rs @@ -22,6 +22,8 @@ macro_rules! gen_build_tests { gen_build_tests! { client_in_folder, + csv_bug_145, + csv_bug_147, csv_in_folder, gitkeep, module_in_folder, diff --git a/rojo-test/src/snapshots/build_test__csv_bug_145.snap b/rojo-test/src/snapshots/build_test__csv_bug_145.snap new file mode 100644 index 00000000..052c049d --- /dev/null +++ b/rojo-test/src/snapshots/build_test__csv_bug_145.snap @@ -0,0 +1,19 @@ +--- +created: "2019-08-14T22:42:52.297447700Z" +creator: insta@0.10.0 +source: rojo-test/src/build_test.rs +expression: contents +--- + + + + csv_bug_145 + + + + normal + [{"key":"Count","example":"A number demonstrating issue 145","source":"3","values":{"es":"7"}}] + + + + \ No newline at end of file diff --git a/rojo-test/src/snapshots/build_test__csv_bug_147.snap b/rojo-test/src/snapshots/build_test__csv_bug_147.snap new file mode 100644 index 00000000..023ff8da --- /dev/null +++ b/rojo-test/src/snapshots/build_test__csv_bug_147.snap @@ -0,0 +1,19 @@ +--- +created: "2019-08-14T22:42:52.310414Z" +creator: insta@0.10.0 +source: rojo-test/src/build_test.rs +expression: contents +--- + + + + csv_bug_147 + + + + normal + [{"key":"Language.Name","source":"English","values":{}},{"key":"Language.Region","source":"United States","values":{}},{"key":"Label.Thickness","source":"Thickness","values":{}},{"key":"Label.Opacity","source":"Opacity","values":{}},{"key":"Toolbar.Undo","source":"Undo","values":{}},{"key":"Toolbar.Redo","source":"Redo","values":{}},{"key":"Toolbar.Camera","source":"Top-down camera","values":{}},{"key":"Toolbar.Saves","source":"Saved drawings","values":{}},{"key":"Toolbar.Preferences","source":"Settings","values":{}},{"key":"Toolbar.Mode.Vector","source":"Vector mode","values":{}},{"key":"Toolbar.Mode.Pixel","source":"Pixel mode","values":{}}] + + + + \ No newline at end of file diff --git a/server/tests/snapshot_snapshots.rs b/server/tests/snapshot_snapshots.rs index e964858c..21bad786 100644 --- a/server/tests/snapshot_snapshots.rs +++ b/server/tests/snapshot_snapshots.rs @@ -32,7 +32,6 @@ macro_rules! generate_snapshot_tests { generate_snapshot_tests!( empty, json_model, - localization, meta_files, multi_partition_game, nested_partitions, diff --git a/test-projects/localization/default.project.json b/test-projects/localization/default.project.json deleted file mode 100644 index 64722c35..00000000 --- a/test-projects/localization/default.project.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "localization", - "tree": { - "$path": "src" - } -} \ No newline at end of file diff --git a/test-projects/localization/expected-snapshot.json b/test-projects/localization/expected-snapshot.json deleted file mode 100644 index dc093685..00000000 --- a/test-projects/localization/expected-snapshot.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "name": "localization", - "class_name": "Folder", - "properties": {}, - "children": [ - { - "name": "empty-column-bug-147", - "class_name": "LocalizationTable", - "properties": { - "Contents": { - "Type": "String", - "Value": "[{\"key\":\"Language.Name\",\"source\":\"English\",\"values\":{}},{\"key\":\"Language.Region\",\"source\":\"United States\",\"values\":{}},{\"key\":\"Label.Thickness\",\"source\":\"Thickness\",\"values\":{}},{\"key\":\"Label.Opacity\",\"source\":\"Opacity\",\"values\":{}},{\"key\":\"Toolbar.Undo\",\"source\":\"Undo\",\"values\":{}},{\"key\":\"Toolbar.Redo\",\"source\":\"Redo\",\"values\":{}},{\"key\":\"Toolbar.Camera\",\"source\":\"Top-down camera\",\"values\":{}},{\"key\":\"Toolbar.Saves\",\"source\":\"Saved drawings\",\"values\":{}},{\"key\":\"Toolbar.Preferences\",\"source\":\"Settings\",\"values\":{}},{\"key\":\"Toolbar.Mode.Vector\",\"source\":\"Vector mode\",\"values\":{}},{\"key\":\"Toolbar.Mode.Pixel\",\"source\":\"Pixel mode\",\"values\":{}}]" - } - }, - "children": [], - "metadata": { - "ignore_unknown_instances": false, - "source_path": "src/empty-column-bug-147.csv", - "project_definition": null - } - }, - { - "name": "integers-bug-145", - "class_name": "LocalizationTable", - "properties": { - "Contents": { - "Type": "String", - "Value": "[{\"key\":\"Count\",\"example\":\"A number demonstrating issue 145\",\"source\":\"3\",\"values\":{\"es\":\"7\"}}]" - } - }, - "children": [], - "metadata": { - "ignore_unknown_instances": false, - "source_path": "src/integers-bug-145.csv", - "project_definition": null - } - }, - { - "name": "normal", - "class_name": "LocalizationTable", - "properties": { - "Contents": { - "Type": "String", - "Value": "[{\"key\":\"Ack\",\"example\":\"An exclamation of despair\",\"source\":\"Ack!\",\"values\":{\"es\":\"¡Ay!\"}}]" - } - }, - "children": [], - "metadata": { - "ignore_unknown_instances": false, - "source_path": "src/normal.csv", - "project_definition": null - } - } - ], - "metadata": { - "ignore_unknown_instances": false, - "source_path": "src", - "project_definition": [ - "localization", - { - "class_name": null, - "children": {}, - "properties": {}, - "ignore_unknown_instances": null, - "path": "src" - } - ] - } -} \ No newline at end of file diff --git a/test-projects/localization/src/normal.csv b/test-projects/localization/src/normal.csv deleted file mode 100644 index 220cbe87..00000000 --- a/test-projects/localization/src/normal.csv +++ /dev/null @@ -1,2 +0,0 @@ -Key,Source,Context,Example,es -Ack,Ack!,,An exclamation of despair,¡Ay! \ No newline at end of file