Merge branch 'release/0.16'0.16

1 files changed, 11 insertions, 42 deletions

diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb
index 116dbe07a..7590a5b42 100644
--- a/spec/controllers/general_controller_spec.rb
+++ b/spec/controllers/general_controller_spec.rb
@@ -42,6 +42,17 @@ describe GeneralController, 'when getting the blog feed' do
         assigns[:blog_items].count.should == 1
     end
 
+    context 'if no feed is configured' do
+
+        before do
+            AlaveteliConfiguration.stub!(:blog_feed).and_return('')
+        end
+
+        it 'should raise an ActiveRecord::RecordNotFound error' do
+            lambda{ get :blog }.should raise_error(ActiveRecord::RecordNotFound)
+        end
+    end
+
 end
 
 describe GeneralController, "when showing the frontpage" do
@@ -116,49 +127,7 @@ describe GeneralController, "when showing the frontpage" do
     end
 
 end
-describe GeneralController, "when showing the front page with fixture data" do
-
-    describe 'when constructing the list of recent requests' do
-
-        before(:each) do
-            get_fixtures_xapian_index
-        end
-
-        describe 'when there are fewer than five successful requests' do
-
-            it 'should list the most recently sent and successful requests by the creation date of the
-                request event' do
-                # Make sure the newest response is listed first even if a request
-                # with an older response has a newer comment or was reclassified more recently:
-                # https://github.com/mysociety/alaveteli/issues/370
-                #
-                # This is a deliberate behaviour change, in that the
-                # previous behaviour (showing more-recently-reclassified
-                # requests first) was intentional.
-                get :frontpage
-
-                request_events = assigns[:request_events]
-                previous = nil
-                request_events.each do |event|
-                    if previous
-                        previous.created_at.should be >= event.created_at
-                    end
-                    ['sent', 'response'].include?(event.event_type).should be_true
-                    if event.event_type == 'response'
-                        ['successful', 'partially_successful'].include?(event.calculated_state).should be_true
-                    end
-                    previous = event
-                end
-            end
-        end
-
-        it 'should coalesce duplicate requests' do
-            get :frontpage
-            assigns[:request_events].map(&:info_request).select{|x|x.url_title =~ /^spam/}.length.should == 1
-        end
-    end
 
-end
 
 describe GeneralController, 'when using xapian search' do