aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2012-03-05 12:35:55 -0600
committerJack Nagel2012-03-05 12:35:55 -0600
commit59400856e3147346fbd18666eced7560473fcd39 (patch)
tree9ed5fe4ff0f5a1033eaf73bf1ba6ed9b5b942bb7 /Library
parented1a674c6256cdeb1089c1b1028199eac9249337 (diff)
downloadhomebrew-59400856e3147346fbd18666eced7560473fcd39.tar.bz2
Adjust updater tests for `git config` calls
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/test/test_updater.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/Library/Homebrew/test/test_updater.rb b/Library/Homebrew/test/test_updater.rb
index 57a3c155d..c8f50f5ef 100644
--- a/Library/Homebrew/test/test_updater.rb
+++ b/Library/Homebrew/test/test_updater.rb
@@ -67,9 +67,11 @@ class UpdaterTests < Test::Unit::TestCase
updater = RefreshBrewMock.new
updater.git_repo = false
updater.in_prefix_expect("git init")
+ updater.in_prefix_expect("git config core.autocrlf false")
updater.in_prefix_expect("git remote add origin #{RefreshBrewMock::REPOSITORY_URL}")
updater.in_prefix_expect("git fetch origin")
updater.in_prefix_expect("git reset --hard origin/master")
+ updater.in_prefix_expect("git config core.autocrlf false")
updater.in_prefix_expect("git pull origin refs/heads/master:refs/remotes/origin/master")
updater.in_prefix_expect("git rev-parse HEAD", "1234abcd")
@@ -87,6 +89,7 @@ class UpdaterTests < Test::Unit::TestCase
updater.in_prefix_expect("git checkout -q master")
updater.in_prefix_expect("git rev-parse HEAD", "1234abcd")
updater.in_prefix_expect("git remote", "origin")
+ updater.in_prefix_expect("git config core.autocrlf false")
updater.in_prefix_expect("git pull origin refs/heads/master:refs/remotes/origin/master")
updater.in_prefix_expect("git rev-parse HEAD", "3456cdef")
updater.in_prefix_expect("git diff-tree -r --name-status -z 1234abcd 3456cdef", "")
@@ -107,6 +110,7 @@ class UpdaterTests < Test::Unit::TestCase
updater.in_prefix_expect("git checkout -q master")
updater.in_prefix_expect("git rev-parse HEAD", "1234abcd")
updater.in_prefix_expect("git remote", "origin")
+ updater.in_prefix_expect("git config core.autocrlf false")
updater.in_prefix_expect("git pull origin refs/heads/master:refs/remotes/origin/master")
updater.in_prefix_expect("git rev-parse HEAD", "3456cdef")
updater.in_prefix_expect("git diff-tree -r --name-status -z 1234abcd 3456cdef", diff_output.gsub(/\s+/, "\0"))
@@ -128,6 +132,7 @@ class UpdaterTests < Test::Unit::TestCase
updater.in_prefix_expect("git checkout -q master")
updater.in_prefix_expect("git rev-parse HEAD", "1234abcd")
updater.in_prefix_expect("git remote", "origin")
+ updater.in_prefix_expect("git config core.autocrlf false")
updater.in_prefix_expect("git pull origin refs/heads/master:refs/remotes/origin/master")
updater.in_prefix_expect("git rev-parse HEAD", "3456cdef")
updater.in_prefix_expect("git diff-tree -r --name-status -z 1234abcd 3456cdef", diff_output.gsub(/\s+/, "\0"))