From 2efcff2fd4e4f3ae99e0d9c181c9171742ae2d97 Mon Sep 17 00:00:00 2001
From: Adam Meehan <adam.meehan@gmail.com>
Date: Thu, 23 Sep 2010 21:34:32 +1000
Subject: [PATCH] spec cleaning

---
 .../orm/active_record_spec.rb                 | 21 +++++----
 spec/validates_timeliness/orm/mongoid_spec.rb | 44 ++++++++++---------
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/spec/validates_timeliness/orm/active_record_spec.rb b/spec/validates_timeliness/orm/active_record_spec.rb
index 92b5c2f..27402c9 100644
--- a/spec/validates_timeliness/orm/active_record_spec.rb
+++ b/spec/validates_timeliness/orm/active_record_spec.rb
@@ -1,16 +1,19 @@
 require 'spec_helper'
 
 describe ValidatesTimeliness, 'ActiveRecord' do
-  it 'should define class validation methods' do
-    ActiveRecord::Base.should respond_to(:validates_date)
-    ActiveRecord::Base.should respond_to(:validates_time)
-    ActiveRecord::Base.should respond_to(:validates_datetime)
-  end
 
-  it 'should define instance validation methods' do
-    ActiveRecord::Base.instance_methods.should include('validates_date')
-    ActiveRecord::Base.instance_methods.should include('validates_time')
-    ActiveRecord::Base.instance_methods.should include('validates_datetime')
+  context "validation methods" do
+    it 'should be defined for the class' do
+      ActiveRecord::Base.should respond_to(:validates_date)
+      ActiveRecord::Base.should respond_to(:validates_time)
+      ActiveRecord::Base.should respond_to(:validates_datetime)
+    end
+
+    it 'should defines for the instance' do
+      ActiveRecord::Base.instance_methods.should include('validates_date')
+      ActiveRecord::Base.instance_methods.should include('validates_time')
+      ActiveRecord::Base.instance_methods.should include('validates_datetime')
+    end
   end
 
   it 'should define _timeliness_raw_value_for instance method' do
diff --git a/spec/validates_timeliness/orm/mongoid_spec.rb b/spec/validates_timeliness/orm/mongoid_spec.rb
index a67e699..8d6139e 100644
--- a/spec/validates_timeliness/orm/mongoid_spec.rb
+++ b/spec/validates_timeliness/orm/mongoid_spec.rb
@@ -10,30 +10,32 @@ Mongoid.configure do |config|
   config.persist_in_safe_mode = false
 end
 
+class Article
+  ::ValidatesTimeliness.use_plugin_parser = true
+  include Mongoid::Document
+  field :publish_date, :type => Date
+  field :publish_time, :type => Time
+  field :publish_datetime, :type => DateTime
+  validates_date :publish_date, :allow_nil => true
+  validates_time :publish_time, :allow_nil => true
+  validates_datetime :publish_datetime, :allow_nil => true
+  ::ValidatesTimeliness.use_plugin_parser = false
+end
+
 describe ValidatesTimeliness, 'Mongoid' do
 
-  class Article
-    ::ValidatesTimeliness.use_plugin_parser = true
-    include Mongoid::Document
-    field :publish_date, :type => Date
-    field :publish_time, :type => Time
-    field :publish_datetime, :type => DateTime
-    validates_date :publish_date
-    validates_time :publish_time
-    validates_datetime :publish_datetime
-    ::ValidatesTimeliness.use_plugin_parser = false
-  end
+  context "validation methods" do
+    it 'should be defined on the class' do
+      Article.should respond_to(:validates_date)
+      Article.should respond_to(:validates_time)
+      Article.should respond_to(:validates_datetime)
+    end
 
-  it 'should define class validation methods' do
-    Article.should respond_to(:validates_date)
-    Article.should respond_to(:validates_time)
-    Article.should respond_to(:validates_datetime)
-  end
-
-  it 'should define instance validation methods' do
-    Article.instance_methods.should include('validates_date')
-    Article.instance_methods.should include('validates_time')
-    Article.instance_methods.should include('validates_datetime')
+    it 'should be defined on the instance' do
+      Article.instance_methods.should include('validates_date')
+      Article.instance_methods.should include('validates_time')
+      Article.instance_methods.should include('validates_datetime')
+    end
   end
 
   it 'should define _timeliness_raw_value_for instance method' do