Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unneeded decorator #2472

Merged
merged 1 commit into from
Feb 25, 2025
Merged

Remove unneeded decorator #2472

merged 1 commit into from
Feb 25, 2025

Conversation

laritakr
Copy link
Collaborator

@laritakr laritakr commented Feb 25, 2025

The code in Hyrax (on the main_before_rails_72 branch) is correct as of samvera/hyrax@28e569f and this override is now incorrect.

This allows for an app to have both lazy migration AND native Valkyrie models without an ActiveFedora counterpart. Without the code changes, hydra_model with lazy migration assumes it needs to add Resource to the model name. And when the Resource model didn't exist, the line returned nil, resulting in the fallback ActiveFedora::Base model to be assigned.

The code in Hyrax (on the main_before_rails_72 branch) is correct as of
samvera/hyrax@28e569f
@laritakr laritakr added the patch-ver for release notes label Feb 25, 2025
@laritakr laritakr requested a review from bkiahstroud February 25, 2025 15:50
Copy link

Test Results

    3 files  ±0      3 suites  ±0   17m 24s ⏱️ -7s
2 087 tests ±0  2 031 ✅ ±0  56 💤 ±0  0 ❌ ±0 
2 114 runs  ±0  2 056 ✅ ±0  58 💤 ±0  0 ❌ ±0 

Results for commit 43123e5. ± Comparison against base commit 4614f8c.

This pull request removes 42 and adds 42 tests. Note that renamed tests count towards both.
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to destroy 30669bff-47c2-4747-97c9-005b16e57df9
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to edit db8c8802-fbb4-4e45-890e-9c8da244f12c
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to read cf0109b6-1977-494b-af0b-4a4024d8b5ac
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to update a462284d-3329-442f-af95-57c8d733982f
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor FileSet permissions is expected not to be able to destroy 74db7bd1-46d2-4fcc-8209-ab1ea86bfdbf
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor FileSet permissions is expected not to be able to edit 4ad6f3e9-101f-4fa5-bc21-29fc26f44d6e
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor FileSet permissions is expected not to be able to read fa91f8e6-4e03-430a-a4bf-ca32cac71167
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor FileSet permissions is expected not to be able to update 4bc76b3f-eaf1-402b-8acc-47305abe7af0
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor GenericWork permissions is expected not to be able to destroy 34de22e1-5d5e-4c31-ac63-9a8857c50e11
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor GenericWork permissions is expected not to be able to edit cbe8e680-cc35-4834-8a59-e0788b90b987
…
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to destroy 5797b6ad-0073-4653-a7db-ffcd82dab58f
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to edit 4ed1e218-5b2a-4b81-8081-1261a10fffcf
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to read e7867d02-8f98-4706-860d-47450f73b1ea
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor Etd permissions is expected not to be able to update 708702be-e5d9-4d3e-998e-46cac405d104
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor FileSet permissions is expected not to be able to destroy 3e88ca32-208d-41d6-ade3-d2734a6dc2b6
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor FileSet permissions is expected not to be able to edit 1843e649-3956-4a80-9e12-f6f716b04893
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor FileSet permissions is expected not to be able to read 4c863379-36d2-40c9-a321-4e04cbd61315
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor FileSet permissions is expected not to be able to update 014af0ed-b1f7-4c87-a894-5e786d2534e4
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor GenericWork permissions is expected not to be able to destroy 7f2542c8-3684-4dee-83ea-3060b083efeb
spec.abilities.work_ability_spec ‑ Hyrax::Ability::WorkAbility when work depositor GenericWork permissions is expected not to be able to edit bc0961ab-f211-43bd-ac95-b183124914e6
…

@bkiahstroud bkiahstroud merged commit 3189d29 into main Feb 25, 2025
9 checks passed
@bkiahstroud bkiahstroud deleted the remove-obsolete-decorator branch February 25, 2025 17:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
patch-ver for release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants