1 files changed, 42 insertions, 32 deletions
diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb
index b220d05f3..6e5498a9f 100644
--- a/spec/controllers/request_controller_spec.rb
+++ b/spec/controllers/request_controller_spec.rb
@@ -552,38 +552,48 @@ describe RequestController, "when showing one request" do
             end
         end
 
-        it "should make a zipfile available, which has a different URL when it changes" do
-            title = 'why_do_you_have_such_a_fancy_dog'
-            ir = info_requests(:fancy_dog_request)
-            session[:user_id] = ir.user.id # bob_smith_user
-            get :download_entire_request, :url_title => title
-            assigns[:url_path].should have_text(/#{title}.zip$/)
-            old_path = assigns[:url_path]
-            response.location.should have_text(/#{assigns[:url_path]}$/)
-            zipfile = Zip::ZipFile.open(File.join(File.dirname(__FILE__), "../../cache/zips", old_path)) { |zipfile|
-                zipfile.count.should == 1 # just the message
-            }
-            receive_incoming_mail('incoming-request-two-same-name.email', ir.incoming_email)
-            get :download_entire_request, :url_title => title
-            assigns[:url_path].should have_text(/#{title}.zip$/)
-            old_path = assigns[:url_path]
-            response.location.should have_text(/#{assigns[:url_path]}$/)
-            zipfile = Zip::ZipFile.open(File.join(File.dirname(__FILE__), "../../cache/zips", old_path)) { |zipfile|
-                zipfile.count.should == 3 # the message plus two "hello.txt" files
-            }
-
-            # The path of the zip file is based on the hash of the timestamp of the last request
-            # in the thread, so we wait for a second to make sure this one will have a different
-            # timestamp than the previous.
-            sleep 1
-            receive_incoming_mail('incoming-request-attachment-unknown-extension.email', ir.incoming_email)
-            get :download_entire_request, :url_title => title
-            assigns[:url_path].should have_text(/#{title}.zip$/)
-            assigns[:url_path].should_not == old_path
-            response.location.should have_text(/#{assigns[:url_path]}/)
-            zipfile = Zip::ZipFile.open(File.join(File.dirname(__FILE__), "../../cache/zips", assigns[:url_path])) { |zipfile|
-                zipfile.count.should == 5 # the message, two hello.txt, the unknown attachment, and its empty message
-            }
+        describe 'when making a zipfile available' do
+
+            it "should have a different zipfile URL when the request changes" do
+                title = 'why_do_you_have_such_a_fancy_dog'
+                ir = info_requests(:fancy_dog_request)
+                session[:user_id] = ir.user.id # bob_smith_user
+                get :download_entire_request, :url_title => title
+                assigns[:url_path].should have_text(/#{title}.zip$/)
+                old_path = assigns[:url_path]
+                response.location.should have_text(/#{assigns[:url_path]}$/)
+                zipfile = Zip::ZipFile.open(File.join(File.dirname(__FILE__), "../../cache/zips", old_path)) { |zipfile|
+                    zipfile.count.should == 1 # just the message
+                }
+                receive_incoming_mail('incoming-request-two-same-name.email', ir.incoming_email)
+                get :download_entire_request, :url_title => title
+                assigns[:url_path].should have_text(/#{title}.zip$/)
+                old_path = assigns[:url_path]
+                response.location.should have_text(/#{assigns[:url_path]}$/)
+                zipfile = Zip::ZipFile.open(File.join(File.dirname(__FILE__), "../../cache/zips", old_path)) { |zipfile|
+                    zipfile.count.should == 3 # the message plus two "hello.txt" files
+                }
+
+                # The path of the zip file is based on the hash of the timestamp of the last request
+                # in the thread, so we wait for a second to make sure this one will have a different
+                # timestamp than the previous.
+                sleep 1
+                receive_incoming_mail('incoming-request-attachment-unknown-extension.email', ir.incoming_email)
+                get :download_entire_request, :url_title => title
+                assigns[:url_path].should have_text(/#{title}.zip$/)
+                assigns[:url_path].should_not == old_path
+                response.location.should have_text(/#{assigns[:url_path]}/)
+                zipfile = Zip::ZipFile.open(File.join(File.dirname(__FILE__), "../../cache/zips", assigns[:url_path])) { |zipfile|
+                    zipfile.count.should == 5 # the message, two hello.txt, the unknown attachment, and its empty message
+                }
+            end
+
+            it 'should successfully make a zipfile for an external request' do
+                info_request = info_requests(:external_request)
+                get :download_entire_request, { :url_title => info_request.url_title },
+                                              { :user_id => users(:bob_smith_user) }
+                response.location.should have_text(/#{assigns[:url_path]}/)
+            end
         end
     end
 end