X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/a02ba4077f12578fe31c99d903488804a656e1c4..2171eff37c64813683355542bd6e5947c7e53bcd:/t/t2200-rebase.sh

diff --git a/t/t2200-rebase.sh b/t/t2200-rebase.sh
index d9b6faf..adbf242 100755
--- a/t/t2200-rebase.sh
+++ b/t/t2200-rebase.sh
@@ -27,36 +27,20 @@ test_expect_success \
 	'Rebase to previous commit' \
 	'
 	stg rebase master~1 &&
-	test `stg id base@stack` = `git rev-parse master~1` &&
-	test `stg applied | wc -l` = 1
+	test `stg id stack:{base}` = `git rev-parse master~1` &&
+	test `stg series --applied -c` = 1
 	'
 
-test_expect_failure \
+test_expect_success \
 	'Attempt rebase to non-existing commit' \
 	'
-	stg rebase not-a-ref
+	command_error stg rebase not-a-ref
 	'
 
 test_expect_success \
 	'Check patches were re-applied' \
 	'
-	test $(stg applied | wc -l) = 1
-	'
-
-test_expect_success \
-	'Rebase to next commit' \
-	'
-	stg rebase master &&
-	test $(stg id base@stack) = $(git rev-parse master)
-	'
-
-test_expect_success \
-	'Commit the patch and rebase again' \
-	'
-	stg commit &&
-	git tag committed-here &&
-	stg rebase master &&
-	test $(stg id base@stack) = $(git rev-parse master)
+	test $(stg series --applied -c) = 1
 	'
 
 test_done