diff --git a/test/addSubmodule.vader b/test/addSubmodule.vader index 58450fc8b902778307d27c798161bbcfe655702a..3b52b06467d8064bd904c6ae6a7303c5025ef228 100644 --- a/test/addSubmodule.vader +++ b/test/addSubmodule.vader @@ -8,8 +8,8 @@ Execute (Stage untracked directory closed): call Cursor_position() call magit#stage_file() call Cd_test() - let diff=Git_diff('staged') - call Expect_diff(g:test_script_dir . 'addSubmodule/addSubmodule_diff.expect', diff) + let diff=Git_status(Get_filename()) + call Expect_diff(g:test_script_dir . 'addSubmodule/addSubmodule_status.expect', diff) call Git_cmd("git reset") Execute (Stage untracked directory opened): @@ -21,8 +21,8 @@ Execute (Stage untracked directory opened): call Cursor_position() call magit#stage_file() call Cd_test() - let diff=Git_diff('staged') - call Expect_diff(g:test_script_dir . 'addSubmodule/addSubmodule_diff.expect', diff) + let diff=Git_status(Get_filename()) + call Expect_diff(g:test_script_dir . 'addSubmodule/addSubmodule_status.expect', diff) call Git_cmd("git reset") Include: cleanup.inc diff --git a/test/addSubmodule/addSubmodule_diff.expect b/test/addSubmodule/addSubmodule_diff.expect deleted file mode 100644 index 1f38fa5b9a6870317ee91d8e70bc989dea9d4b75..0000000000000000000000000000000000000000 --- a/test/addSubmodule/addSubmodule_diff.expect +++ /dev/null @@ -1,9 +0,0 @@ -Submodule subdjooks a63bc77..6efcd49: - > books/models.py: first cover image support - > books/models.py: create Book entry with an isbn_search - > books/: add isbn_search module - > books/models.py: add BookManager - > migrations - > urls: add books urls in site urls - > views.py: fix typo - > urls: comment unsupported url diff --git a/test/addSubmodule/addSubmodule_status.expect b/test/addSubmodule/addSubmodule_status.expect new file mode 100644 index 0000000000000000000000000000000000000000..99fc911d1bea8d343a7515c702070eef87d17d29 --- /dev/null +++ b/test/addSubmodule/addSubmodule_status.expect @@ -0,0 +1 @@ +M subdjooks diff --git a/test/setup.inc b/test/setup.inc index 3b1816eba81f141b6187fb4451315669e2af382b..bb56adc66e3ac56c8391ef6ac312aec0f73cb4e2 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 --mixed " . $TEST_HEAD_SHA1 . "~1") + call system("git reset " . $TEST_HEAD_SHA1 . "~1") call Git_verbose_log(system("git status --porcelain")) call Cd_test_sub()