Skip to content

Commit 25a89fb

Browse files
jakecoffmanjakecoffman
committed
remove duplicate tests which rely on a lot of stubbing
1 parent c63e474 commit 25a89fb

File tree

3 files changed

+0
-227
lines changed

3 files changed

+0
-227
lines changed

‎updater/spec/dependabot/updater/operations/create_security_update_pull_request_spec.rb‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -377,14 +377,6 @@
377377
)
378378
end
379379

380-
it "checks if a pull request already exists" do
381-
expect(create_security_update_pull_request)
382-
.to receive(:record_pull_request_exists_for_latest_version)
383-
.with(stub_update_checker)
384-
create_security_update_pull_request
385-
.send(:check_and_create_pull_request, dependency)
386-
end
387-
388380
context "when pull request doesn't exists" do
389381
before do
390382
allow(job)

‎updater/spec/dependabot/updater/operations/update_all_versions_spec.rb‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -329,22 +329,6 @@
329329
end
330330
end
331331

332-
context "when an existing pull request matches the updated dependencies" do
333-
before do
334-
allow(stub_update_checker).to receive_messages(
335-
up_to_date?: false,
336-
requirements_unlocked_or_can_be?: true,
337-
updated_dependencies: [dependency],
338-
latest_version: Gem::Version.new("2.0.0")
339-
)
340-
end
341-
342-
it "does not create a pull request" do
343-
expect(update_all_versions).not_to receive(:create_pull_request)
344-
update_all_versions.send(:check_and_create_pull_request, dependency)
345-
end
346-
end
347-
348332
context "when no existing pull request matches the updated dependencies" do
349333
before do
350334
allow(stub_update_checker).to receive_messages(

‎updater/spec/dependabot/updater_spec.rb‎

Lines changed: 0 additions & 203 deletions
Original file line numberDiff line numberDiff line change
@@ -835,34 +835,6 @@ def expect_update_checker_with_ignored_versions(versions, dependency_matcher: an
835835
end
836836
end
837837

838-
context "when a PR already exists for the latest version" do
839-
it "doesn't call can_update? (so short-circuits resolution)" do
840-
checker = stub_update_checker
841-
842-
job = build_job(existing_pull_requests: [
843-
[
844-
{
845-
"dependency-name" => "dummy-pkg-b",
846-
"dependency-version" => "1.2.0"
847-
}
848-
]
849-
])
850-
service = build_service
851-
updater = build_updater(service: service, job: job)
852-
853-
expect(checker).not_to receive(:can_update?)
854-
expect(Dependabot::DependencyChangeBuilder).not_to receive(:create_from)
855-
expect(service).not_to receive(:create_pull_request)
856-
expect(service).not_to receive(:record_update_job_error)
857-
expect(Dependabot.logger)
858-
.to receive(:info)
859-
.with("Pull request already exists for dummy-pkg-b " \
860-
"with latest version 1.2.0")
861-
862-
updater.run
863-
end
864-
end
865-
866838
context "when a PR already exists for the resolved version" do
867839
it "doesn't update the dependency" do
868840
checker = stub_update_checker(latest_version: Gem::Version.new("1.3.0"))
@@ -891,99 +863,6 @@ def expect_update_checker_with_ignored_versions(versions, dependency_matcher: an
891863
end
892864
end
893865

894-
context "when a security update PR exists for the resolved version" do
895-
it "creates an update job error and short-circuits" do
896-
checker = stub_update_checker(latest_version: Gem::Version.new("1.3.0"), vulnerable?: true)
897-
898-
job = build_job(
899-
requested_dependencies: ["dummy-pkg-b"],
900-
existing_pull_requests: [
901-
[
902-
{
903-
"dependency-name" => "dummy-pkg-b",
904-
"dependency-version" => "1.2.0"
905-
}
906-
]
907-
],
908-
security_updates_only: true,
909-
security_advisories: [
910-
{
911-
"dependency-name" => "dummy-pkg-b",
912-
"affected-versions" => ["1.1.0"]
913-
}
914-
]
915-
)
916-
service = build_service
917-
updater = build_updater(service: service, job: job)
918-
919-
expect(checker).to receive(:up_to_date?).and_return(false)
920-
expect(checker).to receive(:can_update?).and_return(true)
921-
expect(Dependabot::DependencyChangeBuilder).not_to receive(:create_from)
922-
expect(service).not_to receive(:create_pull_request)
923-
expect(service).to receive(:record_update_job_error)
924-
.with(
925-
error_type: "pull_request_exists_for_security_update",
926-
error_details: {
927-
"updated-dependencies": [
928-
"dependency-name": "dummy-pkg-b",
929-
"dependency-version": "1.2.0"
930-
]
931-
}
932-
)
933-
expect(Dependabot.logger)
934-
.to receive(:info)
935-
.with("Pull request already exists for dummy-pkg-b@1.2.0")
936-
937-
updater.run
938-
end
939-
end
940-
941-
context "when a security update PR exists for the latest version" do
942-
it "doesn't call can_update? (so short-circuits resolution)" do
943-
checker = stub_update_checker(vulnerable?: true)
944-
945-
job = build_job(
946-
requested_dependencies: ["dummy-pkg-b"],
947-
existing_pull_requests: [
948-
[
949-
{
950-
"dependency-name" => "dummy-pkg-b",
951-
"dependency-version" => "1.2.0"
952-
}
953-
]
954-
],
955-
security_updates_only: true,
956-
security_advisories: [
957-
{
958-
"dependency-name" => "dummy-pkg-b",
959-
"affected-versions" => ["1.1.0"]
960-
}
961-
]
962-
)
963-
service = build_service
964-
updater = build_updater(service: service, job: job)
965-
966-
expect(checker).not_to receive(:can_update?)
967-
expect(Dependabot::DependencyChangeBuilder).not_to receive(:create_from)
968-
expect(service).not_to receive(:create_pull_request)
969-
expect(service).to receive(:record_update_job_error)
970-
.with(
971-
error_type: "pull_request_exists_for_latest_version",
972-
error_details: {
973-
"dependency-name": "dummy-pkg-b",
974-
"dependency-version": "1.2.0"
975-
},
976-
dependency: an_instance_of(Dependabot::Dependency)
977-
)
978-
expect(Dependabot.logger)
979-
.to receive(:info)
980-
.with("Pull request already exists for dummy-pkg-b " \
981-
"with latest version 1.2.0")
982-
983-
updater.run
984-
end
985-
end
986-
987866
context "when a PR exists for a different version" do
988867
it "updates the dependency" do
989868
stub_update_checker
@@ -1007,88 +886,6 @@ def expect_update_checker_with_ignored_versions(versions, dependency_matcher: an
1007886
end
1008887
end
1009888

1010-
context "when a PR already exists for a removed dependency" do
1011-
it "creates an update job error and short-circuits" do
1012-
checker =
1013-
stub_update_checker(
1014-
latest_version: Gem::Version.new("1.3.0"),
1015-
vulnerable?: true,
1016-
updated_dependencies: [
1017-
Dependabot::Dependency.new(
1018-
name: "dummy-pkg-b",
1019-
package_manager: "bundler",
1020-
previous_version: "1.1.0",
1021-
requirements: [],
1022-
previous_requirements: [],
1023-
removed: true
1024-
),
1025-
Dependabot::Dependency.new(
1026-
name: "dummy-pkg-c",
1027-
package_manager: "bundler",
1028-
version: "1.4.0",
1029-
previous_version: "1.3.0",
1030-
requirements: [
1031-
{ file: "Gemfile", requirement: "~> 1.4.0", groups: [], source: nil }
1032-
],
1033-
previous_requirements: [
1034-
{ file: "Gemfile", requirement: "~> 1.3.0", groups: [], source: nil }
1035-
]
1036-
)
1037-
]
1038-
)
1039-
1040-
job = build_job(
1041-
requested_dependencies: ["dummy-pkg-b"],
1042-
existing_pull_requests: [
1043-
[
1044-
{
1045-
"dependency-name" => "dummy-pkg-c",
1046-
"dependency-version" => "1.4.0"
1047-
},
1048-
{
1049-
"dependency-name" => "dummy-pkg-b",
1050-
"dependency-removed" => true
1051-
}
1052-
]
1053-
],
1054-
security_updates_only: true,
1055-
security_advisories: [
1056-
{
1057-
"dependency-name" => "dummy-pkg-b",
1058-
"affected-versions" => ["1.1.0"]
1059-
}
1060-
]
1061-
)
1062-
service = build_service
1063-
updater = build_updater(service: service, job: job)
1064-
1065-
expect(checker).to receive(:up_to_date?).and_return(false)
1066-
expect(checker).to receive(:can_update?).and_return(true)
1067-
expect(Dependabot::DependencyChangeBuilder).not_to receive(:create_from)
1068-
expect(service).not_to receive(:create_pull_request)
1069-
expect(service).to receive(:record_update_job_error)
1070-
.with(
1071-
error_type: "pull_request_exists_for_security_update",
1072-
error_details: {
1073-
"updated-dependencies": [
1074-
{
1075-
"dependency-name": "dummy-pkg-c",
1076-
"dependency-version": "1.4.0"
1077-
},
1078-
{
1079-
"dependency-name": "dummy-pkg-b",
1080-
"dependency-removed": true
1081-
}
1082-
]
1083-
}
1084-
)
1085-
expect(Dependabot.logger)
1086-
.to receive(:info)
1087-
.with("Pull request already exists for dummy-pkg-c@1.4.0, dummy-pkg-b@removed")
1088-
updater.run
1089-
end
1090-
end
1091-
1092889
context "when a list of dependencies is specified" do
1093890
context "when the job is to update a PR" do
1094891
it "only attempts to update dependencies on the specified list" do

0 commit comments

Comments
 (0)