test: Add tests for upcoming scope ordering fix (PR #2515)#2516
Merged
olleolleolle merged 1 commit intocodebar:masterfrom Mar 10, 2026
Merged
test: Add tests for upcoming scope ordering fix (PR #2515)#2516olleolleolle merged 1 commit intocodebar:masterfrom
olleolleolle merged 1 commit intocodebar:masterfrom
Conversation
Add tests to verify that today_and_upcoming and upcoming scopes return workshops in ascending order (soonest first), overriding the Workshop default_scope which orders in descending order. This ensures the fix in PR codebar#2515 is properly covered by tests.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This PR adds regression tests to ensure the fix from #2515 continues to work correctly.
Background
PR #2515 fixed an issue where
today_and_upcomingandupcomingscopes were returning workshops in the wrong order. TheWorkshopmodel has adefault_scopethat sorts bydate_and_time DESC, but for upcoming events we want them sorted ascending (soonest first).The fix changed
order(date_and_time: :asc)toreorder(date_and_time: :asc)to override the default scope.Changes
Added two new test cases to
spec/models/concerns/listable_spec.rb:These tests would fail without the
reorderfix because the default_scope would override the ascending order, causing workshops to be returned furthest-first instead of soonest-first.Testing
orderinstead ofreorderRelates to #2515