Skip to content

Commit

Permalink
test: add fixture for diff=noprefix
Browse files Browse the repository at this point in the history
  • Loading branch information
paulirish committed Mar 4, 2016
1 parent c4c13a1 commit daa480d
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 3 deletions.
6 changes: 3 additions & 3 deletions test/diff-so-fancy.bats
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ if begin"
if not set -q LS_COLORS"
}

@test "diff-highlight is highlighting changes within lines" {
assert_output --partial 'eval [m[1;31;48;5;52m"env CLICOLOR_FORCE=1 command $ls $param [m[1;31m$argv"[m'
assert_output --partial 'eval [m[1;32;48;5;22m$ls $param "[m[1;32m$argv"[m'
@test "diff --git line is removed entirely" {
output=$( load_fixture "noprefix" | $diff_so_fancy )
refute_output --partial "diff --git a/fish/functions/ls.fish"
}
20 changes: 20 additions & 0 deletions test/fixtures/noprefix.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git setup-a-new-machine.sh setup-a-new-machine.sh
index 7b5996c..67eec2a 100755
--- setup-a-new-machine.sh
+++ setup-a-new-machine.sh
@@ -30,6 +30,7 @@ cp -R ~/.gnupg ~/migration/home
cp /Library/Preferences/SystemConfiguration/com.apple.airport.preferences.plist ~/migration # wifi

cp ~/Library/Preferences/net.limechat.LimeChat.plist ~/migration
+cp ~/Library/Preferences/com.tinyspeck.slackmacgap.plist ~/migration

cp -R ~/Library/Services ~/migration # automator stuff

@@ -215,5 +216,7 @@ sh .osx
# symlink it up!
./symlink-setup.sh

+# add manual symlink for .ssh/config and probably .config/fish
+
###
##############################################################################################################

0 comments on commit daa480d

Please sign in to comment.