validates_overlap 0.6.0 → 0.7.0

data/spec/dummy/spec/models/shift_spec.rb

@@ -2,42 +2,41 @@ require_relative '../../../spec_helper'
 require_relative '../factories/shift'
 
 describe Meeting do
-
-  context "Validation" do
-    before(:all) do
-      Shift.delete_all
-    end
-
-    it "create meeting" do
-      lambda {
+  context 'Validation' do
+    it 'create meeting' do
+      expect do
         FactoryGirl.create(:shift)
-      }.should change(Shift, :count).by(1)
-    end
-
-    it "is not valid if exists shift within wider range" do
-      shift = FactoryGirl.build(:shift, :starts_at => "2011-01-09".to_date, :ends_at => "2011-01-11".to_date)
-      shift.should_not be_valid
-      shift.errors[:starts_at].should_not be_empty
-      shift.errors[:ends_at].should be_empty
-
-      shift = FactoryGirl.build(:shift, :starts_at => "2011-01-01".to_date, :ends_at => "2011-01-04".to_date)
-      shift.should_not be_valid
-      shift.errors[:starts_at].should_not be_empty
-      shift.errors[:ends_at].should be_empty
+      end.to change(Shift, :count).by(1)
     end
 
-    it " validate object which has not got overlap" do
-      shift = FactoryGirl.build(:shift, :starts_at => "2011-01-10".to_date, :ends_at => "2011-01-11".to_date)
-      shift.should be_valid
-      shift.errors[:starts_at].should be_empty
-      shift.errors[:ends_at].should be_empty
-
-      shift = FactoryGirl.build(:shift, :starts_at => "2011-01-01".to_date, :ends_at => "2011-01-02".to_date)
-      shift.should be_valid
-      shift.errors[:starts_at].should be_empty
-      shift.errors[:ends_at].should be_empty
+    context 'validation with shift configuration' do
+      before do
+        FactoryGirl.create(:shift)
+      end
+
+      it 'is not valid if exists shift within wider range' do
+        shift = FactoryGirl.build(:shift, starts_at: '2011-01-09'.to_date, ends_at: '2011-01-11'.to_date)
+        expect(shift).not_to be_valid
+        expect(shift.errors[:starts_at]).not_to be_empty
+        expect(shift.errors[:ends_at]).to be_empty
+
+        shift = FactoryGirl.build(:shift, starts_at: '2011-01-01'.to_date, ends_at: '2011-01-04'.to_date)
+        expect(shift).not_to be_valid
+        expect(shift.errors[:starts_at]).not_to be_empty
+        expect(shift.errors[:ends_at]).to be_empty
+      end
+
+      it ' validate object which has not got overlap' do
+        shift = FactoryGirl.build(:shift, starts_at: '2011-01-10'.to_date, ends_at: '2011-01-11'.to_date)
+        expect(shift).to be_valid
+        expect(shift.errors[:starts_at]).to be_empty
+        expect(shift.errors[:ends_at]).to be_empty
+
+        shift = FactoryGirl.build(:shift, starts_at: '2011-01-01'.to_date, ends_at: '2011-01-02'.to_date)
+        expect(shift).to be_valid
+        expect(shift.errors[:starts_at]).to be_empty
+        expect(shift.errors[:ends_at]).to be_empty
+      end
     end
-
   end
-
 end

data/spec/dummy/spec/models/start_end_overlap_meeting_spec.rb

@@ -2,51 +2,48 @@ require_relative '../../../spec_helper'
 require_relative '../factories/start_end_overlap_meeting'
 
 describe StartEndOverlapMeeting do
-
-  before(:all) do
-    StartEndOverlapMeeting.delete_all
+  it 'create meeting' do
+    expect do
+      FactoryGirl.create(:start_end_overlap_meeting)
+    end.to change(StartEndOverlapMeeting, :count).by(1)
   end
 
-  it "create meeting" do
-    lambda {
+  context 'Validation with exclude edges starts_at, ends_at' do
+    before do
       FactoryGirl.create(:start_end_overlap_meeting)
-    }.should change(StartEndOverlapMeeting, :count).by(1)
-  end
+    end
 
-  context "Validation with exclude edges starts_at, ends_at" do
-   @valid_times = {
-      "starts before and ends at time of start" => ['2011-01-03'.to_date, '2011-01-05'.to_date],
-      "starts at time of end and ends after" => ['2011-01-08'.to_date, '2011-01-19'.to_date]
+    @valid_times = {
+      'starts before and ends at time of start' => ['2011-01-03'.to_date, '2011-01-05'.to_date],
+      'starts at time of end and ends after' => ['2011-01-08'.to_date, '2011-01-19'.to_date]
     }
 
     @not_valid_times = {
-          "has same starts_at and ends_at" => ['2011-01-05'.to_date, '2011-01-08'.to_date],
-          "starts before starts_at and ends after ends_at" => ['2011-01-04'.to_date, '2011-01-09'.to_date],
-          "starts before starts_at and ends inside" => ['2011-01-04'.to_date, '2011-01-06'.to_date],
-          "starts inside and ends after ends_at" => ['2011-01-06'.to_date, '2011-01-09'.to_date],
-          "starts inside and ends inside" => ['2011-01-06'.to_date, '2011-01-07'.to_date],
-          "starts at same time and ends inside" => ['2011-01-05'.to_date, '2011-01-07'.to_date],
-          "starts inside and ends at same time" => ['2011-01-06'.to_date, '2011-01-08'.to_date],
-      }
+      'has same starts_at and ends_at' => ['2011-01-05'.to_date, '2011-01-08'.to_date],
+      'starts before starts_at and ends after ends_at' => ['2011-01-04'.to_date, '2011-01-09'.to_date],
+      'starts before starts_at and ends inside' => ['2011-01-04'.to_date, '2011-01-06'.to_date],
+      'starts inside and ends after ends_at' => ['2011-01-06'.to_date, '2011-01-09'.to_date],
+      'starts inside and ends inside' => ['2011-01-06'.to_date, '2011-01-07'.to_date],
+      'starts at same time and ends inside' => ['2011-01-05'.to_date, '2011-01-07'.to_date],
+      'starts inside and ends at same time' => ['2011-01-06'.to_date, '2011-01-08'.to_date]
+    }
 
     @not_valid_times.each do |description, time_range|
       it "is not valid if exists meeting which #{description}" do
-        meeting = FactoryGirl.build(:start_end_overlap_meeting, :starts_at => time_range.first, :ends_at => time_range.last)
-        meeting.should_not be_valid
-        meeting.errors[:starts_at].should_not be_empty
-        meeting.errors[:ends_at].should be_empty
+        meeting = FactoryGirl.build(:start_end_overlap_meeting, starts_at: time_range.first, ends_at: time_range.last)
+        expect(meeting).not_to be_valid
+        expect(meeting.errors[:starts_at]).not_to be_empty
+        expect(meeting.errors[:ends_at]).to be_empty
       end
     end
 
     @valid_times.each do |description, time_range|
       it "is valid if exists meeting which #{description}" do
-        meeting = FactoryGirl.build(:start_end_overlap_meeting, :starts_at => time_range.first, :ends_at => time_range.last)
-        meeting.should be_valid
-        meeting.errors[:starts_at].should be_empty
-        meeting.errors[:ends_at].should be_empty
+        meeting = FactoryGirl.build(:start_end_overlap_meeting, starts_at: time_range.first, ends_at: time_range.last)
+        expect(meeting).to be_valid
+        expect(meeting.errors[:starts_at]).to be_empty
+        expect(meeting.errors[:ends_at]).to be_empty
       end
     end
-
   end
-
 end

data/spec/dummy/spec/models/start_overlap_meeting_spec.rb

@@ -2,51 +2,48 @@ require_relative '../../../spec_helper'
 require_relative '../factories/start_overlap_meeting'
 
 describe StartOverlapMeeting do
-
-  before(:all) do
-    StartOverlapMeeting.delete_all
+  it 'create meeting' do
+    expect do
+      FactoryGirl.create(:start_overlap_meeting)
+    end.to change(StartOverlapMeeting, :count).by(1)
   end
 
-  it "create meeting" do
-    lambda {
+  context 'Validation with exclude edge starts_at' do
+    before do
       FactoryGirl.create(:start_overlap_meeting)
-    }.should change(StartOverlapMeeting, :count).by(1)
-  end
+    end
 
-  context "Validation with exclude edge starts_at" do
-   @valid_times = {
-      "starts before and ends at time of start" => ['2011-01-03'.to_date, '2011-01-05'.to_date],
+    @valid_times = {
+      'starts before and ends at time of start' => ['2011-01-03'.to_date, '2011-01-05'.to_date]
     }
 
     @not_valid_times = {
-          "has same starts_at and ends_at" => ['2011-01-05'.to_date, '2011-01-08'.to_date],
-          "starts before starts_at and ends after ends_at" => ['2011-01-04'.to_date, '2011-01-09'.to_date],
-          "starts before starts_at and ends inside" => ['2011-01-04'.to_date, '2011-01-06'.to_date],
-          "starts inside and ends after ends_at" => ['2011-01-06'.to_date, '2011-01-09'.to_date],
-          "starts inside and ends inside" => ['2011-01-06'.to_date, '2011-01-07'.to_date],
-          "starts at same time and ends inside" => ['2011-01-05'.to_date, '2011-01-07'.to_date],
-          "starts inside and ends at same time" => ['2011-01-06'.to_date, '2011-01-08'.to_date],
-          "starts at time of end and ends after" => ['2011-01-08'.to_date, '2011-01-19'.to_date]
-      }
+      'has same starts_at and ends_at' => ['2011-01-05'.to_date, '2011-01-08'.to_date],
+      'starts before starts_at and ends after ends_at' => ['2011-01-04'.to_date, '2011-01-09'.to_date],
+      'starts before starts_at and ends inside' => ['2011-01-04'.to_date, '2011-01-06'.to_date],
+      'starts inside and ends after ends_at' => ['2011-01-06'.to_date, '2011-01-09'.to_date],
+      'starts inside and ends inside' => ['2011-01-06'.to_date, '2011-01-07'.to_date],
+      'starts at same time and ends inside' => ['2011-01-05'.to_date, '2011-01-07'.to_date],
+      'starts inside and ends at same time' => ['2011-01-06'.to_date, '2011-01-08'.to_date],
+      'starts at time of end and ends after' => ['2011-01-08'.to_date, '2011-01-19'.to_date]
+    }
 
     @not_valid_times.each do |description, time_range|
       it "is not valid if exists meeting which #{description}" do
-        meeting = FactoryGirl.build(:start_overlap_meeting, :starts_at => time_range.first, :ends_at => time_range.last)
-        meeting.should_not be_valid
-        meeting.errors[:starts_at].should_not be_empty
-        meeting.errors[:ends_at].should be_empty
+        meeting = FactoryGirl.build(:start_overlap_meeting, starts_at: time_range.first, ends_at: time_range.last)
+        expect(meeting).not_to be_valid
+        expect(meeting.errors[:starts_at]).not_to be_empty
+        expect(meeting.errors[:ends_at]).to be_empty
       end
     end
 
     @valid_times.each do |description, time_range|
       it "is valid if exists meeting which #{description}" do
-        meeting = FactoryGirl.build(:start_overlap_meeting, :starts_at => time_range.first, :ends_at => time_range.last)
-        meeting.should be_valid
-        meeting.errors[:starts_at].should be_empty
-        meeting.errors[:ends_at].should be_empty
+        meeting = FactoryGirl.build(:start_overlap_meeting, starts_at: time_range.first, ends_at: time_range.last)
+        expect(meeting).to be_valid
+        expect(meeting.errors[:starts_at]).to be_empty
+        expect(meeting.errors[:ends_at]).to be_empty
       end
     end
-
   end
-
 end

data/spec/dummy/spec/models/time_slot_spec.rb

@@ -4,48 +4,38 @@ require_relative '../factories/time_slot'
 require_relative '../factories/user'
 
 describe TimeSlot do
-
-  before(:all) do
-    Position.delete_all
-    TimeSlot.delete_all
-    User.delete_all
-  end
-
-  it "create time_slot" do
-    lambda {
+  it 'create time_slot' do
+    expect do
       FactoryGirl.create(:time_slot)
-    }.should change(TimeSlot, :count).by(1)
+    end.to change(TimeSlot, :count).by(1)
   end
 
-  context "Validation with scope and association" do
-
-    it "is not valid if exists time slot which have position with same person" do
-      time_slot1 = FactoryGirl.create(:time_slot, :starts_at => "2012-10-11".to_date, :ends_at => "2012-10-13".to_date)
-      time_slot2 = FactoryGirl.create(:time_slot, :starts_at => "2012-10-15".to_date, :ends_at => "2012-10-16".to_date)
+  context 'Validation with scope and association' do
+    it 'is not valid if exists time slot which have position with same person' do
+      time_slot1 = FactoryGirl.create(:time_slot, starts_at: '2012-10-11'.to_date, ends_at: '2012-10-13'.to_date)
+      time_slot2 = FactoryGirl.create(:time_slot, starts_at: '2012-10-15'.to_date, ends_at: '2012-10-16'.to_date)
       user = FactoryGirl.create(:user)
       user_2 = FactoryGirl.create(:user)
-      position1 = FactoryGirl.create(:position, :time_slot => time_slot1, :user => user)
-      position2 = FactoryGirl.create(:position, :time_slot => time_slot2, :user => user)
-      position3 = FactoryGirl.create(:position, :time_slot => time_slot2, :user => user_2)
+      position1 = FactoryGirl.create(:position, time_slot: time_slot1, user: user)
+      position2 = FactoryGirl.create(:position, time_slot: time_slot2, user: user)
+      position3 = FactoryGirl.create(:position, time_slot: time_slot2, user: user_2)
       time_slot2.reload
-      time_slot2.starts_at = "2012-10-12".to_date
-      time_slot2.should_not be_valid
+      time_slot2.starts_at = '2012-10-12'.to_date
+      expect(time_slot2).not_to be_valid
 
-      time_slot2.errors[:base].should_not be_empty
+      expect(time_slot2.errors[:base]).not_to be_empty
     end
 
-    it "is valid if exists time slot which have position with same person" do
-      time_slot1 = FactoryGirl.create(:time_slot, :starts_at => "2012-10-11".to_date, :ends_at => "2012-10-13".to_date)
-      time_slot2 = FactoryGirl.create(:time_slot, :starts_at => "2012-10-14".to_date, :ends_at => "2012-10-16".to_date)
+    it 'is valid if exists time slot which have position with same person' do
+      time_slot1 = FactoryGirl.create(:time_slot, starts_at: '2012-10-11'.to_date, ends_at: '2012-10-13'.to_date)
+      time_slot2 = FactoryGirl.create(:time_slot, starts_at: '2012-10-14'.to_date, ends_at: '2012-10-16'.to_date)
       user = FactoryGirl.create(:user)
-      position1 = FactoryGirl.create(:position, :time_slot => time_slot1, :user => user)
-      position2 = FactoryGirl.build(:position, :time_slot => time_slot2, :user => user)
+      position1 = FactoryGirl.create(:position, time_slot: time_slot1, user: user)
+      position2 = FactoryGirl.build(:position, time_slot: time_slot2, user: user)
 
-      time_slot2.starts_at = "2012-10-15".to_date
-      time_slot2.should be_valid
-      time_slot2.errors[:base].should be_empty
+      time_slot2.starts_at = '2012-10-15'.to_date
+      expect(time_slot2).to be_valid
+      expect(time_slot2.errors[:base]).to be_empty
     end
-
   end
-
 end

data/spec/dummy/spec/models/user_meeting_spec.rb

@@ -2,37 +2,34 @@ require_relative '../../../spec_helper'
 require_relative '../factories/user_meeting'
 
 describe UserMeeting do
-
-  before(:all) do
-    UserMeeting.delete_all
-  end
-
-  it "create johns meeting" do
-    lambda {
+  it 'create johns meeting' do
+    expect do
       FactoryGirl.create(:johns_meeting)
-    }.should change(UserMeeting, :count).by(1)
+    end.to change(UserMeeting, :count).by(1)
   end
 
-  context "Validation with scope" do
+  context 'Validation with scope' do
+    before do
+      FactoryGirl.create(:johns_meeting)
+    end
 
     OVERLAP_TIME_RANGES.each do |description, time_range|
       it "is not valid if exists johns meeting which #{description}" do
-        meeting = FactoryGirl.build(:johns_meeting, :starts_at => time_range.first, :ends_at => time_range.last)
-        meeting.should_not be_valid
-        meeting.errors[:starts_at].should_not be_empty
-        meeting.errors[:ends_at].should be_empty
+        meeting = FactoryGirl.build(:johns_meeting, starts_at: time_range.first, ends_at: time_range.last)
+        expect(UserMeeting.count).to eq 1
+        expect(meeting).not_to be_valid
+        expect(meeting.errors[:starts_at]).not_to be_empty
+        expect(meeting.errors[:ends_at]).to be_empty
       end
     end
 
     OVERLAP_TIME_RANGES.each do |description, time_range|
       it "is valid if exists johns meeting which #{description}" do
-        meeting = FactoryGirl.build(:peters_meeting, :starts_at => time_range.first, :ends_at => time_range.last)
-        meeting.should be_valid
-        meeting.errors[:starts_at].should be_empty
-        meeting.errors[:ends_at].should be_empty
+        meeting = FactoryGirl.build(:peters_meeting, starts_at: time_range.first, ends_at: time_range.last)
+        expect(meeting).to be_valid
+        expect(meeting.errors[:starts_at]).to be_empty
+        expect(meeting.errors[:ends_at]).to be_empty
       end
     end
-
   end
-
 end

data/spec/dummy/spec/models/user_spec.rb

@@ -2,11 +2,9 @@ require_relative '../../../spec_helper'
 require_relative '../factories/user'
 
 describe User do
-
-  it "create user" do
-    lambda{
+  it 'create user' do
+    expect do
       FactoryGirl.create(:user)
-    }.should change(User, :count).by(1)
+    end.to change(User, :count).by(1)
   end
-
 end

data/spec/dummy/spec/overlap_validator_spec.rb

@@ -1,24 +1,22 @@
-describe OverlapValidator do
-
-
-  context "validation message" do
+require 'spec_helper'
 
-    it "should have default message" do
-      subject = OverlapValidator.new({:attributes => [:starts_at, :ends_at]})
+describe OverlapValidator do
+  context 'validation message' do
+    it 'should have default message' do
+      subject = OverlapValidator.new(attributes: [:starts_at, :ends_at])
       meeting = Meeting.new
-      subject.stub(:find_crossed){true}
+      expect(subject).to receive(:overlapped_exists?) { true }
       subject.validate(meeting)
-      meeting.errors[:starts_at].should eq ["overlaps with another record"]
+      expect(meeting.errors[:starts_at]).to eq ['overlaps with another record']
     end
 
-    it "should be possible to configure message" do
-      subject = OverlapValidator.new({:attributes => [:starts_at, :ends_at]})
+    it 'should be possible to configure message' do
+      subject = OverlapValidator.new(attributes: [:starts_at, :ends_at])
       meeting = Meeting.new
-      subject.stub(:find_crossed){true}
-      subject.stub(:options){ {:message_title => :optional_key, :message_content => "Message content"} }
+      expect(subject).to receive(:overlapped_exists?) { true }
+      allow(subject).to receive(:options) { { message_title: :optional_key, message_content: 'Message content' } }
       subject.validate(meeting)
-      meeting.errors[:optional_key].should eq ["Message content"]
+      expect(meeting.errors[:optional_key]).to eq ['Message content']
     end
-
   end
 end

data/spec/spec_helper.rb

@@ -1,29 +1,26 @@
 # Configure Rails Envinronment
-ENV["RAILS_ENV"] = "test"
+ENV['RAILS_ENV'] = 'test'
 
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
-require "rails/test_help"
-require "rspec/rails"
-require "factory_girl_rails"
+require File.expand_path('../dummy/config/environment.rb',  __FILE__)
+require 'rails/test_help'
+require 'rspec/rails'
+require 'factory_girl_rails'
+require 'database_cleaner'
 require 'pry'
 
-
 ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = false
-ActionMailer::Base.default_url_options[:host] = "test.com"
+ActionMailer::Base.default_url_options[:host] = 'test.com'
 
 Rails.backtrace_cleaner.remove_silencers!
 
-
 # Run any available migration
-ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
+ActiveRecord::Migrator.migrate File.expand_path('../dummy/db/migrate/', __FILE__)
 
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
-
-
   # Remove this line if you don't want RSpec's should and should_not
   # methods or matchers
   require 'rspec/expectations'
@@ -31,16 +28,28 @@ RSpec.configure do |config|
 
   # == Mock Framework
   config.mock_with :rspec
+  config.infer_spec_type_from_file_location!
+
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :transaction
+    DatabaseCleaner.clean_with(:truncation)
+  end
+
+  config.around(:each) do |example|
+    DatabaseCleaner.cleaning do
+      example.run
+    end
+  end
 end
 
 OVERLAP_TIME_RANGES = {
-    "has same starts_at and ends_at" => ['2011-01-05'.to_date, '2011-01-08'.to_date],
-    "starts before starts_at and ends after ends_at" => ['2011-01-04'.to_date, '2011-01-09'.to_date],
-    "starts before starts_at and ends inside" => ['2011-01-04'.to_date, '2011-01-06'.to_date],
-    "starts inside and ends after ends_at" => ['2011-01-06'.to_date, '2011-01-09'.to_date],
-    "starts inside and ends inside" => ['2011-01-06'.to_date, '2011-01-07'.to_date],
-    "starts at same time and ends inside" => ['2011-01-05'.to_date, '2011-01-07'.to_date],
-    "starts inside and ends at same time" => ['2011-01-06'.to_date, '2011-01-08'.to_date],
-    "starts before and ends at time of start" => ['2011-01-03'.to_date, '2011-01-05'.to_date],
-    "starts at time of end and ends after" => ['2011-01-08'.to_date, '2011-01-19'.to_date]
+  'has same starts_at and ends_at' => ['2011-01-05'.to_date, '2011-01-08'.to_date],
+  'starts before starts_at and ends after ends_at' => ['2011-01-04'.to_date, '2011-01-09'.to_date],
+  'starts before starts_at and ends inside' => ['2011-01-04'.to_date, '2011-01-06'.to_date],
+  'starts inside and ends after ends_at' => ['2011-01-06'.to_date, '2011-01-09'.to_date],
+  'starts inside and ends inside' => ['2011-01-06'.to_date, '2011-01-07'.to_date],
+  'starts at same time and ends inside' => ['2011-01-05'.to_date, '2011-01-07'.to_date],
+  'starts inside and ends at same time' => ['2011-01-06'.to_date, '2011-01-08'.to_date],
+  'starts before and ends at time of start' => ['2011-01-03'.to_date, '2011-01-05'.to_date],
+  'starts at time of end and ends after' => ['2011-01-08'.to_date, '2011-01-19'.to_date]
 }