| OLD | NEW |
| 1 #!/bin/bash | 1 #!/bin/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 |
| 11 setup_initgit | 11 setup_initgit |
| 12 setup_gitgit | 12 setup_gitgit |
| 13 | 13 |
| 14 ( | 14 ( |
| 15 set -e | 15 set -e |
| 16 cd git-git | 16 cd git-git |
| 17 git checkout -q --track -b work origin | 17 git checkout -q --track -b work origin |
| 18 echo "some work done on a branch" >> test | 18 echo "some work done on a branch" >> test |
| 19 git add test; git commit -q -m "branch work" | 19 git add test; git commit -q -m "branch work" |
| 20 echo "some other work done on a branch" >> test | 20 echo "some other work done on a branch" >> test |
| 21 git add test; git commit -q -m "branch work" | 21 git add test; git commit -q -m "branch work" |
| 22 | 22 |
| 23 test_expect_success "git-cl upload wants a server" \ | 23 test_expect_success "git-cl upload wants a server" \ |
| 24 "$GIT_CL upload 2>&1 | grep -q 'You must configure'" | 24 "$GIT_CL upload 2>&1 | grep -q 'You must configure'" |
| 25 | 25 |
| 26 git config rietveld.server localhost:8080 | 26 git config rietveld.server localhost:8080 |
| 27 | 27 |
| 28 test_expect_success "git-cl status has no issue" \ | 28 test_expect_success "git-cl status has no issue" \ |
| 29 "$GIT_CL status | grep -q 'no issue'" | 29 "$GIT_CL_STATUS | grep -q 'no issue'" |
| 30 | 30 |
| 31 # Prevent the editor from coming up when you upload. | 31 # Prevent the editor from coming up when you upload. |
| 32 export GIT_EDITOR=$(which true) | 32 export GIT_EDITOR=$(which true) |
| 33 test_expect_success "upload succeeds (needs a server running on localhost)" \ | 33 test_expect_success "upload succeeds (needs a server running on localhost)" \ |
| 34 "$GIT_CL upload -m test master | grep -q 'Issue created'" | 34 "$GIT_CL upload -m test master | grep -q 'Issue created'" |
| 35 | 35 |
| 36 test_expect_success "git-cl status now knows the issue" \ | 36 test_expect_success "git-cl status now knows the issue" \ |
| 37 "$GIT_CL status | grep -q 'Issue number'" | 37 "$GIT_CL_STATUS | grep -q 'Issue number'" |
| 38 | 38 |
| 39 # Push a description to this URL. | 39 # Push a description to this URL. |
| 40 URL=$($GIT_CL status | sed -ne '/Issue number/s/[^(]*(\(.*\))/\1/p') | 40 URL=$($GIT_CL_STATUS | sed -ne '/Issue number/s/[^(]*(\(.*\))/\1/p') |
| 41 curl --cookie dev_appserver_login="test@example.com:False" \ | 41 curl --cookie dev_appserver_login="test@example.com:False" \ |
| 42 --data-urlencode subject="test" \ | 42 --data-urlencode subject="test" \ |
| 43 --data-urlencode description="foo-quux" \ | 43 --data-urlencode description="foo-quux" \ |
| 44 --data-urlencode xsrf_token="$(print_xsrf_token)" \ | 44 --data-urlencode xsrf_token="$(print_xsrf_token)" \ |
| 45 $URL/edit | 45 $URL/edit |
| 46 | 46 |
| 47 test_expect_success "Base URL contains branch name" \ | 47 test_expect_success "Base URL contains branch name" \ |
| 48 "curl -s $($GIT_CL status --field=url) | grep 'URL:' | grep -q '@master'" | 48 "curl -s $($GIT_CL_STATUS --field=url) | grep 'URL:' | grep -q '@master'" |
| 49 | 49 |
| 50 test_expect_success "git-cl push ok" \ | 50 test_expect_success "git-cl push ok" \ |
| 51 "$GIT_CL push -f" | 51 "$GIT_CL push -f" |
| 52 | 52 |
| 53 git checkout -q master > /dev/null 2>&1 | 53 git checkout -q master > /dev/null 2>&1 |
| 54 git pull -q > /dev/null 2>&1 | 54 git pull -q > /dev/null 2>&1 |
| 55 | 55 |
| 56 test_expect_success "committed code has proper description" \ | 56 test_expect_success "committed code has proper description" \ |
| 57 "git show | grep -q 'foo-quux'" | 57 "git show | grep -q 'foo-quux'" |
| 58 | 58 |
| 59 test_expect_success "issue no longer has a branch" \ | 59 test_expect_success "issue no longer has a branch" \ |
| 60 "$GIT_CL status | grep -q 'work: None'" | 60 "$GIT_CL_STATUS | grep -q 'work: None'" |
| 61 | 61 |
| 62 cd $GITREPO_PATH | 62 cd $GITREPO_PATH |
| 63 test_expect_success "upstream repo has our commit" \ | 63 test_expect_success "upstream repo has our commit" \ |
| 64 "git log master 2>/dev/null | grep -q 'foo-quux'" | 64 "git log master 2>/dev/null | grep -q 'foo-quux'" |
| 65 ) | 65 ) |
| 66 SUCCESS=$? | 66 SUCCESS=$? |
| 67 | 67 |
| 68 cleanup | 68 cleanup |
| 69 | 69 |
| 70 if [ $SUCCESS == 0 ]; then | 70 if [ $SUCCESS == 0 ]; then |
| 71 echo PASS | 71 echo PASS |
| 72 fi | 72 fi |
| OLD | NEW |