Rename controller actions

5 files changed, 16 insertions, 16 deletions

diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index cf1ad19e7..070a91421 100644
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -1,5 +1,5 @@
 class ReportsController < ApplicationController
-    def report_request
+    def create
         info_request = InfoRequest.find_by_url_title!(params[:url_title])
         if !authenticated_user
             flash[:notice] = _("You need to be logged in to report a request for administrator attention")
@@ -12,7 +12,7 @@ class ReportsController < ApplicationController
         redirect_to request_url(info_request)
     end
 
-    def new_report_request
+    def new
         @info_request = InfoRequest.find_by_url_title!(params[:url_title])
         if authenticated?(
             :web => _("To report this request"),
diff --git a/app/views/reports/new_report_request.html.erb b/app/views/reports/new.html.erb
index 11b682282..11b682282 100644
--- a/app/views/reports/new_report_request.html.erb
+++ b/app/views/reports/new.html.erb
diff --git a/config/routes.rb b/config/routes.rb
index 4ba74f681..0d36cbf82 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -60,8 +60,8 @@ Alaveteli::Application.routes.draw do
     match '/request/:url_title/download' => 'request#download_entire_request', :as => :download_entire_request
     ####
 
-    match '/request/:url_title/report' => 'reports#report_request', :as => :request_report, :via => :post
-    match '/request/:url_title/report/new' => 'reports#new_report_request', :as => :new_request_report
+    match '/request/:url_title/report' => 'reports#create', :as => :request_report, :via => :post
+    match '/request/:url_title/report/new' => 'reports#new', :as => :new_request_report
 
     #### User controller
     # Use /profile for things to do with the currently signed in user.
diff --git a/spec/controllers/reports_controller_spec.rb b/spec/controllers/reports_controller_spec.rb
index c53748df2..61e35c065 100644
--- a/spec/controllers/reports_controller_spec.rb
+++ b/spec/controllers/reports_controller_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe ReportsController, "when reporting a request when not logged in" do
     it "should only allow logged-in users to report requests" do
-        post :report_request, :url_title => info_requests(:badger_request).url_title
+        post :create, :url_title => info_requests(:badger_request).url_title
 
         flash[:notice].should =~ /You need to be logged in/
         response.should redirect_to show_request_path(:url_title => info_requests(:badger_request).url_title)
@@ -19,7 +19,7 @@ describe ReportsController, "when reporting a request (logged in)" do
 
     it "should 404 for non-existent requests" do
       lambda {
-        post :report_request, :url_title => "hjksfdhjk_louytu_qqxxx"
+        post :create, :url_title => "hjksfdhjk_louytu_qqxxx"
       }.should raise_error(ActiveRecord::RecordNotFound)
     end
 
@@ -28,7 +28,7 @@ describe ReportsController, "when reporting a request (logged in)" do
         title = ir.url_title
         ir.attention_requested.should == false
 
-        post :report_request, :url_title => title
+        post :create, :url_title => title
         response.should redirect_to show_request_path(:url_title => title)
 
         ir.reload
@@ -40,16 +40,16 @@ describe ReportsController, "when reporting a request (logged in)" do
         info_request = mock_model(InfoRequest, :url_title => "foo", :attention_requested= => nil, :save! => nil)
         InfoRequest.should_receive(:find_by_url_title!).with("foo").and_return(info_request)
         info_request.should_receive(:report!).with("Not valid request", "It's just not", @user)
-        post :report_request, :url_title => "foo", :reason => "Not valid request", :message => "It's just not"
+        post :create, :url_title => "foo", :reason => "Not valid request", :message => "It's just not"
     end
 
     it "should not allow a request to be reported twice" do
         title = info_requests(:badger_request).url_title
 
-        post :report_request, :url_title => title
+        post :create, :url_title => title
         response.should redirect_to show_request_url(:url_title => title)
 
-        post :report_request, :url_title => title
+        post :create, :url_title => title
         response.should redirect_to show_request_url(:url_title => title)
         flash[:notice].should =~ /has already been reported/
     end
@@ -57,7 +57,7 @@ describe ReportsController, "when reporting a request (logged in)" do
     it "should send an email from the reporter to admins" do
         ir = info_requests(:badger_request)
         title = ir.url_title
-        post :report_request, :url_title => title
+        post :create, :url_title => title
         deliveries = ActionMailer::Base.deliveries
         deliveries.size.should == 1
         mail = deliveries[0]
@@ -75,8 +75,8 @@ describe ReportsController, "#new_report_request" do
 
     context "not logged in" do
         it "should require the user to be logged in" do
-            get :new_report_request, :url_title => "foo"
-            response.should_not render_template("new_report_request")
+            get :new, :url_title => "foo"
+            response.should_not render_template("new")
         end
     end
 
@@ -85,8 +85,8 @@ describe ReportsController, "#new_report_request" do
             session[:user_id] = users(:bob_smith_user).id
         end
         it "should show the form" do
-            get :new_report_request, :url_title => "foo"
-            response.should render_template("new_report_request")
+            get :new, :url_title => "foo"
+            response.should render_template("new")
         end
     end
 end
diff --git a/spec/views/reports/new_report_request.html.erb_spec.rb b/spec/views/reports/new.erb_spec.rb
index 806bf74c0..3045d135d 100644
--- a/spec/views/reports/new_report_request.html.erb_spec.rb
+++ b/spec/views/reports/new.erb_spec.rb
@@ -1,6 +1,6 @@
 require File.expand_path(File.join('..', '..', '..', 'spec_helper'), __FILE__)
 
-describe 'reports/new_report_request.html.erb' do
+describe 'reports/new.html.erb' do
   let(:info_request) { mock_model(InfoRequest, :url_title => "foo") }
   before :each do
     assign(:info_request, info_request)