diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb index fa87632d..16ecfb1f 100644 --- a/app/helpers/commits_helper.rb +++ b/app/helpers/commits_helper.rb @@ -1,22 +1,4 @@ module CommitsHelper - def commit_msg_with_link_to_issues(project, message) - return '' unless message - out = '' - message.split(/(#[0-9]+)/m).each do |m| - if m =~ /(#([0-9]+))/m - begin - issue = project.issues.find($2) - out += link_to($1, project_issue_path(project, $2)) - rescue - out += $1 - end - else - out += m - end - end - preserve out - end - def identification_type(line) if line[0] == "+" "new" diff --git a/spec/helpers/commit_helper_spec.rb b/spec/helpers/commit_helper_spec.rb deleted file mode 100644 index 747a28a3..00000000 --- a/spec/helpers/commit_helper_spec.rb +++ /dev/null @@ -1,67 +0,0 @@ -require "spec_helper" -include Haml::Helpers - -describe CommitsHelper do - - before do - @project = Factory :project - @other_project = Factory :project, :path => "OtherPath", :code => "OtherCode" - @fake_user = Factory :user - @valid_issue = Factory :issue, :assignee => @fake_user, :author => @fake_user, :project => @project - @invalid_issue = Factory :issue, :assignee => @fake_user, :author => @fake_user, :project => @other_project - end - - it "should provides return message untouched if no issue number present" do - message = "Dummy message without issue number" - - commit_msg_with_link_to_issues(@project, message).should eql message - end - - it "should returns message handled by preserve" do - message = "My brand new - Commit on multiple - lines !" - - #\n are converted to as specified in preserve_rspec - expected = "My brand new Commit on multiple lines !" - - commit_msg_with_link_to_issues(@project, message).should eql expected - end - - it "should returns empty string if message undefined" do - commit_msg_with_link_to_issues(@project, nil).should eql '' - end - - it "should returns link_to issue for one valid issue in message" do - issue_id = @valid_issue.id - message = "One commit message ##{issue_id}" - expected = "One commit message ##{issue_id}" - - commit_msg_with_link_to_issues(@project, message).should eql expected - end - - it "should returns message untouched for one invalid issue in message" do - issue_id = @invalid_issue.id - message = "One commit message ##{issue_id}" - - commit_msg_with_link_to_issues(@project, message).should eql message - end - - it "should handle multiple issue references in commit message" do - issue_id = @valid_issue.id - invalid_issue_id = @invalid_issue.id - - message = "One big commit message with a valid issue ##{issue_id} and an invalid one ##{invalid_issue_id}. - We reference valid ##{issue_id} multiple times (##{issue_id}) as the invalid ##{invalid_issue_id} is also - referenced another time (##{invalid_issue_id})" - - expected = "One big commit message with a valid issue ##{issue_id}"+ - " and an invalid one ##{invalid_issue_id}. "+ - "We reference valid ##{issue_id} multiple times "+ - "(##{issue_id}) "+ - "as the invalid ##{invalid_issue_id} is also referenced another time (##{invalid_issue_id})" - - commit_msg_with_link_to_issues(@project, message).should eql expected - end - -end \ No newline at end of file