jro_apps/redmine Commit - r9113:71e636ff7179

Resourcified auth_sources....

Jean-Philippe Lang -

r9113:71e636ff7179

parent child

Context file:

r9113:71e636ff7179

Collapse all files

app/views/auth_sources/edit.html.erb +1 -1

             <h2><%=l(:label_auth_source)%> (<%= h(@auth_source.auth_method_name) %>)</h2>
-            <% form_tag({:action => 'update', :id => @auth_source}, :class => "tabular") do %>
+            <% form_tag({:action => 'update', :id => @auth_source}, :method => :put, :class => "tabular") do %>
               <%= render :partial => auth_source_partial_name(@auth_source) %>
               <%= submit_tag l(:button_save) %>
             <% end %>

app/views/auth_sources/index.html.erb +1 -1

                 <td class="buttons">
                   <%= link_to l(:button_test), :action => 'test_connection', :id => source %>
                   <%= link_to l(:button_delete), { :action => 'destroy', :id => source },
-                                                                    :method => :post,
+                                                                    :method => :delete,
                                                                     :confirm => l(:text_are_you_sure),
                                                                     :class => 'icon icon-del',
                                                                     :disabled => source.users.any? %>

config/routes.rb +1 -16

@@ -353,22 +353,7 ActionController::Routing::Routes.draw do \|map\|
353	map.connect 'admin/default_configuration', :controller => 'admin',	353	map.connect 'admin/default_configuration', :controller => 'admin',
354	:action => 'default_configuration', :conditions => {:method => :post}	354	:action => 'default_configuration', :conditions => {:method => :post}
355		355
356	# Used by AuthSourcesControllerTest	356	map.resources :auth_sources, :member => {:test_connection => :get}
357	# TODO : refactor *AuthSourcesController to remove these routes
358	map.connect 'auth_sources', :controller => 'auth_sources',
359	:action => 'index', :conditions => {:method => :get}
360	map.connect 'auth_sources/new', :controller => 'auth_sources',
361	:action => 'new', :conditions => {:method => :get}
362	map.connect 'auth_sources/create', :controller => 'auth_sources',
363	:action => 'create', :conditions => {:method => :post}
364	map.connect 'auth_sources/destroy/:id', :controller => 'auth_sources',
365	:action => 'destroy', :id => /\d+/, :conditions => {:method => :post}
366	map.connect 'auth_sources/test_connection/:id', :controller => 'auth_sources',
367	:action => 'test_connection', :conditions => {:method => :get}
368	map.connect 'auth_sources/edit/:id', :controller => 'auth_sources',
369	:action => 'edit', :id => /\d+/, :conditions => {:method => :get}
370	map.connect 'auth_sources/update/:id', :controller => 'auth_sources',
371	:action => 'update', :id => /\d+/, :conditions => {:method => :post}
372		357
373	map.connect 'workflows', :controller => 'workflows',	358	map.connect 'workflows', :controller => 'workflows',
374	:action => 'index', :conditions => {:method => :get}	359	:action => 'index', :conditions => {:method => :get}

test/functional/auth_sources_controller_test.rb +4 -4

               end
               def test_update
-                post :update, :id => 1, :auth_source => {:name => 'Renamed', :host => '192.168.0.10', :port => '389', :attr_login => 'uid'}
+                put :update, :id => 1, :auth_source => {:name => 'Renamed', :host => '192.168.0.10', :port => '389', :attr_login => 'uid'}
                 assert_redirected_to '/auth_sources'
                 source = AuthSourceLdap.find(1)
               end
               def test_update_with_failure
-                post :update, :id => 1, :auth_source => {:name => 'Renamed', :host => '', :port => '389', :attr_login => 'uid'}
+                put :update, :id => 1, :auth_source => {:name => 'Renamed', :host => '', :port => '389', :attr_login => 'uid'}
                 assert_response :success
                 assert_template 'edit'
                 assert_error_tag :content => /host can't be blank/i
               def test_destroy
                 assert_difference 'AuthSourceLdap.count', -1 do
-                  post :destroy, :id => 1
+                  delete :destroy, :id => 1
                 end
               end
                 User.find(2).update_attribute :auth_source_id, 1
                 assert_no_difference 'AuthSourceLdap.count' do
-                  post :destroy, :id => 1
+                  delete :destroy, :id => 1
                 end
               end

test/integration/routing/auth_sources_test.rb +9 -9

                     { :controller => 'auth_sources', :action => 'new' }
                   )
                 assert_routing(
-                    { :method => 'post', :path => "/auth_sources/create" },
+                    { :method => 'post', :path => "/auth_sources" },
                     { :controller => 'auth_sources', :action => 'create' }
                   )
                 assert_routing(
-                    { :method => 'post', :path => "/auth_sources/destroy/1234" },
+                    { :method => 'get', :path => "/auth_sources/1234/edit" },
-                    { :controller => 'auth_sources', :action => 'destroy',
+                    { :controller => 'auth_sources', :action => 'edit',
                       :id => '1234' }
                   )
                 assert_routing(
-                    { :method => 'get', :path => "/auth_sources/test_connection/1234" },
+                    { :method => 'put', :path => "/auth_sources/1234" },
-                    { :controller => 'auth_sources', :action => 'test_connection',
+                    { :controller => 'auth_sources', :action => 'update',
                       :id => '1234' }
                   )
                 assert_routing(
-                    { :method => 'get', :path => "/auth_sources/edit/1234" },
+                    { :method => 'delete', :path => "/auth_sources/1234" },
-                    { :controller => 'auth_sources', :action => 'edit',
+                    { :controller => 'auth_sources', :action => 'destroy',
                       :id => '1234' }
                   )
                 assert_routing(
-                    { :method => 'post', :path => "/auth_sources/update/1234" },
+                    { :method => 'get', :path => "/auth_sources/1234/test_connection" },
-                    { :controller => 'auth_sources', :action => 'update',
+                    { :controller => 'auth_sources', :action => 'test_connection',
                       :id => '1234' }
                   )
               end

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