Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
brew
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to JiHu GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
KMSCAKKSCFKA AKFACAMADCAS
brew
Commits
a1fbb102
Commit
a1fbb102
authored
8 years ago
by
Markus Reiter
Browse files
Options
Downloads
Patches
Plain Diff
Simplify Cask `spec_helper`.
parent
370c711d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Library/Homebrew/cask/lib/hbc/locations.rb
+4
-4
4 additions, 4 deletions
Library/Homebrew/cask/lib/hbc/locations.rb
Library/Homebrew/cask/spec/spec_helper.rb
+1
-4
1 addition, 4 deletions
Library/Homebrew/cask/spec/spec_helper.rb
with
5 additions
and
8 deletions
Library/Homebrew/cask/lib/hbc/locations.rb
+
4
−
4
View file @
a1fbb102
...
...
@@ -15,6 +15,8 @@ module Hbc
@default_caskroom
||=
HOMEBREW_PREFIX
.
join
(
"Caskroom"
)
end
attr_writer
:caskroom
def
caskroom
@caskroom
||=
begin
if
Utils
.
path_occupied?
(
legacy_caskroom
)
...
...
@@ -36,14 +38,12 @@ module Hbc
end
end
def
caskroom
=
(
caskroom
)
@caskroom
=
caskroom
end
def
legacy_cache
@legacy_cache
||=
HOMEBREW_CACHE
.
join
(
"Casks"
)
end
attr_writer
:cache
def
cache
@cache
||=
HOMEBREW_CACHE
.
join
(
"Cask"
)
end
...
...
This diff is collapsed.
Click to expand it.
Library/Homebrew/cask/spec/spec_helper.rb
+
1
−
4
View file @
a1fbb102
require
"pathname"
require
"rspec/its"
require
"rspec/wait"
...
...
@@ -22,9 +21,6 @@ Pathname.glob(HOMEBREW_LIBRARY_PATH.join("cask", "spec", "support", "**", "*.rb"
require
"hbc"
# create and override default directories
Hbc
.
appdir
=
Pathname
.
new
(
TEST_TMPDIR
).
join
(
"Applications"
).
tap
(
&
:mkpath
)
Hbc
.
cache
.
mkpath
Hbc
.
caskroom
=
Hbc
.
default_caskroom
.
tap
(
&
:mkpath
)
Hbc
.
default_tap
=
Tap
.
fetch
(
"caskroom"
,
"spec"
).
tap
do
|
tap
|
# link test casks
FileUtils
.
mkdir_p
tap
.
path
.
dirname
...
...
@@ -37,6 +33,7 @@ FileUtils.ln_s Pathname.new(ENV["HOMEBREW_LIBRARY"]).join("Taps", "caskroom", "h
HOMEBREW_CASK_DIRS
=
[
:appdir
,
:caskroom
,
:cache
,
:prefpanedir
,
:qlplugindir
,
:servicedir
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment