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.

Sign up for GitHub

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

fix broken updates due to incorrect directory filtering #8405

Merged
merged 9 commits into from
Nov 15, 2023
Merged

fix broken updates due to incorrect directory filtering #8405

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8532515
fix broken updates due to incorrect directory filtering
jakecoffman Nov 15, 2023
0ee167f
don't send new data to the server
jakecoffman Nov 15, 2023
baa940f
no need to do .dirname as this is already a directory, just clean it
jakecoffman Nov 15, 2023
dfb8125
fix spec
jakecoffman Nov 15, 2023
058e7ec
refactor to put the job_directory on in the base FileFetcher
jakecoffman Nov 15, 2023
31db8d3
fix common specs
jakecoffman Nov 15, 2023
f9ba9ff
add a special case for tests
jakecoffman Nov 15, 2023
b829319
allow each result to be memoized
jakecoffman Nov 15, 2023
00eaaa8
use a nilable job_directory for consistency with other file members
jakecoffman Nov 15, 2023
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
Prev Previous commit
Next Next commit
fix spec
  • Loading branch information
@jakecoffman
jakecoffman committed Nov 15, 2023
commit dfb81259ba75182f1b3ee45ac17925e6633566a7
30 changes: 9 additions & 21 deletions updater/spec/dependabot/updater/dependency_group_change_batch_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,15 @@
describe "current_dependency_files" do
let(:files) do
[
Dependabot::DependencyFile.new(name: "Gemfile", content: "mock-gemfile", directory: "/"),
Dependabot::DependencyFile.new(name: "Gemfile.lock", content: "mock-gemfile-lock", directory: "/hello/.."),
Dependabot::DependencyFile.new(name: "Gemfile", content: "mock-package-json", directory: "/elsewhere"),
Dependabot::DependencyFile.new(name: "Gemfile", content: "mock-package-json", directory: "unknown"),
Dependabot::DependencyFile.new(name: "Gemfile", content: "mock-package-json", directory: "../../oob")
Dependabot::DependencyFile.new(name: "Gemfile", content: "mock-gemfile", directory: "/", job_directory: "/"),
Dependabot::DependencyFile.new(name: "Gemfile.lock", content: "mock-gemfile-lock", directory: "/hello/..",
job_directory: "/"),
Dependabot::DependencyFile.new(name: "Gemfile", content: "mock-package-json", directory: "/elsewhere",
job_directory: "/other"),
Dependabot::DependencyFile.new(name: "Gemfile", content: "mock-package-json", directory: "unknown",
job_directory: "/hello"),
Dependabot::DependencyFile.new(name: "Gemfile", content: "mock-package-json", directory: "../../oob",
job_directory: "/oob")
]
end

Expand Down Expand Up @@ -53,21 +57,5 @@
.current_dependency_files(job).map(&:name)).to eq(%w(Gemfile Gemfile.lock))
end
end

context "when the package manager is github-actions" do
let(:package_manager) { "github_actions" }
let(:files) do
[
Dependabot::DependencyFile.new(name: "workflow.yml", content: "mock-workflow",
directory: "/.github/workflows"),
Dependabot::DependencyFile.new(name: "common.yml", content: "mock-gemfile-lock", directory: "/reusable")
]
end

it "returns the current dependency files filtered by directory" do
expect(described_class.new(initial_dependency_files: files)
.current_dependency_files(job).map(&:name)).to eq(%w(workflow.yml))
end
end
end
end