@@ -1,16 +1,18 | |||||
1 | <%= back_url_hidden_field_tag %> |
|
1 | <%= back_url_hidden_field_tag %> | |
2 | <%= error_messages_for 'version' %> |
|
2 | <%= error_messages_for 'version' %> | |
3 |
|
3 | |||
4 | <div class="box tabular"> |
|
4 | <div class="box tabular"> | |
5 | <p><%= f.text_field :name, :size => 60, :required => true %></p> |
|
5 | <p><%= f.text_field :name, :size => 60, :required => true %></p> | |
6 | <p><%= f.text_field :description, :size => 60 %></p> |
|
6 | <p><%= f.text_field :description, :size => 60 %></p> | |
7 | <p><%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %></p> |
|
7 | <% unless @version.new_record? %> | |
|
8 | <p><%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %></p> | |||
|
9 | <% end %> | |||
8 | <p><%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %></p> |
|
10 | <p><%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %></p> | |
9 | <p><%= f.date_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %></p> |
|
11 | <p><%= f.date_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %></p> | |
10 | <p><%= f.select :sharing, @version.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %></p> |
|
12 | <p><%= f.select :sharing, @version.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %></p> | |
11 |
|
13 | |||
12 | <% @version.custom_field_values.each do |value| %> |
|
14 | <% @version.custom_field_values.each do |value| %> | |
13 | <p><%= custom_field_tag_with_label :version, value %></p> |
|
15 | <p><%= custom_field_tag_with_label :version, value %></p> | |
14 | <% end %> |
|
16 | <% end %> | |
15 |
|
17 | |||
16 | </div> |
|
18 | </div> |
@@ -1,251 +1,257 | |||||
1 | # Redmine - project management software |
|
1 | # Redmine - project management software | |
2 | # Copyright (C) 2006-2016 Jean-Philippe Lang |
|
2 | # Copyright (C) 2006-2016 Jean-Philippe Lang | |
3 | # |
|
3 | # | |
4 | # This program is free software; you can redistribute it and/or |
|
4 | # This program is free software; you can redistribute it and/or | |
5 | # modify it under the terms of the GNU General Public License |
|
5 | # modify it under the terms of the GNU General Public License | |
6 | # as published by the Free Software Foundation; either version 2 |
|
6 | # as published by the Free Software Foundation; either version 2 | |
7 | # of the License, or (at your option) any later version. |
|
7 | # of the License, or (at your option) any later version. | |
8 | # |
|
8 | # | |
9 | # This program is distributed in the hope that it will be useful, |
|
9 | # This program is distributed in the hope that it will be useful, | |
10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | |
11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
12 | # GNU General Public License for more details. |
|
12 | # GNU General Public License for more details. | |
13 | # |
|
13 | # | |
14 | # You should have received a copy of the GNU General Public License |
|
14 | # You should have received a copy of the GNU General Public License | |
15 | # along with this program; if not, write to the Free Software |
|
15 | # along with this program; if not, write to the Free Software | |
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
17 |
|
17 | |||
18 | require File.expand_path('../../test_helper', __FILE__) |
|
18 | require File.expand_path('../../test_helper', __FILE__) | |
19 |
|
19 | |||
20 | class VersionsControllerTest < Redmine::ControllerTest |
|
20 | class VersionsControllerTest < Redmine::ControllerTest | |
21 | fixtures :projects, :versions, :issues, :users, :roles, :members, |
|
21 | fixtures :projects, :versions, :issues, :users, :roles, :members, | |
22 | :member_roles, :enabled_modules, :issue_statuses, |
|
22 | :member_roles, :enabled_modules, :issue_statuses, | |
23 | :issue_categories, :enumerations |
|
23 | :issue_categories, :enumerations | |
24 |
|
24 | |||
25 | def setup |
|
25 | def setup | |
26 | User.current = nil |
|
26 | User.current = nil | |
27 | end |
|
27 | end | |
28 |
|
28 | |||
29 | def test_index |
|
29 | def test_index | |
30 | get :index, :params => {:project_id => 1} |
|
30 | get :index, :params => {:project_id => 1} | |
31 | assert_response :success |
|
31 | assert_response :success | |
32 |
|
32 | |||
33 | # Version with no date set appears |
|
33 | # Version with no date set appears | |
34 | assert_select 'h3', :text => Version.find(3).name |
|
34 | assert_select 'h3', :text => Version.find(3).name | |
35 | # Completed version doesn't appear |
|
35 | # Completed version doesn't appear | |
36 | assert_select 'h3', :text => Version.find(1).name, :count => 0 |
|
36 | assert_select 'h3', :text => Version.find(1).name, :count => 0 | |
37 |
|
37 | |||
38 | # Context menu on issues |
|
38 | # Context menu on issues | |
39 | assert_select "script", :text => Regexp.new(Regexp.escape("contextMenuInit('/issues/context_menu')")) |
|
39 | assert_select "script", :text => Regexp.new(Regexp.escape("contextMenuInit('/issues/context_menu')")) | |
40 | assert_select "div#sidebar" do |
|
40 | assert_select "div#sidebar" do | |
41 | # Links to versions anchors |
|
41 | # Links to versions anchors | |
42 | assert_select 'a[href=?]', '#2.0' |
|
42 | assert_select 'a[href=?]', '#2.0' | |
43 | # Links to completed versions in the sidebar |
|
43 | # Links to completed versions in the sidebar | |
44 | assert_select 'a[href=?]', '/versions/1' |
|
44 | assert_select 'a[href=?]', '/versions/1' | |
45 | end |
|
45 | end | |
46 | end |
|
46 | end | |
47 |
|
47 | |||
48 | def test_index_with_completed_versions |
|
48 | def test_index_with_completed_versions | |
49 | get :index, :params => {:project_id => 1, :completed => 1} |
|
49 | get :index, :params => {:project_id => 1, :completed => 1} | |
50 | assert_response :success |
|
50 | assert_response :success | |
51 |
|
51 | |||
52 | # Version with no date set appears |
|
52 | # Version with no date set appears | |
53 | assert_select 'h3', :text => Version.find(3).name |
|
53 | assert_select 'h3', :text => Version.find(3).name | |
54 | # Completed version appears |
|
54 | # Completed version appears | |
55 | assert_select 'h3', :text => Version.find(1).name |
|
55 | assert_select 'h3', :text => Version.find(1).name | |
56 | end |
|
56 | end | |
57 |
|
57 | |||
58 | def test_index_with_tracker_ids |
|
58 | def test_index_with_tracker_ids | |
59 | (1..3).each do |tracker_id| |
|
59 | (1..3).each do |tracker_id| | |
60 | Issue.generate! :project_id => 1, :fixed_version_id => 3, :tracker_id => tracker_id |
|
60 | Issue.generate! :project_id => 1, :fixed_version_id => 3, :tracker_id => tracker_id | |
61 | end |
|
61 | end | |
62 | get :index, :params => {:project_id => 1, :tracker_ids => [1, 3]} |
|
62 | get :index, :params => {:project_id => 1, :tracker_ids => [1, 3]} | |
63 | assert_response :success |
|
63 | assert_response :success | |
64 | assert_select 'a.issue.tracker-1' |
|
64 | assert_select 'a.issue.tracker-1' | |
65 | assert_select 'a.issue.tracker-2', 0 |
|
65 | assert_select 'a.issue.tracker-2', 0 | |
66 | assert_select 'a.issue.tracker-3' |
|
66 | assert_select 'a.issue.tracker-3' | |
67 | end |
|
67 | end | |
68 |
|
68 | |||
69 | def test_index_showing_subprojects_versions |
|
69 | def test_index_showing_subprojects_versions | |
70 | @subproject_version = Version.create!(:project => Project.find(3), :name => "Subproject version") |
|
70 | @subproject_version = Version.create!(:project => Project.find(3), :name => "Subproject version") | |
71 | get :index, :params => {:project_id => 1, :with_subprojects => 1} |
|
71 | get :index, :params => {:project_id => 1, :with_subprojects => 1} | |
72 | assert_response :success |
|
72 | assert_response :success | |
73 |
|
73 | |||
74 | # Shared version |
|
74 | # Shared version | |
75 | assert_select 'h3', :text => Version.find(4).name |
|
75 | assert_select 'h3', :text => Version.find(4).name | |
76 | # Subproject version |
|
76 | # Subproject version | |
77 | assert_select 'h3', :text => /Subproject version/ |
|
77 | assert_select 'h3', :text => /Subproject version/ | |
78 | end |
|
78 | end | |
79 |
|
79 | |||
80 | def test_index_should_prepend_shared_versions |
|
80 | def test_index_should_prepend_shared_versions | |
81 | get :index, :params => {:project_id => 1} |
|
81 | get :index, :params => {:project_id => 1} | |
82 | assert_response :success |
|
82 | assert_response :success | |
83 |
|
83 | |||
84 | assert_select '#sidebar' do |
|
84 | assert_select '#sidebar' do | |
85 | assert_select 'a[href=?]', '#2.0', :text => '2.0' |
|
85 | assert_select 'a[href=?]', '#2.0', :text => '2.0' | |
86 | assert_select 'a[href=?]', '#subproject1-2.0', :text => 'eCookbook Subproject 1 - 2.0' |
|
86 | assert_select 'a[href=?]', '#subproject1-2.0', :text => 'eCookbook Subproject 1 - 2.0' | |
87 | end |
|
87 | end | |
88 | assert_select '#content' do |
|
88 | assert_select '#content' do | |
89 | assert_select 'a[name=?]', '2.0', :text => '2.0' |
|
89 | assert_select 'a[name=?]', '2.0', :text => '2.0' | |
90 | assert_select 'a[name=?]', 'subproject1-2.0', :text => 'eCookbook Subproject 1 - 2.0' |
|
90 | assert_select 'a[name=?]', 'subproject1-2.0', :text => 'eCookbook Subproject 1 - 2.0' | |
91 | end |
|
91 | end | |
92 | end |
|
92 | end | |
93 |
|
93 | |||
94 | def test_show |
|
94 | def test_show | |
95 | get :show, :params => {:id => 2} |
|
95 | get :show, :params => {:id => 2} | |
96 | assert_response :success |
|
96 | assert_response :success | |
97 |
|
97 | |||
98 | assert_select 'h2', :text => /1.0/ |
|
98 | assert_select 'h2', :text => /1.0/ | |
99 | end |
|
99 | end | |
100 |
|
100 | |||
101 | def test_show_should_link_to_spent_time_on_version |
|
101 | def test_show_should_link_to_spent_time_on_version | |
102 | version = Version.generate! |
|
102 | version = Version.generate! | |
103 | issue = Issue.generate(:fixed_version => version) |
|
103 | issue = Issue.generate(:fixed_version => version) | |
104 | TimeEntry.generate!(:issue => issue, :hours => 7.2) |
|
104 | TimeEntry.generate!(:issue => issue, :hours => 7.2) | |
105 |
|
105 | |||
106 | get :show, :params => {:id => version.id} |
|
106 | get :show, :params => {:id => version.id} | |
107 | assert_response :success |
|
107 | assert_response :success | |
108 |
|
108 | |||
109 | assert_select '.total-hours', :text => '7.20 hours' |
|
109 | assert_select '.total-hours', :text => '7.20 hours' | |
110 | assert_select '.total-hours a[href=?]', "/projects/ecookbook/time_entries?issue.fixed_version_id=#{version.id}&set_filter=1" |
|
110 | assert_select '.total-hours a[href=?]', "/projects/ecookbook/time_entries?issue.fixed_version_id=#{version.id}&set_filter=1" | |
111 | end |
|
111 | end | |
112 |
|
112 | |||
113 | def test_show_should_display_nil_counts |
|
113 | def test_show_should_display_nil_counts | |
114 | with_settings :default_language => 'en' do |
|
114 | with_settings :default_language => 'en' do | |
115 | get :show, :params => {:id => 2, :status_by => 'category'} |
|
115 | get :show, :params => {:id => 2, :status_by => 'category'} | |
116 | assert_response :success |
|
116 | assert_response :success | |
117 | assert_select 'div#status_by' do |
|
117 | assert_select 'div#status_by' do | |
118 | assert_select 'select[name=status_by]' do |
|
118 | assert_select 'select[name=status_by]' do | |
119 | assert_select 'option[value=category][selected=selected]' |
|
119 | assert_select 'option[value=category][selected=selected]' | |
120 | end |
|
120 | end | |
121 | assert_select 'a', :text => 'none' |
|
121 | assert_select 'a', :text => 'none' | |
122 | end |
|
122 | end | |
123 | end |
|
123 | end | |
124 | end |
|
124 | end | |
125 |
|
125 | |||
126 | def test_new |
|
126 | def test_new | |
127 | @request.session[:user_id] = 2 |
|
127 | @request.session[:user_id] = 2 | |
128 | get :new, :params => {:project_id => '1'} |
|
128 | get :new, :params => {:project_id => '1'} | |
129 | assert_response :success |
|
129 | assert_response :success | |
130 | assert_select 'input[name=?]', 'version[name]' |
|
130 | assert_select 'input[name=?]', 'version[name]' | |
|
131 | assert_select 'select[name=?]', 'version[status]', false | |||
131 | end |
|
132 | end | |
132 |
|
133 | |||
133 | def test_new_from_issue_form |
|
134 | def test_new_from_issue_form | |
134 | @request.session[:user_id] = 2 |
|
135 | @request.session[:user_id] = 2 | |
135 | xhr :get, :new, :params => {:project_id => '1'} |
|
136 | xhr :get, :new, :params => {:project_id => '1'} | |
136 | assert_response :success |
|
137 | assert_response :success | |
137 | assert_equal 'text/javascript', response.content_type |
|
138 | assert_equal 'text/javascript', response.content_type | |
138 | end |
|
139 | end | |
139 |
|
140 | |||
140 | def test_create |
|
141 | def test_create | |
141 | @request.session[:user_id] = 2 # manager |
|
142 | @request.session[:user_id] = 2 # manager | |
142 | assert_difference 'Version.count' do |
|
143 | assert_difference 'Version.count' do | |
143 | post :create, :params => {:project_id => '1', :version => {:name => 'test_add_version'}} |
|
144 | post :create, :params => {:project_id => '1', :version => {:name => 'test_add_version'}} | |
144 | end |
|
145 | end | |
145 | assert_redirected_to '/projects/ecookbook/settings/versions' |
|
146 | assert_redirected_to '/projects/ecookbook/settings/versions' | |
146 | version = Version.find_by_name('test_add_version') |
|
147 | version = Version.find_by_name('test_add_version') | |
147 | assert_not_nil version |
|
148 | assert_not_nil version | |
148 | assert_equal 1, version.project_id |
|
149 | assert_equal 1, version.project_id | |
149 | end |
|
150 | end | |
150 |
|
151 | |||
151 | def test_create_from_issue_form |
|
152 | def test_create_from_issue_form | |
152 | @request.session[:user_id] = 2 |
|
153 | @request.session[:user_id] = 2 | |
153 | assert_difference 'Version.count' do |
|
154 | assert_difference 'Version.count' do | |
154 | xhr :post, :create, :params => {:project_id => '1', :version => {:name => 'test_add_version_from_issue_form'}} |
|
155 | xhr :post, :create, :params => {:project_id => '1', :version => {:name => 'test_add_version_from_issue_form'}} | |
155 | end |
|
156 | end | |
156 | version = Version.find_by_name('test_add_version_from_issue_form') |
|
157 | version = Version.find_by_name('test_add_version_from_issue_form') | |
157 | assert_not_nil version |
|
158 | assert_not_nil version | |
158 | assert_equal 1, version.project_id |
|
159 | assert_equal 1, version.project_id | |
159 |
|
160 | |||
160 | assert_response :success |
|
161 | assert_response :success | |
161 | assert_equal 'text/javascript', response.content_type |
|
162 | assert_equal 'text/javascript', response.content_type | |
162 | assert_include 'test_add_version_from_issue_form', response.body |
|
163 | assert_include 'test_add_version_from_issue_form', response.body | |
163 | end |
|
164 | end | |
164 |
|
165 | |||
165 | def test_create_from_issue_form_with_failure |
|
166 | def test_create_from_issue_form_with_failure | |
166 | @request.session[:user_id] = 2 |
|
167 | @request.session[:user_id] = 2 | |
167 | assert_no_difference 'Version.count' do |
|
168 | assert_no_difference 'Version.count' do | |
168 | xhr :post, :create, :params => {:project_id => '1', :version => {:name => ''}} |
|
169 | xhr :post, :create, :params => {:project_id => '1', :version => {:name => ''}} | |
169 | end |
|
170 | end | |
170 | assert_response :success |
|
171 | assert_response :success | |
171 | assert_equal 'text/javascript', response.content_type |
|
172 | assert_equal 'text/javascript', response.content_type | |
172 | end |
|
173 | end | |
173 |
|
174 | |||
174 | def test_get_edit |
|
175 | def test_get_edit | |
175 | @request.session[:user_id] = 2 |
|
176 | @request.session[:user_id] = 2 | |
176 | get :edit, :params => {:id => 2} |
|
177 | get :edit, :params => {:id => 2} | |
177 | assert_response :success |
|
178 | assert_response :success | |
178 | assert_select 'input[name=?][value=?]', 'version[name]', Version.find(2).name |
|
179 | version = Version.find(2) | |
|
180 | ||||
|
181 | assert_select 'select[name=?]', 'version[status]' do | |||
|
182 | assert_select 'option[value=?][selected="selected"]', version.status | |||
|
183 | end | |||
|
184 | assert_select 'input[name=?][value=?]', 'version[name]', version.name | |||
179 | end |
|
185 | end | |
180 |
|
186 | |||
181 | def test_close_completed |
|
187 | def test_close_completed | |
182 | Version.update_all("status = 'open'") |
|
188 | Version.update_all("status = 'open'") | |
183 | @request.session[:user_id] = 2 |
|
189 | @request.session[:user_id] = 2 | |
184 | put :close_completed, :params => {:project_id => 'ecookbook'} |
|
190 | put :close_completed, :params => {:project_id => 'ecookbook'} | |
185 | assert_redirected_to :controller => 'projects', :action => 'settings', |
|
191 | assert_redirected_to :controller => 'projects', :action => 'settings', | |
186 | :tab => 'versions', :id => 'ecookbook' |
|
192 | :tab => 'versions', :id => 'ecookbook' | |
187 | assert_not_nil Version.find_by_status('closed') |
|
193 | assert_not_nil Version.find_by_status('closed') | |
188 | end |
|
194 | end | |
189 |
|
195 | |||
190 | def test_post_update |
|
196 | def test_post_update | |
191 | @request.session[:user_id] = 2 |
|
197 | @request.session[:user_id] = 2 | |
192 | put :update, :params => { |
|
198 | put :update, :params => { | |
193 |
:id => 2, |
|
199 | :id => 2, | |
194 | :version => { |
|
200 | :version => { | |
195 | :name => 'New version name', |
|
201 | :name => 'New version name', | |
196 | :effective_date => Date.today.strftime("%Y-%m-%d") |
|
202 | :effective_date => Date.today.strftime("%Y-%m-%d") | |
197 | } |
|
203 | } | |
198 | } |
|
204 | } | |
199 | assert_redirected_to :controller => 'projects', :action => 'settings', |
|
205 | assert_redirected_to :controller => 'projects', :action => 'settings', | |
200 | :tab => 'versions', :id => 'ecookbook' |
|
206 | :tab => 'versions', :id => 'ecookbook' | |
201 | version = Version.find(2) |
|
207 | version = Version.find(2) | |
202 | assert_equal 'New version name', version.name |
|
208 | assert_equal 'New version name', version.name | |
203 | assert_equal Date.today, version.effective_date |
|
209 | assert_equal Date.today, version.effective_date | |
204 | end |
|
210 | end | |
205 |
|
211 | |||
206 | def test_post_update_with_validation_failure |
|
212 | def test_post_update_with_validation_failure | |
207 | @request.session[:user_id] = 2 |
|
213 | @request.session[:user_id] = 2 | |
208 | put :update, :params => { |
|
214 | put :update, :params => { | |
209 | :id => 2, |
|
215 | :id => 2, | |
210 | :version => { |
|
216 | :version => { | |
211 | :name => '', |
|
217 | :name => '', | |
212 | :effective_date => Date.today.strftime("%Y-%m-%d") |
|
218 | :effective_date => Date.today.strftime("%Y-%m-%d") | |
213 | } |
|
219 | } | |
214 | } |
|
220 | } | |
215 | assert_response :success |
|
221 | assert_response :success | |
216 | assert_select_error /Name cannot be blank/ |
|
222 | assert_select_error /Name cannot be blank/ | |
217 | end |
|
223 | end | |
218 |
|
224 | |||
219 | def test_destroy |
|
225 | def test_destroy | |
220 | @request.session[:user_id] = 2 |
|
226 | @request.session[:user_id] = 2 | |
221 | assert_difference 'Version.count', -1 do |
|
227 | assert_difference 'Version.count', -1 do | |
222 | delete :destroy, :params => {:id => 3} |
|
228 | delete :destroy, :params => {:id => 3} | |
223 | end |
|
229 | end | |
224 | assert_redirected_to :controller => 'projects', :action => 'settings', |
|
230 | assert_redirected_to :controller => 'projects', :action => 'settings', | |
225 | :tab => 'versions', :id => 'ecookbook' |
|
231 | :tab => 'versions', :id => 'ecookbook' | |
226 | assert_nil Version.find_by_id(3) |
|
232 | assert_nil Version.find_by_id(3) | |
227 | end |
|
233 | end | |
228 |
|
234 | |||
229 | def test_destroy_version_in_use_should_fail |
|
235 | def test_destroy_version_in_use_should_fail | |
230 | @request.session[:user_id] = 2 |
|
236 | @request.session[:user_id] = 2 | |
231 | assert_no_difference 'Version.count' do |
|
237 | assert_no_difference 'Version.count' do | |
232 | delete :destroy, :params => {:id => 2} |
|
238 | delete :destroy, :params => {:id => 2} | |
233 | end |
|
239 | end | |
234 | assert_redirected_to :controller => 'projects', :action => 'settings', |
|
240 | assert_redirected_to :controller => 'projects', :action => 'settings', | |
235 | :tab => 'versions', :id => 'ecookbook' |
|
241 | :tab => 'versions', :id => 'ecookbook' | |
236 | assert flash[:error].match(/Unable to delete version/) |
|
242 | assert flash[:error].match(/Unable to delete version/) | |
237 | assert Version.find_by_id(2) |
|
243 | assert Version.find_by_id(2) | |
238 | end |
|
244 | end | |
239 |
|
245 | |||
240 | def test_issue_status_by |
|
246 | def test_issue_status_by | |
241 | xhr :get, :status_by, :params => {:id => 2} |
|
247 | xhr :get, :status_by, :params => {:id => 2} | |
242 | assert_response :success |
|
248 | assert_response :success | |
243 | end |
|
249 | end | |
244 |
|
250 | |||
245 | def test_issue_status_by_status |
|
251 | def test_issue_status_by_status | |
246 | xhr :get, :status_by, :params => {:id => 2, :status_by => 'status'} |
|
252 | xhr :get, :status_by, :params => {:id => 2, :status_by => 'status'} | |
247 | assert_response :success |
|
253 | assert_response :success | |
248 | assert_include 'Assigned', response.body |
|
254 | assert_include 'Assigned', response.body | |
249 | assert_include 'Closed', response.body |
|
255 | assert_include 'Closed', response.body | |
250 | end |
|
256 | end | |
251 | end |
|
257 | end |
General Comments 0
You need to be logged in to leave comments.
Login now