jro_apps/redmine Commit - r10766:c31f498ba6a2

Code cleanup: implement Plugin#to_param for generating routes....

Jean-Philippe Lang -

r10766:c31f498ba6a2

parent child

Context file:

r10766:c31f498ba6a2

Collapse all files

app/controllers/settings_controller.rb +1 -1

                 if request.post?
                   Setting.send "plugin_#{@plugin.id}=", params[:settings]
                   flash[:notice] = l(:notice_successful_update)
-                  redirect_to plugin_settings_path(@plugin.id)
+                  redirect_to plugin_settings_path(@plugin)
                 else
                   @partial = @plugin.settings[:partial]
                   @settings = Setting.send "plugin_#{@plugin.id}"

app/views/admin/plugins.html.erb +2 -2

             <% if @plugins.any? %>
             <table class="list plugins">
                 <% @plugins.each do |plugin| %>
-                    <tr class="<%= cycle('odd', 'even') %>">
+                    <tr id="plugin-<%= plugin.id %>" class="<%= cycle('odd', 'even') %>">
                     <td><span class="name"><%=h plugin.name %></span>
                         <%= content_tag('span', h(plugin.description), :class => 'description') unless plugin.description.blank? %>
                         <%= content_tag('span', link_to(h(plugin.url), plugin.url), :class => 'url') unless plugin.url.blank? %>
                     </td>
                     <td class="author"><%= plugin.author_url.blank? ? h(plugin.author) : link_to(h(plugin.author), plugin.author_url) %></td>
                     <td class="version"><%=h plugin.version %></td>
-                    <td class="configure"><%= link_to(l(:button_configure), :controller => 'settings', :action => 'plugin', :id => plugin.id) if plugin.configurable? %></td>
+                    <td class="configure"><%= link_to(l(:button_configure), plugin_settings_path(plugin)) if plugin.configurable? %></td>
                     </tr>
                 <% end %>
             </table>

lib/redmine/plugin.rb +4 0

                   File.join(self.class.public_directory, id.to_s)
                 end
+                def to_param
+                  id
+                end
                 def assets_directory
                   File.join(directory, 'assets')
                 end

test/functional/admin_controller_test.rb +11 -8

               def test_index
                 get :index
-                assert_no_tag :tag => 'div',
+                assert_select 'div.nodata', 0
-                              :attributes => { :class => /nodata/ }
               end
               def test_index_with_no_configuration_data
                 delete_configuration_data
                 get :index
-                assert_tag :tag => 'div',
+                assert_select 'div.nodata'
-                           :attributes => { :class => /nodata/ }
               end
               def test_projects
                 assert_response :success
                 assert_template 'plugins'
-                assert_tag :td, :child => { :tag => 'span', :content => 'Foo plugin' }
+                assert_select 'tr#plugin-foo' do
-                assert_tag :td, :child => { :tag => 'span', :content => 'Bar' }
+                  assert_select 'td span.name', :text => 'Foo plugin'
+                  assert_select 'td.configure a[href=/settings/plugin/foo]'
+                end
+                assert_select 'tr#plugin-bar' do
+                  assert_select 'td span.name', :text => 'Bar'
+                  assert_select 'td.configure a', 0
+                end
               end
               def test_info
                 get :index
                 assert_response :success
-                assert_tag :a, :attributes => { :href => '/foo/bar' },
+                assert_select 'div#admin-menu a[href=/foo/bar]', :text => 'Test'
-                               :content => 'Test'
                 Redmine::MenuManager.map :admin_menu do |menu|
                   menu.delete :test_admin_menu_plugin_extension

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages