Skip to content

Introduce test-utils crate#34

Merged
leynos merged 1 commit intomainfrom
codex/refactor-test-utilities-import-method
Aug 1, 2025
Merged

Introduce test-utils crate#34
leynos merged 1 commit intomainfrom
codex/refactor-test-utilities-import-method

Conversation

@leynos
Copy link
Copy Markdown
Owner

@leynos leynos commented Aug 1, 2025

Summary

  • add new test-utils crate to share test helpers
  • reference test-utils in comenqd dev-dependencies
  • import helpers directly in daemon tests

Testing

  • make lint
  • make test

https://chatgpt.com/codex/tasks/task_e_688d12f4271483229cc2cd3a0ff2e959

Summary by Sourcery

Introduce a new test-utils crate for sharing common test helpers and update comendqd tests and configurations to use it

New Features:

  • Introduce test-utils crate containing shared test utilities for temp_config and octocrab_for

Enhancements:

  • Remove inline test helper definitions in the daemon tests and switch to importing from test-utils

Build:

  • Add test-utils to the workspace members and reference it in comendqd dev-dependencies

Tests:

  • Update comendqd tests to import temp_config and octocrab_for directly from test-utils

@sourcery-ai
Copy link
Copy Markdown

sourcery-ai Bot commented Aug 1, 2025

Reviewer's Guide

This PR introduces a new test-utils crate to house shared test helpers, updates workspace and crate dependencies to reference it, and refactors daemon tests to import utilities from the new crate.

Class diagram for test-utils crate and test helper usage

classDiagram
    class test_utils {
        +octocrab_for()
        +temp_config()
    }
    class daemon_tests {
        +uses octocrab_for()
        +uses temp_config()
        +uses wait_for_file() from test_support
    }
    daemon_tests ..> test_utils : uses
    daemon_tests ..> test_support : uses
Loading

File-Level Changes

Change Details Files
Extract shared test helpers into a new crate
  • Add crates/test-utils/src/lib.rs with temp_config and octocrab_for implementations
  • Add crates/test-utils/Cargo.toml defining package and dependencies
  • Update root Cargo.toml members list to include the test-utils crate
crates/test-utils/src/lib.rs
crates/test-utils/Cargo.toml
Cargo.toml
Add test-utils as a dev-dependency in comenqd
  • Insert test-utils path dependency under dev-dependencies in crates/comenqd/Cargo.toml
crates/comenqd/Cargo.toml
Refactor daemon tests to import helpers from test-utils
  • Remove inline include! block for test_helpers
  • Replace use of test_support octocrab_for/temp_config with test_utils imports
crates/comenqd/src/daemon.rs

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Aug 1, 2025

Summary by CodeRabbit

  • New Features
    • Introduced a new shared test utilities package, providing helper functions for temporary configuration and mock client setup.
  • Chores
    • Updated project workspace to include the new test utilities package.
    • Adjusted development dependencies and reorganised test imports to use the new utilities, simplifying test setup.

Walkthrough

Expand the Cargo workspace to include a new test-utils crate. Add this crate as a development dependency to comenqd. Remove the internal test helper module in daemon.rs, replacing it with imports from the new test-utils and existing test-support crates. Introduce shared test helper functions temp_config and octocrab_for in test-utils.

Changes

Cohort / File(s) Change Summary
Workspace Membership Update
Cargo.toml
Add crates/test-utils to the workspace members list.
Dev Dependency Addition
crates/comenqd/Cargo.toml
Add test-utils as a development dependency for comenqd.
Test Import Refactor
crates/comenqd/src/daemon.rs
Remove internal test helper module; import wait_for_file from test_support and octocrab_for, temp_config from test_utils.
New Test Utilities Crate
crates/test-utils/Cargo.toml, crates/test-utils/src/lib.rs
Introduce the test-utils crate with its manifest and shared test helper functions: temp_config and octocrab_for.

Sequence Diagram(s)

sequenceDiagram
    participant Test as Test Code
    participant TestUtils as test-utils
    participant MockServer as wiremock::MockServer
    participant Octocrab as Octocrab

    Test->>TestUtils: temp_config(tmp)
    TestUtils->>Test: returns Config

    Test->>MockServer: start()
    MockServer-->>Test: MockServer instance

    Test->>TestUtils: octocrab_for(MockServer)
    TestUtils->>Octocrab: build client with MockServer URI
    Octocrab-->>TestUtils: Octocrab instance
    TestUtils-->>Test: Arc<Octocrab>
Loading

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

Possibly related PRs

Poem

New helpers arrive, a crate takes the stage,
Test code refactored, imports rearrange.
Octocrab and config, now easy to mock,
With shared test utilities, tests simply rock.
The workspace grows stronger, as helpers unite—
Code review is lighter, the future is bright!
🦀✨

✨ Finishing Touches
  • 📝 Generate Docstrings
🧪 Generate unit tests
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch codex/refactor-test-utilities-import-method

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai generate unit tests to generate unit tests for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Copy Markdown

@sourcery-ai sourcery-ai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @leynos - I've reviewed your changes - here's some feedback:

  • Consider consolidating test-support and test-utils crates or clarifying their distinct roles to avoid duplication and confusion in test helper usage.
  • Add simple tests inside the test-utils crate to verify that temp_config and octocrab_for produce the expected configurations and clients.
  • Pull wiremock into the workspace dependencies instead of pinning it only in test-utils to keep dependency versions consistent across crates.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- Consider consolidating test-support and test-utils crates or clarifying their distinct roles to avoid duplication and confusion in test helper usage.
- Add simple tests inside the test-utils crate to verify that temp_config and octocrab_for produce the expected configurations and clients.
- Pull wiremock into the workspace dependencies instead of pinning it only in test-utils to keep dependency versions consistent across crates.

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 2

📜 Review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 3e5d867 and 8e2ae0d.

⛔ Files ignored due to path filters (1)
  • Cargo.lock is excluded by !**/*.lock
📒 Files selected for processing (5)
  • Cargo.toml (1 hunks)
  • crates/comenqd/Cargo.toml (1 hunks)
  • crates/comenqd/src/daemon.rs (1 hunks)
  • crates/test-utils/Cargo.toml (1 hunks)
  • crates/test-utils/src/lib.rs (1 hunks)
🧰 Additional context used
📓 Path-based instructions (2)
Cargo.toml

📄 CodeRabbit Inference Engine (AGENTS.md)

Cargo.toml: Use explicit version ranges in Cargo.toml and keep dependencies up-to-date.
Mandate caret requirements for all dependencies: All crate versions specified in Cargo.toml must use SemVer-compatible caret requirements (e.g., some-crate = "1.2.3").
Prohibit unstable version specifiers: The use of wildcard (*) or open-ended inequality (>=) version requirements is strictly forbidden as they introduce unacceptable risk and unpredictability. Tilde requirements (~) should only be used where a dependency must be locked to patch-level updates for a specific, documented reason.

Files:

  • Cargo.toml
**/*.rs

📄 CodeRabbit Inference Engine (AGENTS.md)

**/*.rs: Clippy warnings MUST be disallowed.
Fix any warnings emitted during tests in the code itself rather than silencing them.
Where a function is too long, extract meaningfully named helper functions adhering to separation of concerns and CQRS.
Where a function has too many parameters, group related parameters in meaningfully named structs.
Where a function is returning a large error consider using Arc to reduce the amount of data returned.
Write unit and behavioural tests for new functionality. Run both before and after making any change.
Every module must begin with a module level (//!) comment explaining the module's purpose and utility.
Document public APIs using Rustdoc comments (///) so documentation can be generated with cargo doc.
Prefer immutable data and avoid unnecessary mut bindings.
Handle errors with the Result type instead of panicking where feasible.
Avoid unsafe code unless absolutely necessary and document any usage clearly.
Place function attributes after doc comments.
Do not use return in single-line functions.
Use predicate functions for conditional criteria with more than two branches.
Lints must not be silenced except as a last resort.
Lint rule suppressions must be tightly scoped and include a clear reason.
Prefer expect over allow.
Prefer .expect() over .unwrap().
Use concat!() to combine long string literals rather than escaping newlines with a backslash.
Prefer semantic error enums. Derive std::error::Error (via the thiserror crate) for any condition the caller might inspect, retry, or map to an HTTP status.
Use an opaque error only at the app boundary. Use eyre::Report for human-readable logs; these should not be exposed in public APIs.
Never export the opaque type from a library. Convert to domain enums at API boundaries, and to eyre only in the main main() entrypoint or top-level async task.

Files:

  • crates/comenqd/src/daemon.rs
  • crates/test-utils/src/lib.rs

⚙️ CodeRabbit Configuration File

**/*.rs: * Seek to keep the cyclomatic complexity of functions no more than 12.

  • Adhere to single responsibility and CQRS

  • Place function attributes after doc comments.

  • Do not use return in single-line functions.

  • Move conditionals with >2 branches into a predicate function.

  • Avoid unsafe unless absolutely necessary.

  • Every module must begin with a //! doc comment that explains the module's purpose and utility.

  • Comments and docs must follow en-GB-oxendict (-ize / -our) spelling and grammar

  • Lints must not be silenced except as a last resort.

    • #[allow] is forbidden.
    • Only narrowly scoped #[expect(lint, reason = "...")] is allowed.
    • No lint groups, no blanket or file-wide suppression.
    • Include FIXME: with link if a fix is expected.
  • Use rstest fixtures for shared setup and to avoid repetition between tests.

  • Replace duplicated tests with #[rstest(...)] parameterised cases.

  • Prefer mockall for mocks/stubs.

  • Prefer .expect() over .unwrap()

  • Ensure that any API or behavioural changes are reflected in the documentation in docs/

  • Ensure that any completed roadmap steps are recorded in the appropriate roadmap in docs/

  • Files must not exceed 400 lines in length

    • Large modules must be decomposed
    • Long match statements or dispatch tables should be decomposed by domain and collocated with targets
    • Large blocks of inline data (e.g., test fixtures, constants or templates) must be moved to external files and inlined at compile-time or loaded at run-time.

Files:

  • crates/comenqd/src/daemon.rs
  • crates/test-utils/src/lib.rs
🔇 Additional comments (5)
Cargo.toml (1)

35-35: LGTM!

The workspace member addition is correctly structured and follows the existing pattern.

crates/comenqd/Cargo.toml (1)

27-27: LGTM!

The development dependency addition is correctly structured using the appropriate relative path.

crates/comenqd/src/daemon.rs (1)

243-244: LGTM!

The import refactoring correctly utilises the new shared test utilities, improving code organisation and reusability.

crates/test-utils/src/lib.rs (2)

23-34: Add rustdoc documentation for the public API.

The coding guidelines require documenting public APIs using Rustdoc comments (///).

+/// Construct an [`Octocrab`] client for a [`MockServer`].
+///
+/// Creates an authenticated Octocrab client configured to communicate
+/// with the provided mock server for testing GitHub API interactions.
+///
+/// # Parameters
+/// - `server`: mock server to configure the client for
+///
+/// # Returns
+/// An [`Arc<Octocrab>`] instance configured for the mock server
 #[expect(clippy::expect_used, reason = "simplify test helper setup")]
 pub fn octocrab_for(server: &MockServer) -> Arc<Octocrab> {

Likely an incorrect or invalid review comment.


13-21: Add rustdoc documentation for the public API.

The coding guidelines require documenting public APIs using Rustdoc comments (///) so documentation can be generated with cargo doc.

+/// Build a [`Config`] using paths inside `tmp`.
+///
+/// Creates a test configuration with default values suitable for testing,
+/// using the provided temporary directory for socket and queue paths.
+///
+/// # Parameters
+/// - `tmp`: temporary directory to use for file paths
+///
+/// # Returns
+/// A [`Config`] instance configured for testing
 pub fn temp_config(tmp: &TempDir) -> Config {

Likely an incorrect or invalid review comment.

Comment thread crates/test-utils/Cargo.toml
Comment thread crates/test-utils/src/lib.rs
@leynos leynos merged commit 90183fb into main Aug 1, 2025
1 check passed
@leynos leynos deleted the codex/refactor-test-utilities-import-method branch August 1, 2025 20:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant