mirror of
https://github.com/redmine/redmine.git
synced 2025-11-15 09:46:02 +01:00
Fix tests after r23672 (#42545).
git-svn-id: https://svn.redmine.org/redmine/trunk@23675 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -66,16 +66,18 @@ class SearchControllerTest < Redmine::ControllerTest
|
|||||||
assert_response :success
|
assert_response :success
|
||||||
|
|
||||||
assert_select '#search-results' do
|
assert_select '#search-results' do
|
||||||
assert_select 'dt.issue a', :text => /Feature request #2/
|
assert_select 'dt.issue a', :text => /Bug #1/
|
||||||
assert_select 'dt.issue a', :text => /Bug #5/
|
assert_select 'dt.issue a', :text => /Bug #5/
|
||||||
assert_select 'dt.changeset a', :text => /Revision 1/
|
assert_select 'dt.changeset a', :text => /Revision 1/
|
||||||
|
|
||||||
assert_select 'dt.issue a', :text => /Add ingredients categories/
|
assert_select 'dt.issue a', :text => /Cannot print recipes/
|
||||||
assert_select 'dd', :text => /should be classified by categories/
|
assert_select 'dd', :text => /Unable to print/
|
||||||
end
|
end
|
||||||
|
|
||||||
assert_select '#search-results-counts' do
|
assert_select '#search-results-counts' do
|
||||||
assert_select 'a', :text => 'Changesets (5)'
|
assert_select 'a', :text => 'Changesets (6)'
|
||||||
|
assert_select 'a', :text => 'Issues (5)'
|
||||||
|
assert_select 'a', :text => 'Projects (4)'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -479,7 +479,7 @@ class ChangesetTest < ActiveSupport::TestCase
|
|||||||
end
|
end
|
||||||
|
|
||||||
def test_next_nil
|
def test_next_nil
|
||||||
changeset = Changeset.find_by_revision('10')
|
changeset = Changeset.find_by_revision('11')
|
||||||
assert_nil changeset.next
|
assert_nil changeset.next
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -455,7 +455,7 @@ class RepositoryTest < ActiveSupport::TestCase
|
|||||||
def test_stats_by_author_reflect_changesets_and_changes
|
def test_stats_by_author_reflect_changesets_and_changes
|
||||||
repository = Repository.find(10)
|
repository = Repository.find(10)
|
||||||
|
|
||||||
expected = {"Dave Lopper"=>{:commits_count=>10, :changes_count=>3}}
|
expected = {"Dave Lopper"=>{:commits_count=>11, :changes_count=>3}}
|
||||||
assert_equal expected, repository.stats_by_author
|
assert_equal expected, repository.stats_by_author
|
||||||
|
|
||||||
set = Changeset.create!(
|
set = Changeset.create!(
|
||||||
@@ -467,7 +467,7 @@ class RepositoryTest < ActiveSupport::TestCase
|
|||||||
)
|
)
|
||||||
Change.create!(:changeset => set, :action => 'A', :path => '/path/to/file1')
|
Change.create!(:changeset => set, :action => 'A', :path => '/path/to/file1')
|
||||||
Change.create!(:changeset => set, :action => 'A', :path => '/path/to/file2')
|
Change.create!(:changeset => set, :action => 'A', :path => '/path/to/file2')
|
||||||
expected = {"Dave Lopper"=>{:commits_count=>11, :changes_count=>5}}
|
expected = {"Dave Lopper"=>{:commits_count=>12, :changes_count=>5}}
|
||||||
assert_equal expected, repository.stats_by_author
|
assert_equal expected, repository.stats_by_author
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -476,7 +476,7 @@ class RepositoryTest < ActiveSupport::TestCase
|
|||||||
# to ensure things are dynamically linked to Users
|
# to ensure things are dynamically linked to Users
|
||||||
User.find_by_login("dlopper").update_attribute(:firstname, "Dave's")
|
User.find_by_login("dlopper").update_attribute(:firstname, "Dave's")
|
||||||
repository = Repository.find(10)
|
repository = Repository.find(10)
|
||||||
expected = {"Dave's Lopper"=>{:commits_count=>10, :changes_count=>3}}
|
expected = {"Dave's Lopper"=>{:commits_count=>11, :changes_count=>3}}
|
||||||
assert_equal expected, repository.stats_by_author
|
assert_equal expected, repository.stats_by_author
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -502,7 +502,7 @@ class RepositoryTest < ActiveSupport::TestCase
|
|||||||
# with committer="dlopper <dlopper@somefoo.net>"
|
# with committer="dlopper <dlopper@somefoo.net>"
|
||||||
repository = Repository.find(10)
|
repository = Repository.find(10)
|
||||||
|
|
||||||
expected = {"Dave Lopper"=>{:commits_count=>10, :changes_count=>3}}
|
expected = {"Dave Lopper"=>{:commits_count=>11, :changes_count=>3}}
|
||||||
assert_equal expected, repository.stats_by_author
|
assert_equal expected, repository.stats_by_author
|
||||||
|
|
||||||
set = Changeset.create!(
|
set = Changeset.create!(
|
||||||
@@ -513,7 +513,7 @@ class RepositoryTest < ActiveSupport::TestCase
|
|||||||
:comments => 'Another commit by foo.'
|
:comments => 'Another commit by foo.'
|
||||||
)
|
)
|
||||||
|
|
||||||
expected = {"Dave Lopper"=>{:commits_count=>11, :changes_count=>3}}
|
expected = {"Dave Lopper"=>{:commits_count=>12, :changes_count=>3}}
|
||||||
assert_equal expected, repository.stats_by_author
|
assert_equal expected, repository.stats_by_author
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user