Also remove writer method for Hbc.binarydir.

This commit is contained in:
Markus Reiter 2017-12-03 10:05:50 +01:00
parent e4bb09dd40
commit a02ce4f8e9
3 changed files with 2 additions and 9 deletions

View File

@ -57,8 +57,6 @@ module Hbc
@servicedir ||= Pathname.new("~/Library/Services").expand_path @servicedir ||= Pathname.new("~/Library/Services").expand_path
end end
attr_writer :binarydir
def binarydir def binarydir
@binarydir ||= HOMEBREW_PREFIX.join("bin") @binarydir ||= HOMEBREW_PREFIX.join("bin")
end end

View File

@ -7,10 +7,6 @@ describe Hbc::Artifact::Binary, :cask do
let(:artifacts) { cask.artifacts.select { |a| a.is_a?(described_class) } } let(:artifacts) { cask.artifacts.select { |a| a.is_a?(described_class) } }
let(:expected_path) { Hbc.binarydir.join("binary") } let(:expected_path) { Hbc.binarydir.join("binary") }
before(:each) do
Hbc.binarydir.mkpath
end
after(:each) do after(:each) do
FileUtils.rm expected_path if expected_path.exist? FileUtils.rm expected_path if expected_path.exist?
end end

View File

@ -11,14 +11,13 @@ HOMEBREW_CASK_DIRS = [
:prefpanedir, :prefpanedir,
:qlplugindir, :qlplugindir,
:servicedir, :servicedir,
:binarydir,
].freeze ].freeze
RSpec.shared_context "Homebrew-Cask" do RSpec.shared_context "Homebrew-Cask" do
around(:each) do |example| around(:each) do |example|
third_party_tap = Tap.fetch("third-party", "tap") third_party_tap = Tap.fetch("third-party", "tap")
begin begin
[Hbc.caskroom, Hbc.cache].each(&:mkpath) [Hbc.binarydir, Hbc.caskroom, Hbc.cache].each(&:mkpath)
dirs = HOMEBREW_CASK_DIRS.map do |dir| dirs = HOMEBREW_CASK_DIRS.map do |dir|
Pathname.new(TEST_TMPDIR).join("cask-#{dir}").tap do |path| Pathname.new(TEST_TMPDIR).join("cask-#{dir}").tap do |path|
@ -40,7 +39,7 @@ RSpec.shared_context "Homebrew-Cask" do
example.run example.run
ensure ensure
FileUtils.rm_rf dirs FileUtils.rm_rf dirs
FileUtils.rm_rf Hbc.caskroom, Hbc.cache FileUtils.rm_rf [Hbc.binarydir, Hbc.caskroom, Hbc.cache]
Hbc.default_tap.path.unlink Hbc.default_tap.path.unlink
FileUtils.rm_rf Hbc.default_tap.path.parent FileUtils.rm_rf Hbc.default_tap.path.parent
third_party_tap.path.unlink third_party_tap.path.unlink