admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Added tests for ensure_git_installed when git is available or homebrew/core is unavailable

Browse Source
This commit is contained in:
mansimarkaur 2017-08-12 02:33:48 +05:30
parent abe78ebb8e
commit 372a422305
2 changed files with 60 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
Library/Homebrew/test/utils/git_spec.rb
View File

@ -3,45 +3,44 @@ require "utils/git"
describe Git do
before(:all) do
git = HOMEBREW_SHIMS_PATH/"scm/git"
file = "lib/blah.rb"
repo = Pathname.new("repo")
(repo/"lib").mkpath
@file = "lib/blah.rb"
@repo = Pathname.new("repo")
(@repo/"lib").mkpath
system git, "init"
FileUtils.touch("repo/#{file}")
FileUtils.touch(@repo/@file)
File.open(repo/file, "w") { |f| f.write("blah") }
system git, "add", repo/file
File.open(@repo/@file, "w") { |f| f.write("blah") }
system git, "add", @repo/@file
system git, "commit", "-m", "'File added'"
@h1 = `git rev-parse HEAD`
File.open(repo/file, "w") { |f| f.write("brew") }
system git, "add", repo/file
File.open(@repo/@file, "w") { |f| f.write("brew") }
system git, "add", @repo/@file
system git, "commit", "-m", "'written to File'"
@h2 = `git rev-parse HEAD`
end
let(:file) { "lib/blah.rb" }
let(:repo) { Pathname.new("repo") }
let(:hash1) { @h1[0..6] }
let(:hash2) { @h2[0..6] }
after(:all) do
FileUtils.rm_rf("repo")
FileUtils.rm_rf(@repo)
end
describe "#last_revision_commit_of_file" do
it "gives last revision commit when before_commit is nil" do
expect(
described_class.last_revision_commit_of_file(repo, file),
described_class.last_revision_commit_of_file(@repo, @file),
).to eq(hash1)
end
it "gives revision commit based on before_commit when it is not nil" do
expect(
described_class.last_revision_commit_of_file(repo,
file,
before_commit: "0..3"),
described_class.last_revision_commit_of_file(@repo,
@file,
before_commit: hash2),
).to eq(hash2)
end
end
@ -49,14 +48,14 @@ describe Git do
describe "#last_revision_of_file" do
it "returns last revision of file" do
expect(
described_class.last_revision_of_file(repo,
repo/file),
described_class.last_revision_of_file(@repo,
@repo/@file),
).to eq("blah")
end
it "returns last revision of file based on before_commit" do
expect(
described_class.last_revision_of_file(repo, repo/file,
described_class.last_revision_of_file(@repo, @repo/@file,
before_commit: "0..3"),
).to eq("brew")
end
@ -72,100 +71,71 @@ describe Utils do
describe "::git_available?" do
it "returns true if git --version command succeeds" do
allow_any_instance_of(Process::Status).to receive(:success?).and_return(true)
expect(described_class.git_available?).to be_truthy
end
it "returns false if git --version command does not succeed" do
allow_any_instance_of(Process::Status).to receive(:success?).and_return(false)
stub_const("HOMEBREW_SHIMS_PATH", mktmpdir/"shim")
expect(described_class.git_available?).to be_falsey
end
it "returns git version if already set" do
described_class.instance_variable_set(:@git, true)
expect(described_class.git_available?).to be_truthy
described_class.instance_variable_set(:@git, nil)
end
end
describe "::git_path" do
context "when git is not available" do
before do
described_class.instance_variable_set(:@git, false)
end
it "returns nil" do
it "returns nil when git is not available" do
stub_const("HOMEBREW_SHIMS_PATH", mktmpdir/"shim")
expect(described_class.git_path).to eq(nil)
end
end
context "when git is available" do
before do
described_class.instance_variable_set(:@git, true)
end
it "returns path of git" do
it "returns path of git when git is available" do
expect(described_class.git_path).to end_with("git")
end
it "returns git_path if already set" do
described_class.instance_variable_set(:@git_path, "git")
expect(described_class.git_path).to eq("git")
described_class.instance_variable_set(:@git_path, nil)
end
end
end
describe "::git_version" do
context "when git is not available" do
before do
described_class.instance_variable_set(:@git, false)
end
it "returns nil" do
it "returns nil when git is not available" do
stub_const("HOMEBREW_SHIMS_PATH", mktmpdir/"shim")
expect(described_class.git_path).to eq(nil)
end
end
context "when git is available" do
before do
described_class.instance_variable_set(:@git, true)
end
it "returns version of git" do
it "returns version of git when git is available" do
expect(described_class.git_version).not_to be_nil
end
end
it "returns git_version if already set" do
described_class.instance_variable_set(:@git_version, "v1")
expect(described_class.git_version).to eq("v1")
described_class.instance_variable_set(:@git_version, nil)
describe "::ensure_git_installed!" do
it "returns nil if git already available" do
expect(described_class.ensure_git_installed!).to be_nil
end
context "when git is not already available" do
before do
stub_const("HOMEBREW_SHIMS_PATH", mktmpdir/"shim")
end
it "can't install brewed git if homebrew/core is unavailable" do
allow_any_instance_of(Pathname).to receive(:directory?).and_return(false)
expect { described_class.ensure_git_installed! }.to raise_error("Git is unavailable")
end
it "raises error if can't install git" do
stub_const("HOMEBREW_BREW_FILE", mktmpdir/"brew")
expect { described_class.ensure_git_installed! }.to raise_error("Git is unavailable")
end
it "installs git" do
allow(Homebrew).to receive(:_system).with(any_args).and_return(true)
described_class.ensure_git_installed!
end
end
end
describe "::git_remote_exists" do
context "when git is not available" do
before do
described_class.instance_variable_set(:@git, false)
end
it "returns true" do
it "returns true when git is not available" do
stub_const("HOMEBREW_SHIMS_PATH", mktmpdir/"shim")
expect(described_class.git_remote_exists("blah")).to be_truthy
end
end
context "when git is available" do
before(:all) do
described_class.instance_variable_set(:@git, true)
end
after(:all) do
if described_class.instance_variable_defined?(:@git)
described_class.send(:remove_instance_variable, :@git)
end
end
it "returns true when git remote exists", :needs_network do
git = HOMEBREW_SHIMS_PATH/"scm/git"
repo = Pathname.new("hey")
@ -173,10 +143,10 @@ describe Utils do
system "cd", repo
system git, "init"
system git, "remote", "add", "origin", "git@github.com:Homebrew/brew"
system git, "remote", "add", "origin", "http://github.com/Homebrew/homebrew.github.io"
system "cd .."
expect(described_class.git_remote_exists("git@github.com:Homebrew/brew")).to be_truthy
expect(described_class.git_remote_exists("http://github.com/Homebrew/homebrew.github.io")).to be_truthy
FileUtils.rm_rf(repo)
end
@ -191,24 +161,15 @@ describe Utils do
it "removes @git_path and @git_version if defined" do
described_class.clear_git_available_cache
expect(@git_path).to be_nil
expect(@git_version).to be_nil
expect(described_class.instance_variable_get(:@git_path)).to be_nil
expect(described_class.instance_variable_get(:@git_version)).to be_nil
end
it "removes @git if defined" do
described_class.instance_variable_set(:@git, true)
begin
described_class.git_available?
described_class.clear_git_available_cache
expect(@git).to be_nil
expect(@git_path).to be_nil
expect(@git_version).to be_nil
ensure
if described_class.instance_variable_defined?(:@git)
described_class.send(:remove_instance_variable, :@git)
end
end
expect(described_class.instance_variable_get(:@git)).to be_nil
end
end
end

2
Library/Homebrew/utils/git.rb
View File

@ -4,7 +4,7 @@ module Git
module_function
def last_revision_commit_of_file(repo, file, before_commit: nil)
args = ["--skip=#{before_commit.nil? ? 1 : before_commit.split("..").first}"]
args = [before_commit.nil? ? "--skip=1" : before_commit.split("..").first]
out, = Open3.capture3(
HOMEBREW_SHIMS_PATH/"scm/git", "-C", repo,