This is an automated email from the ASF dual-hosted git repository. gcruz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/allura.git
commit f4f060311dbf645a9a3bb8ebb95549674683f298 Author: Dave Brondsema <dbronds...@slashdotmedia.com> AuthorDate: Tue Jul 30 15:17:00 2024 -0400 set solr.use_new_types=true for tests --- Allura/test.ini | 3 --- ForgeTracker/forgetracker/tests/unit/test_globals_model.py | 7 ++++--- ForgeTracker/forgetracker/tests/unit/test_root_controller.py | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Allura/test.ini b/Allura/test.ini index d7a870deb..8c3604c11 100644 --- a/Allura/test.ini +++ b/Allura/test.ini @@ -81,9 +81,6 @@ support_tool_choices = wiki tickets discussion ; tests expect max length of 40000 markdown_render_max_length = 40000 -; TODO: update tests and let this be true -solr.use_new_types = false - ; TODO: update tests and remove this setting override auth.require_email_addr = false diff --git a/ForgeTracker/forgetracker/tests/unit/test_globals_model.py b/ForgeTracker/forgetracker/tests/unit/test_globals_model.py index 9353d6b9f..99b6336a6 100644 --- a/ForgeTracker/forgetracker/tests/unit/test_globals_model.py +++ b/ForgeTracker/forgetracker/tests/unit/test_globals_model.py @@ -151,15 +151,16 @@ class TestCustomFields(TrackerTestWithModel): tracker_globals = globals_with_custom_fields( [dict(label='Iteration Number', name='_iteration_number', + type='number', show_in_search=False), dict(label='Point Estimate', name='_point_estimate', + type='number', show_in_search=True)]) - expected = [dict(sortable_name='_point_estimate_s', + expected = [dict(sortable_name='_point_estimate_d', name='_point_estimate', label='Point Estimate')] - assert tracker_globals.sortable_custom_fields_shown_in_search( - ) == expected + assert tracker_globals.sortable_custom_fields_shown_in_search() == expected def globals_with_custom_fields(custom_fields): diff --git a/ForgeTracker/forgetracker/tests/unit/test_root_controller.py b/ForgeTracker/forgetracker/tests/unit/test_root_controller.py index 43414cb8c..d0af09fcc 100644 --- a/ForgeTracker/forgetracker/tests/unit/test_root_controller.py +++ b/ForgeTracker/forgetracker/tests/unit/test_root_controller.py @@ -45,7 +45,7 @@ class TestWhenSearchingWithCustomFields(WithUserAndBugsApp): self.response = tracker_main.RootController().search(q='friends') def test_that_sortable_custom_fields_are_present(self): - expected = [dict(sortable_name='_iteration_number_s', + expected = [dict(sortable_name='_iteration_number_d', name='_iteration_number', label='Iteration Number')] assert self.response['sortable_custom_fields'] == expected