From 16d9775df9392d0b6824783cdb2b8150abe85b1f Mon Sep 17 00:00:00 2001
From: Jerome Reybert <jreybert@gmail.com>
Date: Wed, 3 Oct 2018 23:33:43 +0200
Subject: [PATCH] add test for tild in hunk title and update djooks repo
---
test/addFile/addFile_books_models_py_commit.expect | 2 +-
test/addFile/addFile_books_models_py_file_diff.expect | 2 +-
test/addHunk/addHunk_books_models_py_commit.expect | 2 +-
test/addHunk/addHunk_books_models_py_file_diff.expect | 2 +-
.../addSelect_books_models_py_2_vselect_diff.expect | 2 +-
test/addSelect/addSelect_books_models_py_3_lines_diff.expect | 2 +-
test/addSelect/addSelect_books_models_py_4_marks_diff.expect | 2 +-
.../addSelect_books_models_py_5_vselect_diff.expect | 2 +-
test/commit/commit_commit2.expect | 2 +-
test/commit/commit_diff3.expect | 2 +-
test/run.sh | 5 +++--
test/setup.inc | 2 +-
12 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/test/addFile/addFile_books_models_py_commit.expect b/test/addFile/addFile_books_models_py_commit.expect
index 4c0e199..fab1543 100644
--- a/test/addFile/addFile_books_models_py_commit.expect
+++ b/test/addFile/addFile_books_models_py_commit.expect
@@ -19,7 +19,7 @@ diff --git books/models.py books/models.py
import isbn_search
class User(models.Model):
-@@ -20,20 +24,26 @@ class BookManager(models.Manager):
+@@ -20,20 +24,26 @@ class BookManager(~/models.Manager):
eisbn = product.eisbn,
author = product.author,
title = product.title,
diff --git a/test/addFile/addFile_books_models_py_file_diff.expect b/test/addFile/addFile_books_models_py_file_diff.expect
index 78c9eb6..6e7c564 100644
--- a/test/addFile/addFile_books_models_py_file_diff.expect
+++ b/test/addFile/addFile_books_models_py_file_diff.expect
@@ -11,7 +11,7 @@ diff --git books/models.py books/models.py
import isbn_search
class User(models.Model):
-@@ -20,20 +24,26 @@ class BookManager(models.Manager):
+@@ -20,20 +24,26 @@ class BookManager(~/models.Manager):
eisbn = product.eisbn,
author = product.author,
title = product.title,
diff --git a/test/addHunk/addHunk_books_models_py_commit.expect b/test/addHunk/addHunk_books_models_py_commit.expect
index 4c0e199..fab1543 100644
--- a/test/addHunk/addHunk_books_models_py_commit.expect
+++ b/test/addHunk/addHunk_books_models_py_commit.expect
@@ -19,7 +19,7 @@ diff --git books/models.py books/models.py
import isbn_search
class User(models.Model):
-@@ -20,20 +24,26 @@ class BookManager(models.Manager):
+@@ -20,20 +24,26 @@ class BookManager(~/models.Manager):
eisbn = product.eisbn,
author = product.author,
title = product.title,
diff --git a/test/addHunk/addHunk_books_models_py_file_diff.expect b/test/addHunk/addHunk_books_models_py_file_diff.expect
index 78c9eb6..6e7c564 100644
--- a/test/addHunk/addHunk_books_models_py_file_diff.expect
+++ b/test/addHunk/addHunk_books_models_py_file_diff.expect
@@ -11,7 +11,7 @@ diff --git books/models.py books/models.py
import isbn_search
class User(models.Model):
-@@ -20,20 +24,26 @@ class BookManager(models.Manager):
+@@ -20,20 +24,26 @@ class BookManager(~/models.Manager):
eisbn = product.eisbn,
author = product.author,
title = product.title,
diff --git a/test/addSelect/addSelect_books_models_py_2_vselect_diff.expect b/test/addSelect/addSelect_books_models_py_2_vselect_diff.expect
index 313e368..a4360cb 100644
--- a/test/addSelect/addSelect_books_models_py_2_vselect_diff.expect
+++ b/test/addSelect/addSelect_books_models_py_2_vselect_diff.expect
@@ -11,7 +11,7 @@ diff --git books/models.py books/models.py
import isbn_search
class User(models.Model):
-@@ -22,6 +26,10 @@ class BookManager(models.Manager):
+@@ -22,6 +26,10 @@ class BookManager(~/models.Manager):
title = product.title,
edition = product.edition
)
diff --git a/test/addSelect/addSelect_books_models_py_3_lines_diff.expect b/test/addSelect/addSelect_books_models_py_3_lines_diff.expect
index 0698fb6..cef8123 100644
--- a/test/addSelect/addSelect_books_models_py_3_lines_diff.expect
+++ b/test/addSelect/addSelect_books_models_py_3_lines_diff.expect
@@ -11,7 +11,7 @@ diff --git books/models.py books/models.py
import isbn_search
class User(models.Model):
-@@ -22,11 +26,15 @@ class BookManager(models.Manager):
+@@ -22,11 +26,15 @@ class BookManager(~/models.Manager):
title = product.title,
edition = product.edition
)
diff --git a/test/addSelect/addSelect_books_models_py_4_marks_diff.expect b/test/addSelect/addSelect_books_models_py_4_marks_diff.expect
index e4dfb93..eb34078 100644
--- a/test/addSelect/addSelect_books_models_py_4_marks_diff.expect
+++ b/test/addSelect/addSelect_books_models_py_4_marks_diff.expect
@@ -11,7 +11,7 @@ diff --git books/models.py books/models.py
import isbn_search
class User(models.Model):
-@@ -22,15 +26,22 @@ class BookManager(models.Manager):
+@@ -22,15 +26,22 @@ class BookManager(~/models.Manager):
title = product.title,
edition = product.edition
)
diff --git a/test/addSelect/addSelect_books_models_py_5_vselect_diff.expect b/test/addSelect/addSelect_books_models_py_5_vselect_diff.expect
index a79fdaf..3005386 100644
--- a/test/addSelect/addSelect_books_models_py_5_vselect_diff.expect
+++ b/test/addSelect/addSelect_books_models_py_5_vselect_diff.expect
@@ -11,7 +11,7 @@ diff --git books/models.py books/models.py
import isbn_search
class User(models.Model):
-@@ -24,13 +28,16 @@ class BookManager(models.Manager):
+@@ -24,13 +28,16 @@ class BookManager(~/models.Manager):
)
return book
diff --git a/test/commit/commit_commit2.expect b/test/commit/commit_commit2.expect
index 4c521ef..e8e86e3 100644
--- a/test/commit/commit_commit2.expect
+++ b/test/commit/commit_commit2.expect
@@ -4,7 +4,7 @@ Uber commit message
diff --git books/models.py books/models.py
--- books/models.py
+++ books/models.py
-@@ -24,20 +24,26 @@ class BookManager(models.Manager):
+@@ -24,20 +24,26 @@ class BookManager(~/models.Manager):
eisbn = product.eisbn,
author = product.author,
title = product.title,
diff --git a/test/commit/commit_diff3.expect b/test/commit/commit_diff3.expect
index cdc0a2f..8e47e78 100644
--- a/test/commit/commit_diff3.expect
+++ b/test/commit/commit_diff3.expect
@@ -1,7 +1,7 @@
diff --git books/models.py books/models.py
--- books/models.py
+++ books/models.py
-@@ -24,20 +24,26 @@ class BookManager(models.Manager):
+@@ -24,20 +24,26 @@ class BookManager(~/models.Manager):
eisbn = product.eisbn,
author = product.author,
title = product.title,
diff --git a/test/run.sh b/test/run.sh
index 47bd3d2..dd7cbc9 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -26,10 +26,11 @@ fi
pushd "$TEST_PATH"
git config --local user.email 'tester@vimagit.org'
git config --local user.name 'vimagit tester'
-export TEST_HEAD_SHA1='origin/vimagit_test-1.4.1'
+export TEST_HEAD_SHA1='origin/vimagit_test-1.7.3'
+export TEST_RESET_TAG='reset-here'
git submodule update
git show $TEST_HEAD_SHA1 --stat
-git reset $TEST_HEAD_SHA1~1 && git status --porcelain && git reset --hard $TEST_HEAD_SHA1
+git reset $TEST_RESET_TAG && git status --porcelain && git reset --hard $TEST_HEAD_SHA1
popd
if [ "$VIM_VERSION" = 'neovim' ]; then
diff --git a/test/setup.inc b/test/setup.inc
index bb56adc..4fa8f85 100644
--- a/test/setup.inc
+++ b/test/setup.inc
@@ -1,6 +1,6 @@
Execute (setup):
source $VIMAGIT_PATH/test/utils.vim
call Cd_test()
- call system("git reset " . $TEST_HEAD_SHA1 . "~1")
+ call system("git reset " . $TEST_RESET_TAG )
call Git_verbose_log(system("git status --porcelain"))
call Cd_test_sub()
--
GitLab