Merge branch 'replace-xxx-todo' into rails-3-develop

4 files changed, 20 insertions, 20 deletions

diff --git a/spec/controllers/comment_controller_spec.rb b/spec/controllers/comment_controller_spec.rb
index 5e250f689..480c85ad7 100644
--- a/spec/controllers/comment_controller_spec.rb
+++ b/spec/controllers/comment_controller_spec.rb
@@ -26,7 +26,7 @@ describe CommentController, "when commenting on a request" do
         post :new, params
         post_redirect = PostRedirect.get_last_post_redirect
         response.should redirect_to(:controller => 'user', :action => 'signin', :token => post_redirect.token)
-        # post_redirect.post_params.should == params # XXX get this working. there's a : vs '' problem amongst others
+        # post_redirect.post_params.should == params # TODO: get this working. there's a : vs '' problem amongst others
     end
 
     it "should create the comment, and redirect to request page when input is good and somebody is logged in" do
diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb
index 070511fb0..48f37a45c 100644
--- a/spec/controllers/request_controller_spec.rb
+++ b/spec/controllers/request_controller_spec.rb
@@ -77,7 +77,7 @@ describe RequestController, "when changing things that appear on the request pag
         PurgeRequest.all().count.should == 0
     end
     it "should purge the downstream cache when censor rules have changed" do
-        # XXX really, CensorRules should execute expiry logic as part
+        # TODO: really, CensorRules should execute expiry logic as part
         # of the after_save of the model. Currently this is part of
         # the AdminCensorRuleController logic, so must be tested from
         # there. Leaving this stub test in place as a reminder
@@ -643,7 +643,7 @@ describe RequestController, "when showing one request" do
             ir = info_requests(:fancy_dog_request)
             receive_incoming_mail('incoming-request-two-same-name.email', ir.incoming_email)
 
-            # XXX this is horrid, but don't know a better way.  If we
+            # TODO: this is horrid, but don't know a better way.  If we
             # don't do this, the info_request_event to which the
             # info_request is attached still uses the unmodified
             # version from the fixture.
@@ -900,7 +900,7 @@ describe RequestController, "when handling prominence" do
 
 end
 
-# XXX do this for invalid ids
+# TODO: do this for invalid ids
 #  it "should render 404 file" do
 #    response.should render_template("#{Rails.root}/public/404.html")
 #    response.headers["Status"].should == "404 Not Found"
@@ -1004,7 +1004,7 @@ describe RequestController, "when creating a new request" do
         post :new, params
         post_redirect = PostRedirect.get_last_post_redirect
         response.should redirect_to(:controller => 'user', :action => 'signin', :token => post_redirect.token)
-        # post_redirect.post_params.should == params # XXX get this working. there's a : vs '' problem amongst others
+        # post_redirect.post_params.should == params # TODO: get this working. there's a : vs '' problem amongst others
     end
 
     it 'redirects to the frontpage if the action is sent the invalid
@@ -1804,7 +1804,7 @@ describe RequestController, "when sending a followup message" do
         session[:user_id] = users(:bob_smith_user).id
         post :show_response, :outgoing_message => { :body => "", :what_doing => 'normal_sort'}, :id => info_requests(:fancy_dog_request).id, :incoming_message_id => incoming_messages(:useless_incoming_message), :submitted_followup => 1
 
-        # XXX how do I check the error message here?
+        # TODO: how do I check the error message here?
         response.should render_template('show_response')
     end
 
@@ -1854,13 +1854,13 @@ describe RequestController, "when sending a followup message" do
 
         # second time should give an error
         post :show_response, :outgoing_message => { :body => "Stop repeating yourself!", :what_doing => 'normal_sort' }, :id => info_requests(:fancy_dog_request).id, :incoming_message_id => incoming_messages(:useless_incoming_message), :submitted_followup => 1
-        # XXX how do I check the error message here?
+        # TODO: how do I check the error message here?
         response.should render_template('show_response')
     end
 
 end
 
-# XXX Stuff after here should probably be in request_mailer_spec.rb - but then
+# TODO: Stuff after here should probably be in request_mailer_spec.rb - but then
 # it can't check the URLs in the emails I don't think, ugh.
 
 describe RequestController, "sending overdue request alerts" do
@@ -1889,7 +1889,7 @@ describe RequestController, "sending overdue request alerts" do
         mail_token = $2
 
         session[:user_id].should be_nil
-        controller.test_code_redirect_by_email_token(mail_token, self) # XXX hack to avoid having to call User controller for email link
+        controller.test_code_redirect_by_email_token(mail_token, self) # TODO: hack to avoid having to call User controller for email link
         session[:user_id].should == info_requests(:naughty_chicken_request).user.id
 
         response.should render_template('show_response')
@@ -1946,7 +1946,7 @@ describe RequestController, "sending overdue request alerts" do
         mail_token = $2
 
         session[:user_id].should be_nil
-        controller.test_code_redirect_by_email_token(mail_token, self) # XXX hack to avoid having to call User controller for email link
+        controller.test_code_redirect_by_email_token(mail_token, self) # TODO: hack to avoid having to call User controller for email link
         session[:user_id].should == info_requests(:naughty_chicken_request).user.id
 
         response.should render_template('show_response')
@@ -2028,12 +2028,12 @@ describe RequestController, "sending unclassified new response reminder alerts"
         mail_token = $2
 
         session[:user_id].should be_nil
-        controller.test_code_redirect_by_email_token(mail_token, self) # XXX hack to avoid having to call User controller for email link
+        controller.test_code_redirect_by_email_token(mail_token, self) # TODO: hack to avoid having to call User controller for email link
         session[:user_id].should == info_requests(:fancy_dog_request).user.id
 
         response.should render_template('show')
         assigns[:info_request].should == info_requests(:fancy_dog_request)
-        # XXX should check anchor tag here :) that it goes to last new response
+        # TODO: should check anchor tag here :) that it goes to last new response
     end
 
 end
@@ -2064,7 +2064,7 @@ describe RequestController, "clarification required alerts" do
         mail_token = $2
 
         session[:user_id].should be_nil
-        controller.test_code_redirect_by_email_token(mail_token, self) # XXX hack to avoid having to call User controller for email link
+        controller.test_code_redirect_by_email_token(mail_token, self) # TODO: hack to avoid having to call User controller for email link
         session[:user_id].should == info_requests(:fancy_dog_request).user.id
 
         response.should render_template('show_response')
diff --git a/spec/controllers/track_controller_spec.rb b/spec/controllers/track_controller_spec.rb
index d2b45b6bf..29f5c7fe1 100644
--- a/spec/controllers/track_controller_spec.rb
+++ b/spec/controllers/track_controller_spec.rb
@@ -122,11 +122,11 @@ describe TrackController, "when sending alerts for a track" do
 
         mail.body.should =~ /This a the daftest comment the world has ever seen/ # comment text included
         # Check subscription managing link
-# XXX We can't do this, as it is redirecting to another controller. I'm
+# TODO: We can't do this, as it is redirecting to another controller. I'm
 # apparently meant to be writing controller unit tests here, not functional
 # tests.  Bah, I so don't care, bit of an obsessive constraint.
 #        session[:user_id].should be_nil
-#        controller.test_code_redirect_by_email_token(mail_token, self) # XXX hack to avoid having to call User controller for email link
+#        controller.test_code_redirect_by_email_token(mail_token, self) # TODO: hack to avoid having to call User controller for email link
 #        session[:user_id].should == users(:silly_name_user).id
 #
 #        response.should render_template('users/show')
@@ -173,7 +173,7 @@ describe TrackController, "when viewing RSS feed for a track" do
         get :track_request, :feed => 'feed', :url_title => track_thing.info_request.url_title
         response.should render_template('track/atom_feed')
         response.content_type.should == 'application/atom+xml'
-        # XXX should check it is an atom.builder type being rendered, not sure how to
+        # TODO: should check it is an atom.builder type being rendered, not sure how to
 
         assigns[:xapian_object].matches_estimated.should == 3
         assigns[:xapian_object].results.size.should == 3
diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb
index cf361d898..6ecdf1ad4 100644
--- a/spec/controllers/user_controller_spec.rb
+++ b/spec/controllers/user_controller_spec.rb
@@ -1,7 +1,7 @@
 # coding: utf-8
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-# XXX Use route_for or params_from to check /c/ links better
+# TODO: Use route_for or params_from to check /c/ links better
 # http://rspec.rubyforge.org/rspec-rails/1.1.12/classes/Spec/Rails/Example/ControllerExampleGroup.html
 describe UserController, "when redirecting a show request to a canonical url" do
 
@@ -327,7 +327,7 @@ describe UserController, "when signing up" do
         deliveries[0].body.should match(/when\s+you\s+already\s+have\s+an/)
     end
 
-    # XXX need to do bob@localhost signup and check that sends different email
+    # TODO: need to do bob@localhost signup and check that sends different email
 end
 
 describe UserController, "when signing out" do
@@ -380,7 +380,7 @@ describe UserController, "when sending another user a message" do
         mail = deliveries[0]
         mail.body.should include("Bob Smith has used #{AlaveteliConfiguration::site_name} to send you the message below")
         mail.body.should include("Just a test!")
-        #mail.to_addrs.first.to_s.should == users(:silly_name_user).name_and_email # XXX fix some nastiness with quoting name_and_email
+        #mail.to_addrs.first.to_s.should == users(:silly_name_user).name_and_email # TODO: fix some nastiness with quoting name_and_email
         mail.from_addrs.first.to_s.should == users(:bob_smith_user).email
     end
 
@@ -651,7 +651,7 @@ describe UserController, "when using profile photos" do
         @user.profile_photo.should_not be_nil
     end
 
-    # XXX todo check the two stage javascript cropping (above only tests one stage non-javascript one)
+    # TODO: todo check the two stage javascript cropping (above only tests one stage non-javascript one)
 end
 
 describe UserController, "when showing JSON version for API" do