| @@ -240,7 +240,7 module ApplicationHelper | |||||
| 240 | end |
|
240 | end | |
| 241 |
|
241 | |||
| 242 | def format_version_name(version) |
|
242 | def format_version_name(version) | |
| 243 |
if |
|
243 | if version.project == @project | |
| 244 | h(version) |
|
244 | h(version) | |
| 245 | else |
|
245 | else | |
| 246 | h("#{version.project} - #{version}") |
|
246 | h("#{version.project} - #{version}") | |
| @@ -849,7 +849,7 class IssuesControllerTest < ActionController::TestCase | |||||
| 849 | def test_index_with_fixed_version_column |
|
849 | def test_index_with_fixed_version_column | |
| 850 | get :index, :set_filter => 1, :c => %w(fixed_version) |
|
850 | get :index, :set_filter => 1, :c => %w(fixed_version) | |
| 851 | assert_select 'table.issues td.fixed_version' do |
|
851 | assert_select 'table.issues td.fixed_version' do | |
| 852 | assert_select 'a[href=?]', '/versions/2', :text => '1.0' |
|
852 | assert_select 'a[href=?]', '/versions/2', :text => 'eCookbook - 1.0' | |
| 853 | end |
|
853 | end | |
| 854 | end |
|
854 | end | |
| 855 |
|
855 | |||
| @@ -47,18 +47,18 class ProjectsHelperTest < ActionView::TestCase | |||||
| 47 |
|
47 | |||
| 48 | def test_link_to_version |
|
48 | def test_link_to_version | |
| 49 | User.current = User.find(1) |
|
49 | User.current = User.find(1) | |
| 50 | assert_equal '<a title="07/01/2006" href="/versions/5">Alpha</a>', link_to_version(Version.find(5)) |
|
50 | assert_equal '<a title="07/01/2006" href="/versions/5">OnlineStore - Alpha</a>', link_to_version(Version.find(5)) | |
| 51 | end |
|
51 | end | |
| 52 |
|
52 | |||
| 53 | def test_link_to_version_without_effective_date |
|
53 | def test_link_to_version_without_effective_date | |
| 54 | User.current = User.find(1) |
|
54 | User.current = User.find(1) | |
| 55 | version = Version.find(5) |
|
55 | version = Version.find(5) | |
| 56 | version.effective_date = nil |
|
56 | version.effective_date = nil | |
| 57 | assert_equal '<a href="/versions/5">Alpha</a>', link_to_version(version) |
|
57 | assert_equal '<a href="/versions/5">OnlineStore - Alpha</a>', link_to_version(version) | |
| 58 | end |
|
58 | end | |
| 59 |
|
59 | |||
| 60 | def test_link_to_private_version |
|
60 | def test_link_to_private_version | |
| 61 | assert_equal 'Alpha', link_to_version(Version.find(5)) |
|
61 | assert_equal 'OnlineStore - Alpha', link_to_version(Version.find(5)) | |
| 62 | end |
|
62 | end | |
| 63 |
|
63 | |||
| 64 | def test_link_to_version_invalid_version |
|
64 | def test_link_to_version_invalid_version | |
| @@ -71,20 +71,11 class ProjectsHelperTest < ActionView::TestCase | |||||
| 71 | end |
|
71 | end | |
| 72 |
|
72 | |||
| 73 | def test_format_version_name |
|
73 | def test_format_version_name | |
| 74 | assert_equal "0.1", format_version_name(Version.find(1)) |
|
74 | assert_equal "eCookbook - 0.1", format_version_name(Version.find(1)) | |
| 75 | end |
|
|||
| 76 |
|
||||
| 77 | def test_format_version_name_for_shared_version_within_project_should_not_display_project_name |
|
|||
| 78 | @project = Project.find(1) |
|
|||
| 79 | version = Version.find(1) |
|
|||
| 80 | version.sharing = 'system' |
|
|||
| 81 | assert_equal "0.1", format_version_name(version) |
|
|||
| 82 | end |
|
75 | end | |
| 83 |
|
76 | |||
| 84 |
def test_format_version_name_for_s |
|
77 | def test_format_version_name_for_system_version | |
| 85 | version = Version.find(1) |
|
78 | assert_equal "OnlineStore - Systemwide visible version", format_version_name(Version.find(7)) | |
| 86 | version.sharing = 'system' |
|
|||
| 87 | assert_equal "eCookbook - 0.1", format_version_name(version) |
|
|||
| 88 | end |
|
79 | end | |
| 89 |
|
80 | |||
| 90 | def test_version_options_for_select_with_no_versions |
|
81 | def test_version_options_for_select_with_no_versions | |
General Comments 0
You need to be logged in to leave comments.
Login now