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

Reduce factory creation in spec/models/account_statuses_cleanup_policy #28361

Merged

Conversation

mjankowski
Copy link
Contributor

Changes here:

  • There were some let! setup not used in specs, moved to before blocks
  • Added negated matcher for include
  • Combined some examples to reduce factory creation -- overall reduction is ~715 factories to ~325, and run time reduced ~8s to ~4s for single file

@renchap renchap added refactoring Improving code quality ruby Pull requests that update Ruby code labels Dec 14, 2023
Copy link
Contributor

This pull request has merge conflicts that must be resolved before it can be merged.

Copy link
Contributor

This pull request has resolved merge conflicts and is ready for review.

Copy link
Contributor

This pull request has merge conflicts that must be resolved before it can be merged.

@mjankowski mjankowski force-pushed the reduce-factories-spec-models-cleanup branch from faceb71 to 5a0eae4 Compare December 21, 2023 14:12
Copy link
Contributor

This pull request has resolved merge conflicts and is ready for review.

Copy link
Contributor

This pull request has merge conflicts that must be resolved before it can be merged.

Copy link
Contributor

This pull request has resolved merge conflicts and is ready for review.

@mjankowski mjankowski force-pushed the reduce-factories-spec-models-cleanup branch from ef8a662 to cc74ebb Compare January 17, 2024 19:29
@ClearlyClaire ClearlyClaire added this pull request to the merge queue Jan 25, 2024
Merged via the queue into mastodon:main with commit 2866106 Jan 25, 2024
28 checks passed
@mjankowski mjankowski deleted the reduce-factories-spec-models-cleanup branch January 25, 2024 13:47
neatchee pushed a commit to neatchee/mastodon that referenced this pull request Feb 4, 2024
* Add confirmation when redirecting logged-out requests to permalink (mastodon#27792)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>

* chore(deps): update dependency rubocop to v1.60.1 (mastodon#28731)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Fix `Rails/WhereExists` cop in app/lib (mastodon#28862)

* Use active variants for boost icons and increase icon size (mastodon#27924)

* chore(deps): update dependency haml_lint to v0.55.0 (mastodon#28856)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency selenium-webdriver to v4.17.0 (mastodon#28858)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update artifact actions (major) to v4 (major) (mastodon#28415)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency dotenv to v16.4.0 (mastodon#28872)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency chewy to v7.5.0 (mastodon#28730)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Tidy up association declaration in `Instance` model (mastodon#28880)

* Fix process of receiving posts with bearcaps is not working (mastodon#26527)

* Fix redirect confirmation for accounts (mastodon#28902)

* Add tests for redirect confirmations (mastodon#28903)

* Add tests for processing statuses using bearcap URIs (mastodon#28904)

* chore(deps): update dependency rspec-rails to v6.1.1 (mastodon#28905)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency axios to v1.6.6 (mastodon#28895)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Fix remaining `Rails/WhereExists` cop violations, regenerate todo (mastodon#28892)

* fix(deps): update dependency dotenv to v16.4.1 (mastodon#28889)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Add `CustomFilterKeyword#to_regex` method (mastodon#28893)

* New Crowdin Translations (automated) (mastodon#28899)

Co-authored-by: GitHub Actions <noreply@github.com>

* Consolidate db test prep steps to rake task (mastodon#28886)

* Fix `Style/TernaryParentheses` cop (mastodon#28387)

* Reduce factory creation in `spec/models/account_statuses_cleanup_policy` (mastodon#28361)

* Extract helper methods for db connection and table existence check in `CLI::Maintenance` task (mastodon#28281)

* Refactor conversations components in web UI (mastodon#28833)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>

* Fix `Style/GuardClause` cop in app/controllers (mastodon#28420)

* Update paperclip and climate_control gems (mastodon#28379)

* Extract `rebuild_index` method in maintenance CLI (mastodon#28911)

* Add specs for `Instance` model scopes and add `with_domain_follows` scope (mastodon#28767)

* [Glitch] Add confirmation when redirecting logged-out requests to permalink

Port SCSS changes from b19ae52 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Use active variants for boost icons and increase icon size

Port 5a838ce to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* Fix CSS loading in redirect controller

* [Glitch] Refactor conversations components in web UI (glitch-soc#2589)

Port 3205a65 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>

* Fix crash in private mention conversations in glitch-soc flavor (glitch-soc#2595)

* Remove obsolete locale file (glitch-soc#2596)

* Add github action workflow for manual security builds (mastodon#29040)

* Adapt workflow to glitch-soc

* Fix missing `workflow_dispatch` trigger for `build-security` (mastodon#29041)

* Configure selenium to use Chrome version 120 (mastodon#29038)

* Fix security builds not being marked latest

* Merge pull request from GHSA-3fjr-858r-92rw

* Fix insufficient origin validation

* Bump version to 4.3.0-alpha.1

* Fix build-security workflow for glitch-soc

* Restore -streaming suffix for security builds (glitch-soc#2602)

* Temporary hack to correctly tag the security docker image…

* Fix build-security docker tags

* fix lint issues in conversation.jsx

---------

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Matt Jankowski <matt@jankowski.online>
Co-authored-by: KMY(雪あすか) <tt@kmycode.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Aaron Brady <aaron@insom.me.uk>
neatchee added a commit to neatchee/mastodon that referenced this pull request Feb 4, 2024
* Add confirmation when redirecting logged-out requests to permalink (mastodon#27792)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>

* chore(deps): update dependency rubocop to v1.60.1 (mastodon#28731)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Fix `Rails/WhereExists` cop in app/lib (mastodon#28862)

* Use active variants for boost icons and increase icon size (mastodon#27924)

* chore(deps): update dependency haml_lint to v0.55.0 (mastodon#28856)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency selenium-webdriver to v4.17.0 (mastodon#28858)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update artifact actions (major) to v4 (major) (mastodon#28415)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency dotenv to v16.4.0 (mastodon#28872)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency chewy to v7.5.0 (mastodon#28730)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Tidy up association declaration in `Instance` model (mastodon#28880)

* Fix process of receiving posts with bearcaps is not working (mastodon#26527)

* Fix redirect confirmation for accounts (mastodon#28902)

* Add tests for redirect confirmations (mastodon#28903)

* Add tests for processing statuses using bearcap URIs (mastodon#28904)

* chore(deps): update dependency rspec-rails to v6.1.1 (mastodon#28905)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency axios to v1.6.6 (mastodon#28895)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Fix remaining `Rails/WhereExists` cop violations, regenerate todo (mastodon#28892)

* fix(deps): update dependency dotenv to v16.4.1 (mastodon#28889)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Add `CustomFilterKeyword#to_regex` method (mastodon#28893)

* New Crowdin Translations (automated) (mastodon#28899)

Co-authored-by: GitHub Actions <noreply@github.com>

* Consolidate db test prep steps to rake task (mastodon#28886)

* Fix `Style/TernaryParentheses` cop (mastodon#28387)

* Reduce factory creation in `spec/models/account_statuses_cleanup_policy` (mastodon#28361)

* Extract helper methods for db connection and table existence check in `CLI::Maintenance` task (mastodon#28281)

* Refactor conversations components in web UI (mastodon#28833)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>

* Fix `Style/GuardClause` cop in app/controllers (mastodon#28420)

* Update paperclip and climate_control gems (mastodon#28379)

* Extract `rebuild_index` method in maintenance CLI (mastodon#28911)

* Add specs for `Instance` model scopes and add `with_domain_follows` scope (mastodon#28767)

* [Glitch] Add confirmation when redirecting logged-out requests to permalink

Port SCSS changes from b19ae52 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Use active variants for boost icons and increase icon size

Port 5a838ce to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* Fix CSS loading in redirect controller

* [Glitch] Refactor conversations components in web UI (glitch-soc#2589)

Port 3205a65 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>

* Fix crash in private mention conversations in glitch-soc flavor (glitch-soc#2595)

* Remove obsolete locale file (glitch-soc#2596)

* Add github action workflow for manual security builds (mastodon#29040)

* Adapt workflow to glitch-soc

* Fix missing `workflow_dispatch` trigger for `build-security` (mastodon#29041)

* Configure selenium to use Chrome version 120 (mastodon#29038)

* Fix security builds not being marked latest

* Merge pull request from GHSA-3fjr-858r-92rw

* Fix insufficient origin validation

* Bump version to 4.3.0-alpha.1

* Fix build-security workflow for glitch-soc

* Restore -streaming suffix for security builds (glitch-soc#2602)

* Temporary hack to correctly tag the security docker image…

* Fix build-security docker tags

---------

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Matt Jankowski <matt@jankowski.online>
Co-authored-by: KMY(雪あすか) <tt@kmycode.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Aaron Brady <aaron@insom.me.uk>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
refactoring Improving code quality ruby Pull requests that update Ruby code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants