Merge branch 'release/0.18' into wdtk

1 files changed, 47 insertions, 2 deletions

diff --git a/spec/models/contact_validator_spec.rb b/spec/models/contact_validator_spec.rb
index 9ea0fac49..0f5403967 100644
--- a/spec/models/contact_validator_spec.rb
+++ b/spec/models/contact_validator_spec.rb
@@ -1,8 +1,53 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe ContactValidator, " when blah" do
-    before do
+describe ContactValidator do
+
+    describe :new do
+
+        let(:valid_params) do
+            { :name => "Vinny Vanilli",
+              :email => "vinny@localhost",
+              :subject => "Why do I have such an ace name?",
+              :message => "You really should know!!!\n\nVinny" }
+        end
+
+        it 'validates specified attributes' do
+            ContactValidator.new(valid_params).should be_valid
+        end
+
+        it 'validates name is present' do
+            valid_params.except!(:name)
+            validator = ContactValidator.new(valid_params)
+            expect(validator).to have(1).error_on(:name)
+        end
+
+        it 'validates email is present' do
+            valid_params.except!(:email)
+            validator = ContactValidator.new(valid_params)
+            # We have 2 errors on email because of the format validator
+            expect(validator).to have(2).errors_on(:email)
+        end
+
+        it 'validates email format' do
+            valid_params.merge!({:email => 'not-an-email'})
+            validator = ContactValidator.new(valid_params)
+            expect(validator.errors_on(:email)).to include("Email doesn't look like a valid address")
+        end
+
+        it 'validates subject is present' do
+            valid_params.except!(:subject)
+            validator = ContactValidator.new(valid_params)
+            expect(validator).to have(1).error_on(:subject)
+        end
+
+        it 'validates message is present' do
+            valid_params.except!(:message)
+            validator = ContactValidator.new(valid_params)
+            expect(validator).to have(1).error_on(:message)
+        end
+
     end
+
 end