Merge pull request #3925 from maxim-belkin/git_remote_exists_bool
append ? to git_remote_exists
This commit is contained in:
commit
cb6828dbe6
@ -949,7 +949,7 @@ class ResourceAuditor
|
|||||||
problem http_content_problem
|
problem http_content_problem
|
||||||
end
|
end
|
||||||
elsif strategy <= GitDownloadStrategy
|
elsif strategy <= GitDownloadStrategy
|
||||||
unless Utils.git_remote_exists url
|
unless Utils.git_remote_exists? url
|
||||||
problem "The URL #{url} is not a valid git URL"
|
problem "The URL #{url} is not a valid git URL"
|
||||||
end
|
end
|
||||||
elsif strategy <= SubversionDownloadStrategy
|
elsif strategy <= SubversionDownloadStrategy
|
||||||
|
|||||||
@ -121,10 +121,10 @@ describe Utils do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "::git_remote_exists" do
|
describe "::git_remote_exists?" do
|
||||||
it "returns true when git is not available" do
|
it "returns true when git is not available" do
|
||||||
stub_const("HOMEBREW_SHIMS_PATH", HOMEBREW_PREFIX/"bin/shim")
|
stub_const("HOMEBREW_SHIMS_PATH", HOMEBREW_PREFIX/"bin/shim")
|
||||||
expect(described_class.git_remote_exists("blah")).to be_truthy
|
expect(described_class.git_remote_exists?("blah")).to be_truthy
|
||||||
end
|
end
|
||||||
|
|
||||||
context "when git is available" do
|
context "when git is available" do
|
||||||
@ -139,11 +139,11 @@ describe Utils do
|
|||||||
system git, "remote", "add", "origin", url
|
system git, "remote", "add", "origin", url
|
||||||
end
|
end
|
||||||
|
|
||||||
expect(described_class.git_remote_exists(url)).to be_truthy
|
expect(described_class.git_remote_exists?(url)).to be_truthy
|
||||||
end
|
end
|
||||||
|
|
||||||
it "returns false when git remote does not exist" do
|
it "returns false when git remote does not exist" do
|
||||||
expect(described_class.git_remote_exists("blah")).to be_falsey
|
expect(described_class.git_remote_exists?("blah")).to be_falsey
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -67,7 +67,7 @@ module Utils
|
|||||||
@git_version = nil
|
@git_version = nil
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.git_remote_exists(url)
|
def self.git_remote_exists?(url)
|
||||||
return true unless git_available?
|
return true unless git_available?
|
||||||
quiet_system "git", "ls-remote", url
|
quiet_system "git", "ls-remote", url
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user