Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop

2 files changed, 71 insertions, 0 deletions

diff --git a/spec/models/about_me_validator_spec.rb b/spec/models/about_me_validator_spec.rb
new file mode 100644
index 000000000..5610cead8
--- /dev/null
+++ b/spec/models/about_me_validator_spec.rb
@@ -0,0 +1,53 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe AboutMeValidator do
+
+  describe :new do
+
+    it 'sets each supported attribute on the instance' do
+      params = { :about_me => 'My description' }
+      validator = AboutMeValidator.new(params)
+      expect(validator.about_me).to eq('My description')
+    end
+
+  end
+
+  describe :valid? do
+
+    it 'is valid if about_me is =< 500' do
+      params = { :about_me => 'a'*500 }
+      validator = AboutMeValidator.new(params)
+      expect(validator).to be_valid
+    end
+
+    it 'is valid if about_me is blank' do
+      params = { :about_me => '' }
+      validator = AboutMeValidator.new(params)
+      expect(validator).to be_valid
+    end
+
+    it 'is valid if about_me is nil' do
+      params = { :about_me => nil }
+      validator = AboutMeValidator.new(params)
+      expect(validator).to be_valid
+    end
+
+    it 'is invalid if about_me is > 500' do
+      params = { :about_me => 'a'*501 }
+      validator = AboutMeValidator.new(params)
+      expect(validator).to have(1).error_on(:about_me)
+    end
+
+  end
+
+  describe :about_me do
+
+    it 'has an attribute accessor' do
+      params = { :about_me => 'My description' }
+      validator = AboutMeValidator.new(params)
+      expect(validator.about_me).to eq('My description')
+    end
+
+  end
+
+end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 7dcd3ab8a..2245a024f 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -369,3 +369,21 @@ describe User, "when calculating if a user has exceeded the request limit" do
 
 
 end
+
+describe User do
+
+  describe :banned? do
+
+    it 'is banned if the user has ban_text' do
+      user = FactoryGirl.build(:user, :ban_text => 'banned')
+      expect(user).to be_banned
+    end
+
+    it 'is not banned if the user has no ban_text' do
+      user = FactoryGirl.build(:user, :ban_text => '')
+      expect(user).to_not be_banned
+    end
+
+  end
+
+end