RESTful routing for admin censor rule actions

6 files changed, 272 insertions, 257 deletions

diff --git a/app/controllers/admin_censor_rule_controller.rb b/app/controllers/admin_censor_rule_controller.rb
index 01c0bf4b2..c82aa342c 100644
--- a/app/controllers/admin_censor_rule_controller.rb
+++ b/app/controllers/admin_censor_rule_controller.rb
@@ -5,11 +5,12 @@
 # Email: hello@mysociety.org; WWW: http://www.mysociety.org/
 
 class AdminCensorRuleController < AdminController
+
     def new
-        if params[:info_request_id]
-            @info_request = InfoRequest.find(params[:info_request_id])
+        if params[:request_id]
+            @info_request = InfoRequest.find(params[:request_id])
             @censor_rule = @info_request.censor_rules.build
-            @form_url = admin_info_request_censor_rules_path(@info_request)
+            @form_url = admin_request_censor_rules_path(@info_request)
         end
 
         if params[:user_id]
@@ -17,18 +18,14 @@ class AdminCensorRuleController < AdminController
             @censor_rule = @censor_user.censor_rules.build
             @form_url = admin_user_censor_rules_path(@censor_user)
         end
-
-        @censor_rule ||= CensorRule.new
-        @form_url ||= admin_rule_create_path
     end
 
     def create
         params[:censor_rule][:last_edit_editor] = admin_current_user
-
-        if params[:info_request_id]
-            @info_request = InfoRequest.find(params[:info_request_id])
+        if params[:request_id]
+            @info_request = InfoRequest.find(params[:request_id])
             @censor_rule = @info_request.censor_rules.build(params[:censor_rule])
-            @form_url = admin_info_request_censor_rules_path(@info_request)
+            @form_url = admin_request_censor_rules_path(@info_request)
         end
 
         if params[:user_id]
@@ -37,9 +34,6 @@ class AdminCensorRuleController < AdminController
             @form_url = admin_user_censor_rules_path(@censor_user)
         end
 
-        @censor_rule ||= CensorRule.new(params[:censor_rule])
-        @form_url ||= admin_rule_create_path
-
         if @censor_rule.save
             if !@censor_rule.info_request.nil?
                 expire_for_request(@censor_rule.info_request)
@@ -55,8 +49,6 @@ class AdminCensorRuleController < AdminController
                 redirect_to admin_request_url(@censor_rule.info_request)
             elsif !@censor_rule.user.nil?
                 redirect_to admin_user_url(@censor_rule.user)
-            else
-                raise "internal error"
             end
         else
             render :action => 'new'
@@ -95,7 +87,7 @@ class AdminCensorRuleController < AdminController
     end
 
     def destroy
-        @censor_rule = CensorRule.find(params[:censor_rule_id])
+        @censor_rule = CensorRule.find(params[:id])
         info_request = @censor_rule.info_request
         user = @censor_rule.user
 
diff --git a/app/views/admin_censor_rule/_show.html.erb b/app/views/admin_censor_rule/_show.html.erb
index 46904b3b9..4b37d0cc9 100644
--- a/app/views/admin_censor_rule/_show.html.erb
+++ b/app/views/admin_censor_rule/_show.html.erb
@@ -15,7 +15,7 @@
         <td><%=h censor_rule.send(column) %></td>
       <% end %>
       <td>
-        <%= link_to "Edit", admin_rule_edit_path(censor_rule) %>
+        <%= link_to "Edit", edit_admin_censor_rule_path(censor_rule) %>
       </td>
     </tr>
   <% end %>
@@ -25,7 +25,7 @@
 <% end %>
 
 <% if defined? info_request %>
-  <%= link_to "New censor rule", new_admin_info_request_censor_rule_path(info_request), :class => "btn btn-info" %>
+  <%= link_to "New censor rule", new_admin_request_censor_rule_path(info_request), :class => "btn btn-info" %>
   <span class="label label-info">for this request only</span>
 <% end %>
 
diff --git a/app/views/admin_censor_rule/edit.html.erb b/app/views/admin_censor_rule/edit.html.erb
index 230446ed3..ff07987f2 100644
--- a/app/views/admin_censor_rule/edit.html.erb
+++ b/app/views/admin_censor_rule/edit.html.erb
@@ -2,15 +2,14 @@
 
 <h1><%=@title%></h1>
 
-<%= form_tag admin_rule_update_path(@censor_rule), :class => "form form-horizontal" do %>
+<%= form_tag admin_censor_rule_path(@censor_rule), :method => 'put', :class => "form form-horizontal" do %>
    <%= render :partial => 'form', :locals => { :info_request => @censor_rule.info_request, :user => @censor_rule.user } %>
   <div class="form-actions">
     <%= submit_tag 'Save', :accesskey => 's', :class => "btn btn-primary" %>
   </div>
 <% end %>
 
-<%= form_tag admin_rule_destroy_path(@censor_rule), :class => "form form-horizontal" do %>
-  <%= hidden_field_tag(:censor_rule_id, @censor_rule.id) %>
+<%= form_tag admin_censor_rule_path(@censor_rule), :method => 'delete', :class => "form form-horizontal" do %>
   <div class="form-actions">
     Permanent! --&gt; <%= submit_tag "Destroy rule", :class => "btn btn-primary" %>
  </div>
diff --git a/app/views/admin_censor_rule/new.html.erb b/app/views/admin_censor_rule/new.html.erb
index 26b3212be..ded31cff2 100644
--- a/app/views/admin_censor_rule/new.html.erb
+++ b/app/views/admin_censor_rule/new.html.erb
@@ -4,7 +4,6 @@
 
 <%= form_for @censor_rule, :url => @form_url, :class => "form form-horizontal" do %>
   <%= render :partial => 'form', :locals => { :info_request => @info_request, :user => @censor_user } %>
-
   <div class="form-actions">
     <%= submit_tag "Create", :class => "btn btn-primary" %>
   </div>
diff --git a/config/routes.rb b/config/routes.rb
index 529f044e7..c7a691a12 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -221,6 +221,10 @@ Alaveteli::Application.routes.draw do
                       post 'move', :on => :member
                       post 'generate_upload_url', :on => :member
                       post 'hide', :on => :member
+                      resources :censor_rules,
+                                :controller => 'admin_censor_rule',
+                                :only => [:new, :create],
+                                :name_prefix => 'request_'
 
         end
     end
@@ -280,6 +284,10 @@ Alaveteli::Application.routes.draw do
                     post 'login_as', :on => :member
                     post 'clear_profile_photo', :on => :member
                     post 'modify_comment_visibility', :on => :collection
+                    resources :censor_rules,
+                              :controller => 'admin_censor_rule',
+                              :only => [:new, :create],
+                              :name_prefix => 'user_'
         end
     end
     ####
@@ -293,31 +301,12 @@ Alaveteli::Application.routes.draw do
     ####
 
     #### AdminCensorRule controller
-    match '/admin/censor/new' => 'admin_censor_rule#new', :as => :admin_rule_new
-    match '/admin/censor/create' => 'admin_censor_rule#create', :as => :admin_rule_create
-    match '/admin/censor/edit/:id' => 'admin_censor_rule#edit', :as => :admin_rule_edit
-    match '/admin/censor/update/:id' => 'admin_censor_rule#update', :as => :admin_rule_update
-    match '/admin/censor/destroy/:censor_rule_id' => 'admin_censor_rule#destroy', :as => :admin_rule_destroy
-
     scope '/admin', :as => 'admin' do
-        resources :info_requests, :only => [] do
-            resources :censor_rules,
-                      :controller => 'admin_censor_rule',
-                      :only => [:new, :create],
-                      :name_prefix => 'info_request_'
-        end
+        resources :censor_rules,
+                  :controller => 'admin_censor_rule',
+                  :except => [:index, :new, :create]
     end
 
-    scope '/admin', :as => 'admin' do
-        resources :users, :only => [] do
-            resources :censor_rules,
-                      :controller => 'admin_censor_rule',
-                      :only => [:new, :create],
-                      :name_prefix => 'user_'
-        end
-    end
-    ####
-
     #### AdminSpamAddresses controller
     scope '/admin', :as => 'admin' do
         resources :spam_addresses,
diff --git a/spec/controllers/admin_censor_rule_controller_spec.rb b/spec/controllers/admin_censor_rule_controller_spec.rb
index 4df56a92b..3087af34a 100644
--- a/spec/controllers/admin_censor_rule_controller_spec.rb
+++ b/spec/controllers/admin_censor_rule_controller_spec.rb
@@ -5,76 +5,68 @@ describe AdminCensorRuleController do
 
     describe 'GET new' do
 
-        it 'returns a successful response' do
-            get :new
-            expect(response).to be_success
-        end
+        context 'request_id param' do
 
-        it 'initializes a new censor rule' do
-            get :new
-            expect(assigns[:censor_rule]).to be_new_record
-        end
+            before do
+                @info_request = FactoryGirl.create(:info_request)
+                get :new, :request_id => @info_request.id, :name_prefix => 'request_'
+            end
 
-        it 'renders the correct template' do
-            get :new
-            expect(response).to render_template('new')
-        end
+            it 'returns a successful response' do
+                expect(response).to be_success
+            end
 
-        it 'sets the URL for the form to POST to' do
-            get :new
-            expect(assigns[:form_url]).to eq(admin_rule_create_path)
-        end
+            it 'initializes a new censor rule' do
+                expect(assigns[:censor_rule]).to be_new_record
+            end
 
-        context 'info_request_id param' do
+            it 'renders the correct template' do
+                expect(response).to render_template('new')
+            end
 
-            it 'finds an info request if the info_request_id param is supplied' do
-                info_request = FactoryGirl.create(:info_request)
-                get :new, :info_request_id => info_request.id
-                expect(assigns[:info_request]).to eq(info_request)
+            it 'finds an info request if the request_id param is supplied' do
+                expect(assigns[:info_request]).to eq(@info_request)
             end
 
             it 'associates the info request with the new censor rule' do
-                info_request = FactoryGirl.create(:info_request)
-                get :new, :info_request_id => info_request.id
-                expect(assigns[:censor_rule].info_request).to eq(info_request)
+                expect(assigns[:censor_rule].info_request).to eq(@info_request)
             end
 
             it 'sets the URL for the form to POST to' do
-                info_request = FactoryGirl.create(:info_request)
-                get :new, :info_request_id => info_request.id
-                expect(assigns[:form_url]).to eq(admin_info_request_censor_rules_path(info_request))
-            end
-
-            it 'does not find an info request if no info_request_id param is supplied' do
-                get :new
-                expect(assigns[:info_request]).to be_nil
+                expect(assigns[:form_url]).to eq(admin_request_censor_rules_path(@info_request))
             end
 
         end
 
         context 'user_id param' do
 
+            before do
+                @user = FactoryGirl.create(:user)
+                get :new, :user_id => @user.id, :name_prefix => 'user_'
+            end
+
+            it 'returns a successful response' do
+                expect(response).to be_success
+            end
+
+            it 'initializes a new censor rule' do
+                expect(assigns[:censor_rule]).to be_new_record
+            end
+
+            it 'renders the correct template' do
+                expect(response).to render_template('new')
+            end
+
             it 'finds a user if the user_id param is supplied' do
-                user = FactoryGirl.create(:user)
-                get :new, :user_id => user.id
-                expect(assigns[:censor_user]).to eq(user)
+                expect(assigns[:censor_user]).to eq(@user)
             end
 
             it 'associates the user with the new censor rule' do
-                user = FactoryGirl.create(:user)
-                get :new, :user_id => user.id
-                expect(assigns[:censor_rule].user).to eq(user)
+                expect(assigns[:censor_rule].user).to eq(@user)
             end
 
             it 'sets the URL for the form to POST to' do
-                user = FactoryGirl.create(:user)
-                get :new, :user_id => user.id
-                expect(assigns[:form_url]).to eq(admin_user_censor_rules_path(user))
-            end
-
-            it 'does not find a user if no user_id param is supplied' do
-                get :new
-                expect(assigns[:censor_user]).to be_nil
+                expect(assigns[:form_url]).to eq(admin_user_censor_rules_path(@user))
             end
 
         end
@@ -83,177 +75,168 @@ describe AdminCensorRuleController do
 
     describe 'POST create' do
 
-        before(:each) do
-            @censor_rule_params = FactoryGirl.build(:global_censor_rule).serializable_hash
-            # last_edit_editor gets set in the controller
-            @censor_rule_params.delete(:last_edit_editor)
-        end
-
-        it 'sets the last_edit_editor to the current admin' do
-            post :create, :censor_rule => @censor_rule_params
-            expect(assigns[:censor_rule].last_edit_editor).to eq('*unknown*')
-        end
+        context 'request_id param' do
 
-        it 'sets the URL for the form to POST to' do
-            post :create, :censor_rule => @censor_rule_params
-            expect(assigns[:form_url]).to eq(admin_rule_create_path)
-        end
+            before(:each) do
+                @censor_rule_params = FactoryGirl.build(:info_request_censor_rule).serializable_hash
+                # last_edit_editor gets set in the controller
+                @censor_rule_params.delete(:last_edit_editor)
+                @info_request = FactoryGirl.create(:info_request)
+                post :create, :request_id => @info_request.id,
+                              :censor_rule => @censor_rule_params,
+                              :name_prefix => 'request_'
+            end
 
-        context 'info_request_id param' do
+            it 'sets the last_edit_editor to the current admin' do
+                expect(assigns[:censor_rule].last_edit_editor).to eq('*unknown*')
+            end
 
-            it 'finds an info request if the info_request_id param is supplied' do
-                info_request = FactoryGirl.create(:info_request)
-                post :create, :info_request_id => info_request.id,
-                              :censor_rule => @censor_rule_params
-                expect(assigns[:info_request]).to eq(info_request)
+            it 'finds an info request if the request_id param is supplied' do
+                expect(assigns[:info_request]).to eq(@info_request)
             end
 
             it 'associates the info request with the new censor rule' do
-                info_request = FactoryGirl.create(:info_request)
-                post :create, :info_request_id => info_request.id,
-                              :censor_rule => @censor_rule_params
-                expect(assigns[:censor_rule].info_request).to eq(info_request)
+                expect(assigns[:censor_rule].info_request).to eq(@info_request)
             end
 
             it 'sets the URL for the form to POST to' do
-                info_request = FactoryGirl.create(:info_request)
-                post :create, :info_request_id => info_request.id,
-                              :censor_rule => @censor_rule_params
-                expect(assigns[:form_url]).to eq(admin_info_request_censor_rules_path(info_request))
+                expect(assigns[:form_url]).to eq(admin_request_censor_rules_path(@info_request))
             end
 
-            it 'does not find an info request if no info_request_id param is supplied' do
-                post :create, :censor_rule => @censor_rule_params
-                expect(assigns[:info_request]).to be_nil
-            end
+            context 'successfully saving the censor rule' do
 
-        end
+                it 'persists the censor rule' do
+                    post :create, :censor_rule => @censor_rule_params,
+                                  :request_id => @info_request.id,
+                                  :name_prefix => 'request_'
+                    expect(assigns[:censor_rule]).to be_persisted
+                end
 
-        context 'user_id param' do
+                it 'confirms the censor rule is created' do
+                    post :create, :censor_rule => @censor_rule_params,
+                                  :request_id => @info_request.id,
+                                  :name_prefix => 'request_'
+                    msg = 'CensorRule was successfully created.'
+                    expect(flash[:notice]).to eq(msg)
+                end
 
-            it 'finds a user if the user_id param is supplied' do
-                user = FactoryGirl.create(:user)
-                post :create, :user_id => user.id,
-                              :censor_rule => @censor_rule_params
-                expect(assigns[:censor_user]).to eq(user)
-            end
+                it 'purges the cache for the info request' do
+                    @controller.should_receive(:expire_for_request).
+                        with(@info_request)
 
-            it 'associates the user with the new censor rule' do
-                user = FactoryGirl.create(:user)
-                post :create, :user_id => user.id,
-                              :censor_rule => @censor_rule_params
-                expect(assigns[:censor_rule].user).to eq(user)
-            end
+                    post :create, :censor_rule => @censor_rule_params,
+                                  :request_id => @info_request.id,
+                                  :name_prefix => 'request_'
+                end
 
-            it 'sets the URL for the form to POST to' do
-                user = FactoryGirl.create(:user)
-                post :create, :user_id => user.id,
-                              :censor_rule => @censor_rule_params
-                expect(assigns[:form_url]).to eq(admin_user_censor_rules_path(user))
+                it 'redirects to the associated info request' do
+                    post :create, :censor_rule => @censor_rule_params,
+                                  :request_id => @info_request.id,
+                                  :name_prefix => 'request_'
+                    expect(response).to redirect_to(
+                        admin_request_path(assigns[:censor_rule].info_request)
+                    )
+                end
             end
 
-            it 'does not find a user if no user_id param is supplied' do
-                post :create, :censor_rule => @censor_rule_params
-                expect(assigns[:censor_user]).to be_nil
-            end
+            context 'unsuccessfully saving the censor rule' do
+
+                before(:each) do
+                    CensorRule.any_instance.stub(:save).and_return(false)
+                end
+
+                it 'does not persist the censor rule' do
+                    post :create, :censor_rule => @censor_rule_params,
+                                  :request_id => @info_request.id,
+                                  :name_prefix => 'request_'
+                    expect(assigns[:censor_rule]).to be_new_record
+                end
 
+                it 'renders the form' do
+                    post :create, :censor_rule => @censor_rule_params,
+                                  :request_id => @info_request.id,
+                                  :name_prefix => 'request_'
+                    expect(response).to render_template('new')
+                end
+
+            end
         end
 
-        context 'successfully saving the censor rule' do
+        context 'user_id param' do
 
             before(:each) do
-                CensorRule.any_instance.stub(:save).and_return(true)
+                @censor_rule_params = FactoryGirl.build(:user_censor_rule).serializable_hash
+                # last_edit_editor gets set in the controller
+                @censor_rule_params.delete(:last_edit_editor)
+                @user = FactoryGirl.create(:user)
+                post :create, :user_id => @user.id,
+                              :censor_rule => @censor_rule_params,
+                              :name_prefix => 'user_'
             end
 
-            it 'persists the censor rule' do
-                pending("This raises an internal error in most cases")
-                post :create, :censor_rule => @censor_rule_params
-                expect(assigns[:censor_rule]).to be_persisted
+            it 'sets the last_edit_editor to the current admin' do
+                expect(assigns[:censor_rule].last_edit_editor).to eq('*unknown*')
             end
 
-            it 'confirms the censor rule is created' do
-                pending("This raises an internal error in most cases")
-                post :create, :censor_rule => @censor_rule_params
-                msg = 'CensorRule was successfully created.'
-                expect(flash[:notice]).to eq(msg)
+            it 'finds a user if the user_id param is supplied' do
+                expect(assigns[:censor_user]).to eq(@user)
             end
 
-            it 'raises an error after creating the rule' do
-                expect {
-                    post :create, :censor_rule => @censor_rule_params
-                }.to raise_error 'internal error'
+            it 'associates the user with the new censor rule' do
+                expect(assigns[:censor_rule].user).to eq(@user)
             end
 
-            context 'a CensorRule with an associated InfoRequest' do
+            it 'sets the URL for the form to POST to' do
+                expect(assigns[:form_url]).to eq(admin_user_censor_rules_path(@user))
+            end
 
-                before(:each) do
-                    @censor_rule_params = FactoryGirl.build(:info_request_censor_rule).serializable_hash
-                    # last_edit_editor gets set in the controller
-                    @censor_rule_params.delete(:last_edit_editor)
-                end
+            context 'successfully saving the censor rule' do
 
-                it 'purges the cache for the info request' do
+                 it 'purges the cache for the info request' do
                     censor_rule = CensorRule.new(@censor_rule_params)
-                    @controller.should_receive(:expire_for_request).
-                        with(censor_rule.info_request)
+                    @controller.should_receive(:expire_requests_for_user).
+                        with(@user)
 
-                    post :create, :censor_rule => @censor_rule_params
+                    post :create, :censor_rule => @censor_rule_params,
+                                  :user_id => @user.id,
+                                  :name_prefix => 'user_'
                 end
 
                 it 'redirects to the associated info request' do
-                    post :create, :censor_rule => @censor_rule_params
+                    post :create, :censor_rule => @censor_rule_params,
+                                  :user_id => @user.id,
+                                  :name_prefix => 'user_'
                     expect(response).to redirect_to(
-                        admin_request_show_path(assigns[:censor_rule].info_request)
+                        admin_user_path(assigns[:censor_rule].user)
                     )
                 end
 
             end
 
-            context 'a CensorRule with an associated User' do
+            context 'unsuccessfully saving the censor rule' do
 
                 before(:each) do
-                    @censor_rule_params = FactoryGirl.build(:user_censor_rule).serializable_hash
-                    # last_edit_editor gets set in the controller
-                    @censor_rule_params.delete(:last_edit_editor)
+                    CensorRule.any_instance.stub(:save).and_return(false)
                 end
 
-                 it 'purges the cache for the info request' do
-                    censor_rule = CensorRule.new(@censor_rule_params)
-                    @controller.should_receive(:expire_requests_for_user).
-                        with(censor_rule.user)
-
-                    post :create, :censor_rule => @censor_rule_params
+                it 'does not persist the censor rule' do
+                    post :create, :censor_rule => @censor_rule_params,
+                                  :user_id => @user.id,
+                                  :name_prefix => 'user_'
+                    expect(assigns[:censor_rule]).to be_new_record
                 end
 
-                it 'redirects to the associated info request' do
-                    post :create, :censor_rule => @censor_rule_params
-                    expect(response).to redirect_to(
-                        admin_user_show_path(assigns[:censor_rule].user)
-                    )
+                it 'renders the form' do
+                    post :create, :censor_rule => @censor_rule_params,
+                                  :user_id => @user.id,
+                                  :name_prefix => 'user_'
+                    expect(response).to render_template('new')
                 end
 
             end
 
         end
 
-        context 'unsuccessfully saving the censor rule' do
-
-            before(:each) do
-                CensorRule.any_instance.stub(:save).and_return(false)
-            end
-
-            it 'does not persist the censor rule' do
-                post :create, :censor_rule => @censor_rule_params
-                expect(assigns[:censor_rule]).to be_new_record
-            end
-
-            it 'renders the form' do
-                post :create, :censor_rule => @censor_rule_params
-                expect(response).to render_template('new')
-            end
-
-        end
-
     end
 
     describe 'GET edit' do
@@ -348,103 +331,144 @@ describe AdminCensorRuleController do
                                  :censor_rule => { :text => 'different text' }
 
                     expect(response).to redirect_to(
-                        admin_request_show_path(assigns[:censor_rule].info_request)
+                        admin_request_path(assigns[:censor_rule].info_request)
                     )
                 end
 
             end
 
-            context 'a CensorRule with an associated User' do
+            context 'unsuccessfully saving the censor rule' do
 
                 before(:each) do
-                    @censor_rule = FactoryGirl.create(:user_censor_rule)
+                    CensorRule.any_instance.stub(:save).and_return(false)
                 end
 
-                 it 'purges the cache for the info request' do
-                    @controller.should_receive(:expire_requests_for_user).
-                        with(@censor_rule.user)
-
+                it 'does not update the censor rule' do
                     put :update, :id => @censor_rule.id,
                                  :censor_rule => { :text => 'different text' }
+                    @censor_rule.reload
+                    expect(@censor_rule.text).to eq('some text to redact')
                 end
 
-                it 'redirects to the associated info request' do
+                it 'renders the form' do
                     put :update, :id => @censor_rule.id,
                                  :censor_rule => { :text => 'different text' }
 
-                    expect(response).to redirect_to(
-                        admin_user_show_path(assigns[:censor_rule].user)
-                    )
+                    expect(response).to render_template('edit')
                 end
 
-            end
+             end
+
 
         end
 
-        context 'unsuccessfully saving the censor rule' do
+        context 'a CensorRule with an associated User' do
 
             before(:each) do
-                CensorRule.any_instance.stub(:save).and_return(false)
+                @censor_rule = FactoryGirl.create(:user_censor_rule)
             end
 
-            it 'does not update the censor rule' do
+            it 'finds the correct censor rule to edit' do
                 put :update, :id => @censor_rule.id,
                              :censor_rule => { :text => 'different text' }
-                @censor_rule.reload
-                expect(@censor_rule.text).to eq('some text to redact')
+
+                expect(assigns[:censor_rule]).to eq(@censor_rule)
             end
 
-            it 'renders the form' do
+            it 'sets the last_edit_editor to the current admin' do
                 put :update, :id => @censor_rule.id,
                              :censor_rule => { :text => 'different text' }
 
-                expect(response).to render_template('edit')
+                expect(assigns[:censor_rule].last_edit_editor).to eq('*unknown*')
             end
 
-        end
 
-    end
+            context 'successfully saving the censor rule' do
 
-    describe 'DELETE destroy' do
+                it 'updates the censor rule' do
+                    put :update, :id => @censor_rule.id,
+                                 :censor_rule => { :text => 'different text' }
+                    @censor_rule.reload
+                    expect(@censor_rule.text).to eq('different text')
+                end
 
-        before(:each) do
-            @censor_rule = FactoryGirl.create(:global_censor_rule)
-        end
+                it 'confirms the censor rule is updated' do
+                    put :update, :id => @censor_rule.id,
+                                 :censor_rule => { :text => 'different text' }
+                    msg = 'CensorRule was successfully updated.'
+                    expect(flash[:notice]).to eq(msg)
+                end
 
-        it 'finds the correct censor rule to destroy' do
-            pending("This raises an internal error in most cases")
-            # TODO: Replace :censor_rule_id with :id
-            delete :destroy, :censor_rule_id => @censor_rule.id
-            expect(assigns[:censor_rule]).to eq(@censor_rule)
-        end
+                 it 'purges the cache for the info request' do
+                    @controller.should_receive(:expire_requests_for_user).
+                        with(@censor_rule.user)
 
-        it 'raises an error after destroying the rule' do
-            expect {
-                delete :destroy, :censor_rule_id => @censor_rule.id
-            }.to raise_error 'internal error'
-        end
+                    put :update, :id => @censor_rule.id,
+                                 :censor_rule => { :text => 'different text' }
+                end
+
+                it 'redirects to the associated info request' do
+                    put :update, :id => @censor_rule.id,
+                                 :censor_rule => { :text => 'different text' }
+
+                    expect(response).to redirect_to(
+                        admin_user_path(assigns[:censor_rule].user)
+                    )
+                end
+            end
+
+            context 'unsuccessfully saving the censor rule' do
 
-        it 'confirms the censor rule is destroyed in all cases' do
-            pending("This actually raises an internal error anyway")
-            delete :destroy, :censor_rule_id => @censor_rule.id
-            msg = 'CensorRule was successfully destroyed.'
-            expect(flash[:notice]).to eq(msg)
+                before(:each) do
+                    CensorRule.any_instance.stub(:save).and_return(false)
+                end
+
+                it 'does not update the censor rule' do
+                    put :update, :id => @censor_rule.id,
+                                 :censor_rule => { :text => 'different text' }
+                    @censor_rule.reload
+                    expect(@censor_rule.text).to eq('some text to redact')
+                end
+
+                it 'renders the form' do
+                    put :update, :id => @censor_rule.id,
+                                 :censor_rule => { :text => 'different text' }
+
+                    expect(response).to render_template('edit')
+                end
+
+             end
         end
 
+    end
+
+    describe 'DELETE destroy' do
+
         context 'a CensorRule with an associated InfoRequest' do
 
             before(:each) do
                 @censor_rule = FactoryGirl.create(:info_request_censor_rule)
             end
 
+            it 'finds the correct censor rule to destroy' do
+                delete :destroy, :id => @censor_rule.id
+                expect(assigns[:censor_rule]).to eq(@censor_rule)
+            end
+
+            it 'confirms the censor rule is destroyed in all cases' do
+                delete :destroy, :id => @censor_rule.id
+                msg = 'CensorRule was successfully destroyed.'
+                expect(flash[:notice]).to eq(msg)
+            end
+
             it 'purges the cache for the info request' do
                 @controller.should_receive(:expire_for_request).with(@censor_rule.info_request)
-                delete :destroy, :censor_rule_id => @censor_rule.id
+                delete :destroy, :id => @censor_rule.id
             end
 
             it 'redirects to the associated info request' do
-                delete :destroy, :censor_rule_id => @censor_rule.id
-                expect(response).to redirect_to(admin_request_show_path(@censor_rule.info_request))
+                delete :destroy, :id => @censor_rule.id
+                expect(response).to redirect_to(admin_request_path(@censor_rule.info_request))
             end
 
         end
@@ -455,14 +479,25 @@ describe AdminCensorRuleController do
                 @censor_rule = FactoryGirl.create(:user_censor_rule)
             end
 
+            it 'finds the correct censor rule to destroy' do
+                delete :destroy, :id => @censor_rule.id
+                expect(assigns[:censor_rule]).to eq(@censor_rule)
+            end
+
+            it 'confirms the censor rule is destroyed in all cases' do
+                delete :destroy, :id => @censor_rule.id
+                msg = 'CensorRule was successfully destroyed.'
+                expect(flash[:notice]).to eq(msg)
+            end
+
             it 'purges the cache for the user' do
                 @controller.should_receive(:expire_requests_for_user).with(@censor_rule.user)
-                delete :destroy, :censor_rule_id => @censor_rule.id
+                delete :destroy, :id => @censor_rule.id
             end
 
             it 'redirects to the associated info request' do
-                delete :destroy, :censor_rule_id => @censor_rule.id
-                expect(response).to redirect_to(admin_user_show_path(@censor_rule.user))
+                delete :destroy, :id => @censor_rule.id
+                expect(response).to redirect_to(admin_user_path(@censor_rule.user))
             end
 
         end
@@ -474,14 +509,15 @@ end
 describe AdminCensorRuleController, "when making censor rules from the admin interface" do
     render_views
     before { basic_auth_login @request }
-  
+
     it "should create a censor rule and purge the corresponding request from varnish" do
-        ir = info_requests(:fancy_dog_request) 
-        post :create, :censor_rule => {
+        ir = info_requests(:fancy_dog_request)
+        post :create, :request_id => ir.id,
+                      :name_prefix => 'request_',
+                      :censor_rule => {
                          :text => "meat",
                          :replacement => "tofu",
-                         :last_edit_comment => "none",
-                         :info_request_id => ir
+                         :last_edit_comment => "none"
         }
         PurgeRequest.all().first.model_id.should == ir.id
     end