| @@ -0,0 +1,6 | |||||
|
|
1 | <% if @issue %> | |||
|
|
2 | Element.update('related-issues', '<%= escape_javascript(render :partial => "related_issues") %>'); | |||
|
|
3 | Effect.highlight('related-issue-<%= @issue.id %>'); | |||
|
|
4 | <% else %> | |||
|
|
5 | alert("<%= escape_javascript(l(:label_issue) + ' ' + l('activerecord.errors.messages.invalid')) %>"); | |||
|
|
6 | <% end %> | |||
| @@ -0,0 +1,1 | |||||
|
|
1 | Element.remove('related-issue-<%= @issue.id %>'); | |||
| @@ -236,22 +236,6 class RepositoriesController < ApplicationController | |||||
| 236 |
|
236 | |||
| 237 | if @issue |
|
237 | if @issue | |
| 238 | @changeset.issues << @issue |
|
238 | @changeset.issues << @issue | |
| 239 | respond_to do |format| |
|
|||
| 240 | format.js { |
|
|||
| 241 | render :update do |page| |
|
|||
| 242 | page.replace_html "related-issues", :partial => "related_issues" |
|
|||
| 243 | page.visual_effect :highlight, "related-issue-#{@issue.id}" |
|
|||
| 244 | end |
|
|||
| 245 | } |
|
|||
| 246 | end |
|
|||
| 247 | else |
|
|||
| 248 | respond_to do |format| |
|
|||
| 249 | format.js { |
|
|||
| 250 | render :update do |page| |
|
|||
| 251 | page.alert(l(:label_issue) + ' ' + l('activerecord.errors.messages.invalid')) |
|
|||
| 252 | end |
|
|||
| 253 | } |
|
|||
| 254 | end |
|
|||
| 255 | end |
|
239 | end | |
| 256 | end |
|
240 | end | |
| 257 |
|
241 | |||
| @@ -262,14 +246,6 class RepositoriesController < ApplicationController | |||||
| 262 | if @issue |
|
246 | if @issue | |
| 263 | @changeset.issues.delete(@issue) |
|
247 | @changeset.issues.delete(@issue) | |
| 264 | end |
|
248 | end | |
| 265 |
|
||||
| 266 | respond_to do |format| |
|
|||
| 267 | format.js { |
|
|||
| 268 | render :update do |page| |
|
|||
| 269 | page.remove "related-issue-#{@issue.id}" |
|
|||
| 270 | end if @issue |
|
|||
| 271 | } |
|
|||
| 272 | end |
|
|||
| 273 | end |
|
249 | end | |
| 274 |
|
250 | |||
| 275 | def diff |
|
251 | def diff | |
| @@ -456,4 +432,3 class RepositoriesController < ApplicationController | |||||
| 456 | graph.burn |
|
432 | graph.burn | |
| 457 | end |
|
433 | end | |
| 458 | end |
|
434 | end | |
| 459 |
|
||||
| @@ -171,20 +171,25 class RepositoriesControllerTest < ActionController::TestCase | |||||
| 171 | def test_add_related_issue |
|
171 | def test_add_related_issue | |
| 172 | @request.session[:user_id] = 2 |
|
172 | @request.session[:user_id] = 2 | |
| 173 | assert_difference 'Changeset.find(103).issues.size' do |
|
173 | assert_difference 'Changeset.find(103).issues.size' do | |
| 174 | post :add_related_issue, :id => 1, :rev => 4, :issue_id => 2, :format => 'js' |
|
174 | xhr :post, :add_related_issue, :id => 1, :rev => 4, :issue_id => 2, :format => 'js' | |
| 175 | assert_response :success |
|
175 | assert_response :success | |
|
|
176 | assert_template 'add_related_issue' | |||
|
|
177 | assert_equal 'text/javascript', response.content_type | |||
| 176 | end |
|
178 | end | |
| 177 | assert_select_rjs :replace_html, 'related-issues' |
|
|||
| 178 | assert_equal [2], Changeset.find(103).issue_ids |
|
179 | assert_equal [2], Changeset.find(103).issue_ids | |
|
|
180 | assert_include 'related-issues', response.body | |||
|
|
181 | assert_include 'Feature request #2', response.body | |||
| 179 | end |
|
182 | end | |
| 180 |
|
183 | |||
| 181 | def test_add_related_issue_with_invalid_issue_id |
|
184 | def test_add_related_issue_with_invalid_issue_id | |
| 182 | @request.session[:user_id] = 2 |
|
185 | @request.session[:user_id] = 2 | |
| 183 | assert_no_difference 'Changeset.find(103).issues.size' do |
|
186 | assert_no_difference 'Changeset.find(103).issues.size' do | |
| 184 | post :add_related_issue, :id => 1, :rev => 4, :issue_id => 9999, :format => 'js' |
|
187 | xhr :post, :add_related_issue, :id => 1, :rev => 4, :issue_id => 9999, :format => 'js' | |
| 185 | assert_response :success |
|
188 | assert_response :success | |
|
|
189 | assert_template 'add_related_issue' | |||
|
|
190 | assert_equal 'text/javascript', response.content_type | |||
| 186 | end |
|
191 | end | |
| 187 |
assert_include 'alert("Issue is invalid")', |
|
192 | assert_include 'alert("Issue is invalid")', response.body | |
| 188 | end |
|
193 | end | |
| 189 |
|
194 | |||
| 190 | def test_remove_related_issue |
|
195 | def test_remove_related_issue | |
| @@ -193,11 +198,13 class RepositoriesControllerTest < ActionController::TestCase | |||||
| 193 |
|
198 | |||
| 194 | @request.session[:user_id] = 2 |
|
199 | @request.session[:user_id] = 2 | |
| 195 | assert_difference 'Changeset.find(103).issues.size', -1 do |
|
200 | assert_difference 'Changeset.find(103).issues.size', -1 do | |
| 196 | delete :remove_related_issue, :id => 1, :rev => 4, :issue_id => 2, :format => 'js' |
|
201 | xhr :delete, :remove_related_issue, :id => 1, :rev => 4, :issue_id => 2, :format => 'js' | |
| 197 | assert_response :success |
|
202 | assert_response :success | |
|
|
203 | assert_template 'remove_related_issue' | |||
|
|
204 | assert_equal 'text/javascript', response.content_type | |||
| 198 | end |
|
205 | end | |
| 199 | assert_select_rjs :remove, 'related-issue-2' |
|
|||
| 200 | assert_equal [1], Changeset.find(103).issue_ids |
|
206 | assert_equal [1], Changeset.find(103).issue_ids | |
|
|
207 | assert_include 'related-issue-2', response.body | |||
| 201 | end |
|
208 | end | |
| 202 |
|
209 | |||
| 203 | def test_graph_commits_per_month |
|
210 | def test_graph_commits_per_month | |
General Comments 0
You need to be logged in to leave comments.
Login now