Skip to content

Commit 7d22a40

Browse files
committed
Merge branch 'fix-ci'
2 parents 6dcf01a + c5f0ad0 commit 7d22a40

File tree

3 files changed

+20
-9
lines changed

3 files changed

+20
-9
lines changed

tests/do-link.bats

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,15 @@ load 'util/init.sh'
9292

9393
test_util.create_pkg_dir "$dir"
9494

95-
run do-link "$(util.readlink "$BPM_ORIGIN_DIR/$dir")"
95+
# On macOS, the temporary folder '/var' is symlinked to '/private/var'
96+
# Since BATS appears to be using '/var' directly, we have to resolve the
97+
# symlink so the output matches properly
98+
local srcDir="$(util.readlink "$BPM_ORIGIN_DIR/$dir")"
99+
100+
run do-link "$srcDir"
96101

97102
assert_success
98-
assert_line -n 0 -p "Linking '$BPM_ORIGIN_DIR/$dir'"
103+
assert_line -n 0 -p "Linking '$srcDir'"
99104
assert_line -n 1 "do-plumbing-add-deps local/$dir"
100105
assert_line -n 2 "do-plumbing-link-bins local/$dir"
101106
assert_line -n 3 "do-plumbing-link-completions local/$dir"
@@ -115,15 +120,18 @@ load 'util/init.sh'
115120
test_util.create_pkg_dir "$dir1"
116121
test_util.create_pkg_dir "$dir2"
117122

118-
run do-link "$(util.readlink "$BPM_ORIGIN_DIR/$dir1")" "$(util.readlink "$BPM_ORIGIN_DIR/$dir2")"
123+
local srcDir1="$(util.readlink "$BPM_ORIGIN_DIR/$dir1")"
124+
local srcDir2="$(util.readlink "$BPM_ORIGIN_DIR/$dir2")"
125+
126+
run do-link "$srcDir1" "$srcDir2"
119127

120128
assert_success
121-
assert_line -n 0 -p "Linking '$BPM_ORIGIN_DIR/$dir1'"
129+
assert_line -n 0 -p "Linking '$srcDir1'"
122130
assert_line -n 1 "do-plumbing-add-deps local/$dir1"
123131
assert_line -n 2 "do-plumbing-link-bins local/$dir1"
124132
assert_line -n 3 "do-plumbing-link-completions local/$dir1"
125133
assert_line -n 4 "do-plumbing-link-man local/$dir1"
126-
assert_line -n 5 -p "Linking '$BPM_ORIGIN_DIR/$dir2'"
134+
assert_line -n 5 -p "Linking '$srcDir2'"
127135
assert_line -n 6 "do-plumbing-add-deps local/$dir2"
128136
assert_line -n 7 "do-plumbing-link-bins local/$dir2"
129137
assert_line -n 8 "do-plumbing-link-completions local/$dir2"
@@ -141,10 +149,13 @@ load 'util/init.sh'
141149

142150
test_util.create_pkg_dir "$dir"
143151

144-
run do-link --no-deps "$BPM_ORIGIN_DIR/$dir"
152+
153+
local srcDir="$(util.readlink "$BPM_ORIGIN_DIR/$dir")"
154+
155+
run do-link --no-deps "$srcDir"
145156

146157
assert_success
147-
assert_line -n 0 -p "Linking '$BPM_ORIGIN_DIR/$dir'"
158+
assert_line -n 0 -p "Linking '$srcDir'"
148159
assert_line -n 1 "do-plumbing-link-bins local/$dir"
149160
assert_line -n 2 "do-plumbing-link-completions local/$dir"
150161
assert_line -n 3 "do-plumbing-link-man local/$dir"

tests/do-plumbing-link-bins.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,5 +383,5 @@ load 'util/init.sh'
383383
do-plumbing-link-bins "$site/$pkg1"
384384
run do-plumbing-link-bins "$site/$pkg2"
385385

386-
assert_line -p "Skipping 'file.sh' since an existing symlink with the same name already exists"
386+
assert_line -p "Skipping 'file2.bash' since an existing symlink with the same name already exists"
387387
}

tests/util/test_util.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ test_util.setup_pkg() {
5959
git init .
6060
touch 'README.md'
6161
git add .
62-
git branch -M master
6362
git commit -m "Initial commit"
63+
git branch -M master
6464
}
6565

6666
# @description Commits changes and cd's out of the package directory

0 commit comments

Comments
 (0)