2 files changed, 41 insertions, 30 deletions
diff --git a/spec/models/info_request_spec.rb b/spec/models/info_request_spec.rb
index 3eb88b2bb..b2f0a20fc 100644
--- a/spec/models/info_request_spec.rb
+++ b/spec/models/info_request_spec.rb
@@ -454,6 +454,33 @@ describe InfoRequest do
 
     end
 
+    describe 'when an instance is asked if all can view it' do
+
+        before do
+            @info_request = InfoRequest.new
+        end
+
+        it 'should return true if its prominence is normal' do
+            @info_request.prominence = 'normal'
+            @info_request.all_can_view?.should == true
+        end
+
+        it 'should return true if its prominence is backpage' do
+            @info_request.prominence = 'backpage'
+            @info_request.all_can_view?.should == true
+        end
+
+        it 'should return false if its prominence is hidden' do
+            @info_request.prominence = 'hidden'
+            @info_request.all_can_view?.should == false
+        end
+
+        it 'should return false if its prominence is requester_only' do
+            @info_request.prominence = 'requester_only'
+            @info_request.all_can_view?.should == false
+        end
+    end
+
     describe 'when applying censor rules' do
 
         before do
@@ -537,32 +564,5 @@ describe InfoRequest do
 
     end
 
-    describe 'when an instance is asked if all can view it' do
-
-        before do
-            @info_request = InfoRequest.new
-        end
-
-        it 'should return true if its prominence is normal' do
-            @info_request.prominence = 'normal'
-            @info_request.all_can_view?.should == true
-        end
-
-        it 'should return true if its prominence is backpage' do
-            @info_request.prominence = 'backpage'
-            @info_request.all_can_view?.should == true
-        end
-
-        it 'should return false if its prominence is hidden' do
-            @info_request.prominence = 'hidden'
-            @info_request.all_can_view?.should == false
-        end
-
-        it 'should return false if its prominence is requester_only' do
-            @info_request.prominence = 'requester_only'
-            @info_request.all_can_view?.should == false
-        end
-
-    end
 
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 651ba4b65..96c169604 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -27,11 +27,22 @@ describe User, "showing the name" do
         @user.name.should == 'Some Name'
     end
 
-    it 'should show if user has been banned' do
-        @user.ban_text = "Naughty user"
-        @user.name.should == 'Some Name (Account suspended)'
+    describe  'if user has been banned' do
+
+        before do
+            @user.ban_text = "Naughty user"
+        end
+
+        it 'should show an "Account suspended" suffix' do
+            @user.name.should == 'Some Name (Account suspended)'
+        end
+
+        it 'should return a string when the user has been banned, not a SafeBuffer' do
+            @user.name.class.should == String
+        end
     end
 
+
 end
 
 describe User, " when authenticating" do