meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-31 11:37:14 +00:00
Code Issues Releases Wiki Activity

Fix rubocop warning (#39111, #40137).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/trunk@22757 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu 2024-03-03 22:24:58 +00:00
parent 18cb44684b
commit 54aa810240
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/help_controller.rb
View File

@ -26,10 +26,10 @@ class HelpController < ApplicationController
unless lookup_context.exists?(template)
lang = "en"
end
render template: "help/wiki_syntax/#{Setting.text_formatting}/#{lang}/wiki_syntax_#{type}#{Setting.text_formatting}", :layout => nil
render template: "help/wiki_syntax/#{Setting.text_formatting}/#{lang}/wiki_syntax_#{type}#{Setting.text_formatting}", layout: nil
end
def show_code_highlighting
render template: "help/wiki_syntax/code_highlighting_languages", :layout => nil
render template: "help/wiki_syntax/code_highlighting_languages", layout: nil
end
end

4
config/routes.rb
View File

@ -407,8 +407,8 @@ Rails.application.routes.draw do
get 'robots.:format', :to => 'welcome#robots', :constraints => {:format => 'txt'}
get 'help/wiki_syntax/(:type)', :controller => 'help', :action => 'show_wiki_syntax', :constraints => { :type => /detailed/ }, as: 'help_wiki_syntax'
get 'help/code_highlighting', :controller => 'help', :action => 'show_code_highlighting', as: 'help_code_highlighting'
get 'help/wiki_syntax/(:type)', :controller => 'help', :action => 'show_wiki_syntax', :constraints => { :type => /detailed/ }, :as => 'help_wiki_syntax'
get 'help/code_highlighting', :controller => 'help', :action => 'show_code_highlighting', :as => 'help_code_highlighting'
Redmine::Plugin.directory.glob("*/config/routes.rb").sort.each do |plugin_routes_path|
instance_eval(plugin_routes_path.read, plugin_routes_path.to_s)

8
test/functional/help_controller_test.rb
View File

@ -29,14 +29,14 @@ class HelpControllerTest < Redmine::ControllerTest
:common_mark => "Wiki Syntax Quick Reference (CommonMark Markdown (GitHub Flavored))"
}
formatters.each {|formatter, result|
formatters.each do |formatter, result|
with_settings :text_formatting => formatter do
get :show_wiki_syntax
assert_response :success
assert_select 'h1', :text => result
end
}
end
end
def test_get_help_wiki_syntax_detailed
@ -46,7 +46,7 @@ class HelpControllerTest < Redmine::ControllerTest
:common_mark => "Wiki formatting (CommonMark Markdown (GitHub Flavored))"
}
formatters.each {|formatter, result|
formatters.each do |formatter, result|
with_settings :text_formatting => formatter do
get :show_wiki_syntax, :params => {
:type => 'detailed'
@ -55,7 +55,7 @@ class HelpControllerTest < Redmine::ControllerTest
assert_response :success
assert_select 'h1', :text => result
end
}
end
end
def test_get_help_wiki_syntax_should_return_lang_if_available