diff options
| author | Markus Reiter | 2017-02-28 14:50:46 +0100 | 
|---|---|---|
| committer | Markus Reiter | 2017-02-28 15:06:32 +0100 | 
| commit | a5549023804a8cef50f71dc2d7a723be8e83f3d1 (patch) | |
| tree | 0c5bcf473909f755d209793892a21ce40f6bdd07 /Library/Homebrew/test/os/mac | |
| parent | 0457f0d3e2186991c16e2136b12a5ecc034d99da (diff) | |
| download | brew-a5549023804a8cef50f71dc2d7a723be8e83f3d1.tar.bz2 | |
Add `mktmpdir` helper method.
Diffstat (limited to 'Library/Homebrew/test/os/mac')
| -rw-r--r-- | Library/Homebrew/test/os/mac/java_requirement_spec.rb | 17 | 
1 files changed, 7 insertions, 10 deletions
diff --git a/Library/Homebrew/test/os/mac/java_requirement_spec.rb b/Library/Homebrew/test/os/mac/java_requirement_spec.rb index f6404db92..1b46fe6b6 100644 --- a/Library/Homebrew/test/os/mac/java_requirement_spec.rb +++ b/Library/Homebrew/test/os/mac/java_requirement_spec.rb @@ -3,32 +3,29 @@ require "fileutils"  describe JavaRequirement do    subject { described_class.new(%w[1.8]) } -  let(:java_home) { Dir.mktmpdir } -  let(:java_home_path) { Pathname.new(java_home) } +  let(:java_home) { mktmpdir }    before(:each) do -    FileUtils.mkdir java_home_path/"bin" -    FileUtils.touch java_home_path/"bin/java" -    allow(subject).to receive(:preferred_java).and_return(java_home_path/"bin/java") +    FileUtils.mkdir java_home/"bin" +    FileUtils.touch java_home/"bin/java" +    allow(subject).to receive(:preferred_java).and_return(java_home/"bin/java")      expect(subject).to be_satisfied    end -  after(:each) { java_home_path.rmtree } -    specify "Apple Java environment" do      expect(ENV).to receive(:prepend_path)      expect(ENV).to receive(:append_to_cflags)      subject.modify_build_environment -    expect(ENV["JAVA_HOME"]).to eq(java_home) +    expect(ENV["JAVA_HOME"]).to eq(java_home.to_s)    end    specify "Oracle Java environment" do -    FileUtils.mkdir java_home_path/"include" +    FileUtils.mkdir java_home/"include"      expect(ENV).to receive(:prepend_path)      expect(ENV).to receive(:append_to_cflags).twice      subject.modify_build_environment -    expect(ENV["JAVA_HOME"]).to eq(java_home) +    expect(ENV["JAVA_HOME"]).to eq(java_home.to_s)    end  end  | 
