From: Dmitriy Zaporozhets Date: Mon, 7 Nov 2011 20:31:51 +0000 (+0200) Subject: fixed tests X-Git-Tag: v1.2.0pre~38^2~17^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=67b9fa51dcdf3d5954b83f6f162763349d1e662a;p=wvm%2Fgitlab.git fixed tests --- diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 7ff1ccb3a..508cfc397 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -47,6 +47,7 @@ class IssuesController < ApplicationController def create @issue = @project.issues.new(params[:issue]) @issue.author = current_user + if @issue.save && @issue.assignee != current_user Notify.new_issue_email(@issue).deliver end diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml index 94df0f53a..ebee0bf06 100644 --- a/app/views/issues/_show.html.haml +++ b/app/views/issues/_show.html.haml @@ -24,6 +24,6 @@ - else = link_to 'Resolve', project_issue_path(@project, issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "cgray", :remote => true - if can? current_user, :write_issue, issue - = link_to 'Edit', edit_project_issue_path(@project, issue), :class => "cgray", :remote => true + = link_to 'Edit', edit_project_issue_path(@project, issue), :class => "cgray edit-issue-link", :remote => true - if can?(current_user, :admin_issue, @project) || issue.author == current_user = link_to 'Destroy', [@project, issue], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-issue negative", :id => "destroy_issue_#{issue.id}" diff --git a/app/views/issues/create.js.haml b/app/views/issues/create.js.haml index 3713a8aff..b80432909 100644 --- a/app/views/issues/create.js.haml +++ b/app/views/issues/create.js.haml @@ -1,6 +1,7 @@ - if @issue.valid? :plain $("#new_issue_dialog").dialog("close"); + $("#issues-table").prepend("#{escape_javascript(render(:partial => 'show', :locals => {:issue => @issue} ))}"); $.ajax({type: "GET", url: location.href, dataType: "script"}); - else :plain diff --git a/spec/requests/issues_spec.rb b/spec/requests/issues_spec.rb index b5d6f1bcf..0dda659b4 100644 --- a/spec/requests/issues_spec.rb +++ b/spec/requests/issues_spec.rb @@ -169,6 +169,7 @@ describe "Issues" do :assignee => @user, :project => project visit project_issues_path(project) + page.execute_script("$('.action-links').css('display', 'block');") click_link "Edit" end