Skip to content

fix: Skip conditionalLockAgent locking path for bot agents#40635

Open
Copilot wants to merge 5 commits into
developfrom
copilot/conditional-lock-skip-bot-agents
Open

fix: Skip conditionalLockAgent locking path for bot agents#40635
Copilot wants to merge 5 commits into
developfrom
copilot/conditional-lock-skip-bot-agents

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented May 20, 2026

  • Fix wrong proxyquire stub path for hasRoleAsync in conditionalLockAgent.spec.ts
  • Combine !shouldLock and bot-agent checks into a single if condition in conditionalLockAgent.ts

https://rocketchat.atlassian.net/browse/SUP-1046

@dionisio-bot
Copy link
Copy Markdown
Contributor

dionisio-bot Bot commented May 20, 2026

Looks like this PR is not ready to merge, because of the following issues:

  • This PR is targeting the wrong base branch. It should target 8.6.0, but it targets 8.5.0

Please fix the issues and try again

If you have any trouble, please check the PR guidelines

@changeset-bot
Copy link
Copy Markdown

changeset-bot Bot commented May 20, 2026

🦋 Changeset detected

Latest commit: ff9649f

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 3 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@KevLehman KevLehman changed the title Skip conditionalLockAgent locking path for bot agents fix: Skip conditionalLockAgent locking path for bot agents May 20, 2026
Copilot AI requested a review from KevLehman May 20, 2026 23:25
@codecov
Copy link
Copy Markdown

codecov Bot commented May 20, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 69.64%. Comparing base (9379af4) to head (ff9649f).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #40635      +/-   ##
===========================================
- Coverage    69.65%   69.64%   -0.02%     
===========================================
  Files         3338     3338              
  Lines       123246   123247       +1     
  Branches     21975    21968       -7     
===========================================
- Hits         85845    85833      -12     
- Misses       34044    34053       +9     
- Partials      3357     3361       +4     
Flag Coverage Δ
e2e 59.16% <ø> (-0.06%) ⬇️
e2e-api 45.97% <ø> (-0.01%) ⬇️
unit 70.47% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@KevLehman KevLehman marked this pull request as ready for review May 22, 2026 16:54
@KevLehman KevLehman requested review from a team as code owners May 22, 2026 16:54
@KevLehman KevLehman added the stat: QA assured Means it has been tested and approved by a company insider label May 22, 2026
@KevLehman KevLehman added this to the 8.6.0 milestone May 22, 2026
Comment thread apps/meteor/app/livechat/server/lib/conditionalLockAgent.ts
Copilot AI requested a review from KevLehman May 22, 2026 17:54
@KevLehman KevLehman requested a review from ricardogarim May 22, 2026 17:59
@KevLehman KevLehman added the stat: ready to merge PR tested and approved waiting for merge label May 22, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

community stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants