| OLD | NEW |
| 1 #!/usr/bin/env bash | 1 #!/usr/bin/env bash |
| 2 | 2 |
| 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
| 6 | 6 |
| 7 set -e | 7 set -e |
| 8 | 8 |
| 9 . ./test-lib.sh | 9 . ./test-lib.sh |
| 10 | 10 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 URL=$($GIT_CL_STATUS | sed -ne '/Issue number/s/[^(]*(\(.*\))/\1/p') | 41 URL=$($GIT_CL_STATUS | sed -ne '/Issue number/s/[^(]*(\(.*\))/\1/p') |
| 42 curl --cookie dev_appserver_login="test@example.com:False" \ | 42 curl --cookie dev_appserver_login="test@example.com:False" \ |
| 43 --data-urlencode subject="test" \ | 43 --data-urlencode subject="test" \ |
| 44 --data-urlencode description="foo-quux" \ | 44 --data-urlencode description="foo-quux" \ |
| 45 --data-urlencode xsrf_token="$(print_xsrf_token)" \ | 45 --data-urlencode xsrf_token="$(print_xsrf_token)" \ |
| 46 $URL/edit | 46 $URL/edit |
| 47 | 47 |
| 48 test_expect_success "git-cl dcommits ok" \ | 48 test_expect_success "git-cl dcommits ok" \ |
| 49 "$GIT_CL dcommit -f --no-oauth2" | 49 "$GIT_CL dcommit -f --no-oauth2" |
| 50 | 50 |
| 51 test_expect_success "branch still has an issue" \ |
| 52 "$GIT_CL_STATUS | grep -q 'Issue number'" |
| 53 |
| 51 git checkout -q master | 54 git checkout -q master |
| 52 git svn -q rebase >/dev/null 2>&1 | 55 git svn -q rebase >/dev/null 2>&1 |
| 53 test_expect_success "dcommitted code has proper description" \ | 56 test_expect_success "dcommitted code has proper description" \ |
| 54 "git show | grep -q 'foo-quux'" | 57 "git show | grep -q 'foo-quux'" |
| 55 | 58 |
| 56 test_expect_success "issue no longer has a branch" \ | |
| 57 "$GIT_CL_STATUS | grep -q 'work : None'" | |
| 58 | |
| 59 test_expect_success "upstream svn has our commit" \ | 59 test_expect_success "upstream svn has our commit" \ |
| 60 "svn log $REPO_URL 2>/dev/null | grep -q 'foo-quux'" | 60 "svn log $REPO_URL 2>/dev/null | grep -q 'foo-quux'" |
| 61 ) | 61 ) |
| 62 SUCCESS=$? | 62 SUCCESS=$? |
| 63 | 63 |
| 64 cleanup | 64 cleanup |
| 65 | 65 |
| 66 if [ $SUCCESS == 0 ]; then | 66 if [ $SUCCESS == 0 ]; then |
| 67 echo PASS | 67 echo PASS |
| 68 fi | 68 fi |
| OLD | NEW |