Commit 16c720fd966ccb70a7642c59b81b23f74f00c122
1 parent
f1360084
Exists in
master
and in
4 other branches
Issues helper improved
Showing
2 changed files
with
61 additions
and
1 deletions
Show diff stats
app/helpers/issues_helper.rb
| @@ -42,15 +42,21 @@ module IssuesHelper | @@ -42,15 +42,21 @@ module IssuesHelper | ||
| 42 | end | 42 | end |
| 43 | 43 | ||
| 44 | def url_for_issue(issue_id) | 44 | def url_for_issue(issue_id) |
| 45 | + return "" if @project.nil? | ||
| 46 | + | ||
| 45 | if @project.used_default_issues_tracker? | 47 | if @project.used_default_issues_tracker? |
| 46 | url = project_issue_url project_id: @project, id: issue_id | 48 | url = project_issue_url project_id: @project, id: issue_id |
| 47 | else | 49 | else |
| 48 | url = Settings[:issues_tracker][@project.issues_tracker]["issues_url"] | 50 | url = Settings[:issues_tracker][@project.issues_tracker]["issues_url"] |
| 49 | - url.gsub(':id', issue_id.to_s).gsub(':project_id', @project.id.to_s) | 51 | + url.gsub(':id', issue_id.to_s) |
| 52 | + .gsub(':project_id', @project.id.to_s) | ||
| 53 | + .gsub(':issues_tracker_id', @project.issues_tracker_id.to_s) | ||
| 50 | end | 54 | end |
| 51 | end | 55 | end |
| 52 | 56 | ||
| 53 | def title_for_issue(issue_id) | 57 | def title_for_issue(issue_id) |
| 58 | + return "" if @project.nil? | ||
| 59 | + | ||
| 54 | if @project.used_default_issues_tracker? && issue = @project.issues.where(id: issue_id).first | 60 | if @project.used_default_issues_tracker? && issue = @project.issues.where(id: issue_id).first |
| 55 | issue.title | 61 | issue.title |
| 56 | else | 62 | else |
| @@ -0,0 +1,54 @@ | @@ -0,0 +1,54 @@ | ||
| 1 | +require "spec_helper" | ||
| 2 | + | ||
| 3 | +describe IssuesHelper do | ||
| 4 | + let(:project) { create(:project) } | ||
| 5 | + let(:issue) { create(:issue, project: project) } | ||
| 6 | + let(:ext_project) { create(:redmine_project) } | ||
| 7 | + | ||
| 8 | + describe :title_for_issue do | ||
| 9 | + it "should return issue title if used internal tracker" do | ||
| 10 | + @project = project | ||
| 11 | + title_for_issue(issue.id).should eq issue.title | ||
| 12 | + end | ||
| 13 | + | ||
| 14 | + it "should always return empty string if used external tracker" do | ||
| 15 | + @project = ext_project | ||
| 16 | + title_for_issue(rand(100)).should eq "" | ||
| 17 | + end | ||
| 18 | + | ||
| 19 | + it "should always return empty string if project nil" do | ||
| 20 | + @project = nil | ||
| 21 | + | ||
| 22 | + title_for_issue(rand(100)).should eq "" | ||
| 23 | + end | ||
| 24 | + end | ||
| 25 | + | ||
| 26 | + describe :url_for_issue do | ||
| 27 | + let(:issue_id) { 3 } | ||
| 28 | + let(:issues_url) { "http://redmine/:project_id/:issues_tracker_id/:id" } | ||
| 29 | + let(:ext_expected) do | ||
| 30 | + issues_url.gsub(':id', issue_id.to_s) | ||
| 31 | + .gsub(':project_id', ext_project.id.to_s) | ||
| 32 | + .gsub(':issues_tracker_id', ext_project.issues_tracker_id.to_s) | ||
| 33 | + end | ||
| 34 | + let(:int_expected) { polymorphic_path([project, issue]) } | ||
| 35 | + | ||
| 36 | + it "should return internal path if used internal tracker" do | ||
| 37 | + @project = project | ||
| 38 | + url_for_issue(issue.id).should match(int_expected) | ||
| 39 | + end | ||
| 40 | + | ||
| 41 | + it "should return path to external tracker" do | ||
| 42 | + @project = ext_project | ||
| 43 | + Settings[:issues_tracker][ext_project.issues_tracker]["issues_url"] = issues_url | ||
| 44 | + | ||
| 45 | + url_for_issue(issue_id).should match(ext_expected) | ||
| 46 | + end | ||
| 47 | + | ||
| 48 | + it "should return empty string if project nil" do | ||
| 49 | + @project = nil | ||
| 50 | + | ||
| 51 | + url_for_issue(issue.id).should eq "" | ||
| 52 | + end | ||
| 53 | + end | ||
| 54 | +end |