summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-28 18:11:03 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-28 18:11:03 +0000
commit65524cc1cc638bc9a5e01721425c55ab1a572e90 (patch)
treeb6997d2aef61f45e29b5beaa80d50202b809d563 /test
parent138f6736b2e932872afb6af83940aed8c15ecebc (diff)
downloadredmine-65524cc1cc638bc9a5e01721425c55ab1a572e90.tar.gz
redmine-65524cc1cc638bc9a5e01721425c55ab1a572e90.zip
Don't repeat revision on annotate view.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10105 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test')
-rw-r--r--test/functional/repositories_cvs_controller_test.rb2
-rw-r--r--test/functional/repositories_git_controller_test.rb12
-rw-r--r--test/functional/repositories_mercurial_controller_test.rb10
3 files changed, 12 insertions, 12 deletions
diff --git a/test/functional/repositories_cvs_controller_test.rb b/test/functional/repositories_cvs_controller_test.rb
index e817cc5c6..9a685754e 100644
--- a/test/functional/repositories_cvs_controller_test.rb
+++ b/test/functional/repositories_cvs_controller_test.rb
@@ -220,7 +220,7 @@ class RepositoriesCvsControllerTest < ActionController::TestCase
# 1.1 line
assert_tag :tag => 'th',
:attributes => { :class => 'line-num' },
- :content => '18',
+ :content => '21',
:sibling => {
:tag => 'td',
:attributes => { :class => 'revision' },
diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
index 35f65419e..786238493 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -383,8 +383,8 @@ class RepositoriesGitControllerTest < ActionController::TestCase
:path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
assert_response :success
assert_template 'annotate'
- # Line 24, changeset 2f9c0091
- assert_tag :tag => 'th', :content => '24',
+ # Line 23, changeset 2f9c0091
+ assert_tag :tag => 'th', :content => '23',
:sibling => {
:tag => 'td',
:child => {
@@ -392,9 +392,9 @@ class RepositoriesGitControllerTest < ActionController::TestCase
:content => /2f9c0091/
}
}
- assert_tag :tag => 'th', :content => '24',
+ assert_tag :tag => 'th', :content => '23',
:sibling => { :tag => 'td', :content => /jsmith/ }
- assert_tag :tag => 'th', :content => '24',
+ assert_tag :tag => 'th', :content => '23',
:sibling => {
:tag => 'td',
:child => {
@@ -402,8 +402,8 @@ class RepositoriesGitControllerTest < ActionController::TestCase
:content => /2f9c0091/
}
}
- assert_tag :tag => 'th', :content => '24',
- :sibling => { :tag => 'td', :content => /watcher =/ }
+ assert_tag :tag => 'th', :content => '23',
+ :sibling => { :tag => 'td', :content => /remove_watcher/ }
end
def test_annotate_at_given_revision
diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb
index 78c20e053..42e3f5897 100644
--- a/test/functional/repositories_mercurial_controller_test.rb
+++ b/test/functional/repositories_mercurial_controller_test.rb
@@ -376,9 +376,9 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase
:path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param]
assert_response :success
assert_template 'annotate'
- # Line 23, revision 4:def6d2f1254a
+ # Line 22, revision 4:def6d2f1254a
assert_tag :tag => 'th',
- :content => '23',
+ :content => '22',
:attributes => { :class => 'line-num' },
:sibling =>
{
@@ -387,7 +387,7 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase
:child => { :tag => 'a', :content => '4:def6d2f1254a' }
}
assert_tag :tag => 'th',
- :content => '23',
+ :content => '22',
:attributes => { :class => 'line-num' },
:sibling =>
{
@@ -396,9 +396,9 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase
:attributes => { :class => 'author' },
}
assert_tag :tag => 'th',
- :content => '23',
+ :content => '22',
:attributes => { :class => 'line-num' },
- :sibling => { :tag => 'td', :content => /watcher =/ }
+ :sibling => { :tag => 'td', :content => /remove_watcher/ }
end
def test_annotate_not_in_tip