Merge branch 'master' into wdtk

1 files changed, 14 insertions, 3 deletions

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index e31c3f1b5..ec1236a5d 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.type.should == String
+        end
     end
 
+
 end
 
 describe User, " when authenticating" do