aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--locale/cs/app.po2
-rw-r--r--locale/sq/app.po2
-rw-r--r--locale/uk/app.po2
-rw-r--r--spec/controllers/request_controller_spec.rb15
4 files changed, 18 insertions, 3 deletions
diff --git a/locale/cs/app.po b/locale/cs/app.po
index 078ecd3c9..fde8f9b0d 100644
--- a/locale/cs/app.po
+++ b/locale/cs/app.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
-#
+#
# Translators:
# <appukonrad@gmail.com>, 2012.
# Hana Huntova <>, 2012.
diff --git a/locale/sq/app.po b/locale/sq/app.po
index f8cec0519..879ce2aa4 100644
--- a/locale/sq/app.po
+++ b/locale/sq/app.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
-#
+#
# Translators:
# <ardob11@gmail.com>, 2012.
# <bresta@gmail.com>, 2011.
diff --git a/locale/uk/app.po b/locale/uk/app.po
index 60e59821b..804a9e7b1 100644
--- a/locale/uk/app.po
+++ b/locale/uk/app.po
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
-#
+#
# Translators:
# <murahoid@gmail.com>, 2012.
# Natalie "Mouse" Onyshchenko <murahoid@gmail.com>, 2012.
diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb
index d5c929d3b..4e8a11d45 100644
--- a/spec/controllers/request_controller_spec.rb
+++ b/spec/controllers/request_controller_spec.rb
@@ -881,6 +881,21 @@ describe RequestController, "when changing prominence of a request" do
end.should raise_error(ActiveRecord::RecordNotFound)
end
+ it 'should not generate an HTML version of an attachment whose prominence is hidden/requester
+ only even for the requester or an admin but should return a 404' do
+ ir = info_requests(:fancy_dog_request)
+ ir.prominence = 'hidden'
+ ir.save!
+ receive_incoming_mail('incoming-request-two-same-name.email', ir.incoming_email)
+ session[:user_id] = users(:admin_user).id
+ lambda do
+ get :get_attachment_as_html, :incoming_message_id => ir.incoming_messages[1].id,
+ :id => ir.id,
+ :part => 2,
+ :file_name => ['hello.txt']
+ end.should raise_error(ActiveRecord::RecordNotFound)
+ end
+
end
# XXX do this for invalid ids