From 19a0aa51a1e8e5df95f9b802b165ea9ffce9cf27 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Mon, 5 Mar 2012 12:35:55 -0600 Subject: [PATCH] Adjust updater tests for `git config` calls Signed-off-by: Jack Nagel --- Library/Homebrew/test/test_updater.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Library/Homebrew/test/test_updater.rb b/Library/Homebrew/test/test_updater.rb index 57a3c155d6..c8f50f5eff 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"))