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

language/node: general cleanup.

Browse Source 
- Avoid using a temporary variable where not necessary
- Use fewer, better stubs in the tests to avoid warnings and better
  test the implemented functionality.
This commit is contained in:
Mike McQuaid 2017-07-07 15:11:41 +01:00
parent 1406f89ac5
commit 9f6762d958
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/language/node.rb
View File

@ -10,8 +10,7 @@ module Language
# fed to `npm install` only symlinks are created linking back to that # fed to `npm install` only symlinks are created linking back to that
# directory, consequently breaking that assumption. We require a tarball # directory, consequently breaking that assumption. We require a tarball
# because npm install creates a "real" installation when fed a tarball. # because npm install creates a "real" installation when fed a tarball.
pack_cmd = "npm pack --ignore-scripts" output = Utils.popen_read("npm pack --ignore-scripts")
output = Utils.popen_read(pack_cmd)
if !$CHILD_STATUS.exitstatus.zero? || output.lines.empty? if !$CHILD_STATUS.exitstatus.zero? || output.lines.empty?
raise "npm failed to pack #{Dir.pwd}" raise "npm failed to pack #{Dir.pwd}"
end end

12
Library/Homebrew/test/language/node_spec.rb
View File

@ -26,25 +26,19 @@ describe Language::Node do
npm_pack_cmd = "npm pack --ignore-scripts" npm_pack_cmd = "npm pack --ignore-scripts"
it "raises error with non zero exitstatus" do it "raises error with non zero exitstatus" do
allow(Utils).to receive(:popen_read).with(npm_pack_cmd).and_return("error msg") allow(Utils).to receive(:popen_read).with(npm_pack_cmd) { `false` }
allow_any_instance_of(Process::Status).to receive(:exitstatus).and_return(42)
allow_any_instance_of(nil::NilClass).to receive(:exitstatus).and_return(42)
expect { subject.std_npm_install_args(npm_install_arg) }.to \ expect { subject.std_npm_install_args(npm_install_arg) }.to \
raise_error("npm failed to pack #{Dir.pwd}") raise_error("npm failed to pack #{Dir.pwd}")
end end
it "raises error with empty npm pack output" do it "raises error with empty npm pack output" do
allow(Utils).to receive(:popen_read).with(npm_pack_cmd).and_return("") allow(Utils).to receive(:popen_read).with(npm_pack_cmd) { `true` }
allow_any_instance_of(Process::Status).to receive(:exitstatus).and_return(0)
allow_any_instance_of(nil::NilClass).to receive(:exitstatus).and_return(0)
expect { subject.std_npm_install_args(npm_install_arg) }.to \ expect { subject.std_npm_install_args(npm_install_arg) }.to \
raise_error("npm failed to pack #{Dir.pwd}") raise_error("npm failed to pack #{Dir.pwd}")
end end
it "does not raise error with a zero exitstatus" do it "does not raise error with a zero exitstatus" do
allow(Utils).to receive(:popen_read).with(npm_pack_cmd).and_return("pack.tgz") allow(Utils).to receive(:popen_read).with(npm_pack_cmd) { `echo pack.tgz` }
allow_any_instance_of(Process::Status).to receive(:exitstatus).and_return(0)
allow_any_instance_of(nil::NilClass).to receive(:exitstatus).and_return(0)
resp = subject.std_npm_install_args(npm_install_arg) resp = subject.std_npm_install_args(npm_install_arg)
expect(resp).to include("--prefix=#{npm_install_arg}", "#{Dir.pwd}/pack.tgz") expect(resp).to include("--prefix=#{npm_install_arg}", "#{Dir.pwd}/pack.tgz")
end end