Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions updater/lib/dependabot/updater.rb
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def check_and_update_pull_request(dependencies)
# NOTE: Prevent security only updates from turning into latest version
# updates if the current version is no longer vulnerable. This happens
# when a security update is applied by the user directly and the existing
# pull request is reabased.
# pull request is rebased.
if job.security_updates_only? &&
dependencies.none? { |d| job.allowed_update?(d) }
lead_dependency = dependencies.first
Expand Down Expand Up @@ -278,7 +278,7 @@ def check_and_create_pull_request(dependency)
if (existing_pr = existing_pull_request(updated_deps))
# Create a update job error to prevent dependabot-api from creating a
# update_not_possible error, this is likely caused by a update job retry
# so should be invisble to users (as the first job completed with a pull
# so should be invisible to users (as the first job completed with a pull
# request)
record_pull_request_exists_for_security_update(existing_pr) if job.security_updates_only?

Expand Down Expand Up @@ -355,7 +355,7 @@ def record_security_update_ignored(checker)
def record_dependency_file_not_supported_error(checker)
logger_info(
"Dependabot can't update vulnerable dependencies for projects " \
"without a lockfile or pinned version requirement as as the currently " \
"without a lockfile or pinned version requirement as the currently " \
"installed version of #{checker.dependency.name} isn't known."
)

Expand Down Expand Up @@ -775,7 +775,7 @@ def update_pull_request(dependencies, updated_dependency_files)

def close_pull_request(reason:)
reason_string = reason.to_s.tr("_", " ")
logger_info("Telling backed to close pull request for " \
logger_info("Telling backend to close pull request for " \
"#{job.dependencies.join(', ')} - #{reason_string}")
service.close_pull_request(job_id, job.dependencies, reason)
end
Expand Down
3 changes: 1 addition & 2 deletions updater/spec/dependabot/updater_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -378,8 +378,7 @@
to receive(:info).with(
"<job_1> Dependabot can't update vulnerable dependencies for " \
"projects without a lockfile or pinned version requirement as " \
"as the currently installed version of " \
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

the second "as" was deleted so the test matches the typo fix above

"dummy-pkg-b isn't known."
"the currently installed version of dummy-pkg-b isn't known."
)

updater.run
Expand Down