From 57b0fc86d03fe2ecf1036d6453391c4763eba6b4 Mon Sep 17 00:00:00 2001
From: louise <louise>
Date: Tue, 14 Apr 2009 09:44:06 +0000
Subject: Moving view specs to more standard place, moving helper method inside
 spec scope - will run more reliably when specs run in different orders

---
 spec/views/request/list.rhtml_spec.rb | 50 +++++++++++++++++++++++++++++++++++
 spec/views/request_view_spec.rb       | 50 -----------------------------------
 2 files changed, 50 insertions(+), 50 deletions(-)
 create mode 100644 spec/views/request/list.rhtml_spec.rb
 delete mode 100644 spec/views/request_view_spec.rb

diff --git a/spec/views/request/list.rhtml_spec.rb b/spec/views/request/list.rhtml_spec.rb
new file mode 100644
index 000000000..b171c5815
--- /dev/null
+++ b/spec/views/request/list.rhtml_spec.rb
@@ -0,0 +1,50 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe "when listing recent requests" do
+  
+    before do
+        @xap = mock_model(ActsAsXapian::Search)
+        @xap.stub!(:matches_estimated).and_return(2)
+        @xap.stub!(:results).and_return([
+          { :model => mock_event },
+          { :model => mock_event }
+        ])
+        assigns[:xapian_object] = @xap
+        assigns[:page] = 1
+        assigns[:per_page] = 10
+    end
+      
+    def mock_event 
+        return mock_model(InfoRequestEvent, 
+            :info_request => mock_model(InfoRequest, 
+                :title => 'Title', 
+                :url_title => 'title',
+                :display_status => 'awaiting_response',
+                :calculate_status => 'awaiting_response',
+                :public_body => mock_model(PublicBody, :name => 'Test Quango', :url_name => 'testquango'),
+                :user => mock_model(User, :name => 'Test User', :url_name => 'testuser')
+            ),
+            :incoming_message => nil,
+            :outgoing_message => nil,
+            :comment => nil,
+            :event_type => 'sent',
+            :created_at => Time.now - 4.days,
+            :search_text_main => ''
+        )
+    end
+
+    it "should be successful" do
+        render "request/list"
+        response.should have_tag("div.request_listing")
+        response.should_not have_tag("p", /No requests of this sort yet/m)
+    end
+
+    it "should cope with no results" do
+        @xap.stub!(:results).and_return([])
+        render "request/list"
+        response.should have_tag("p", /No requests of this sort yet/m)
+        response.should_not have_tag("div.request_listing")
+    end
+
+end
+
diff --git a/spec/views/request_view_spec.rb b/spec/views/request_view_spec.rb
deleted file mode 100644
index c20023e6a..000000000
--- a/spec/views/request_view_spec.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe "when listing recent requests" do
-
-    before do
-        @xap = mock_model(ActsAsXapian::Search)
-        @xap.stub!(:matches_estimated).and_return(2)
-        @xap.stub!(:results).and_return([
-          { :model => mock_event },
-          { :model => mock_event }
-        ])
-        assigns[:xapian_object] = @xap
-        assigns[:page] = 1
-        assigns[:per_page] = 10
-    end
-
-    it "should be successful" do
-        render "request/list"
-        response.should have_tag("div.request_listing")
-        response.should_not have_tag("p", /No requests of this sort yet/m)
-
-    end
-
-    it "should cope with no results" do
-        @xap.stub!(:results).and_return([])
-        render "request/list"
-        response.should have_tag("p", /No requests of this sort yet/m)
-        response.should_not have_tag("div.request_listing")
-    end
-
-end
-
-def mock_event 
-    return mock_model(InfoRequestEvent, 
-        :info_request => mock_model(InfoRequest, 
-            :title => 'Title', 
-            :url_title => 'title',
-            :display_status => 'awaiting_response',
-            :calculate_status => 'awaiting_response',
-            :public_body => mock_model(PublicBody, :name => 'Test Quango', :url_name => 'testquango'),
-            :user => mock_model(User, :name => 'Test User', :url_name => 'testuser')
-        ),
-        :incoming_message => nil,
-        :outgoing_message => nil,
-        :comment => nil,
-        :event_type => 'sent',
-        :created_at => Time.now - 4.days,
-        :search_text_main => ''
-    )
-end
-- 
cgit v1.2.3