validates_overlap 0.6.0 → 0.7.0

data/spec/dummy/db/schema.rb

@@ -11,77 +11,75 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150707155107) do
-
-  create_table "active_meetings", force: :cascade do |t|
-    t.date     "starts_at"
-    t.date     "ends_at"
-    t.boolean  "is_active"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+ActiveRecord::Schema.define(version: 20_150_707_155_107) do
+  create_table 'active_meetings', force: :cascade do |t|
+    t.date 'starts_at'
+    t.date 'ends_at'
+    t.boolean 'is_active'
+    t.datetime 'created_at', null: false
+    t.datetime 'updated_at', null: false
   end
 
-  create_table "end_overlap_meetings", force: :cascade do |t|
-    t.date     "starts_at"
-    t.date     "ends_at"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+  create_table 'end_overlap_meetings', force: :cascade do |t|
+    t.date 'starts_at'
+    t.date 'ends_at'
+    t.datetime 'created_at', null: false
+    t.datetime 'updated_at', null: false
   end
 
-  create_table "meetings", force: :cascade do |t|
-    t.date     "starts_at"
-    t.date     "ends_at"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+  create_table 'meetings', force: :cascade do |t|
+    t.date 'starts_at'
+    t.date 'ends_at'
+    t.datetime 'created_at', null: false
+    t.datetime 'updated_at', null: false
   end
 
-  create_table "positions", force: :cascade do |t|
-    t.integer  "user_id"
-    t.integer  "time_slot_id"
-    t.datetime "created_at",   null: false
-    t.datetime "updated_at",   null: false
+  create_table 'positions', force: :cascade do |t|
+    t.integer 'user_id'
+    t.integer 'time_slot_id'
+    t.datetime 'created_at',   null: false
+    t.datetime 'updated_at',   null: false
   end
 
-  create_table "secure_meetings", force: :cascade do |t|
-    t.date     "starts_at"
-    t.date     "ends_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+  create_table 'secure_meetings', force: :cascade do |t|
+    t.date 'starts_at'
+    t.date 'ends_at'
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
   end
 
-  create_table "start_end_overlap_meetings", force: :cascade do |t|
-    t.date     "starts_at"
-    t.date     "ends_at"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+  create_table 'start_end_overlap_meetings', force: :cascade do |t|
+    t.date 'starts_at'
+    t.date 'ends_at'
+    t.datetime 'created_at', null: false
+    t.datetime 'updated_at', null: false
   end
 
-  create_table "start_overlap_meetings", force: :cascade do |t|
-    t.date     "starts_at"
-    t.date     "ends_at"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+  create_table 'start_overlap_meetings', force: :cascade do |t|
+    t.date 'starts_at'
+    t.date 'ends_at'
+    t.datetime 'created_at', null: false
+    t.datetime 'updated_at', null: false
   end
 
-  create_table "time_slots", force: :cascade do |t|
-    t.date     "starts_at"
-    t.date     "ends_at"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+  create_table 'time_slots', force: :cascade do |t|
+    t.date 'starts_at'
+    t.date 'ends_at'
+    t.datetime 'created_at', null: false
+    t.datetime 'updated_at', null: false
   end
 
-  create_table "user_meetings", force: :cascade do |t|
-    t.integer  "user_id"
-    t.date     "starts_at"
-    t.date     "ends_at"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+  create_table 'user_meetings', force: :cascade do |t|
+    t.integer 'user_id'
+    t.date 'starts_at'
+    t.date 'ends_at'
+    t.datetime 'created_at', null: false
+    t.datetime 'updated_at', null: false
   end
 
-  create_table "users", force: :cascade do |t|
-    t.string   "name"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+  create_table 'users', force: :cascade do |t|
+    t.string 'name'
+    t.datetime 'created_at', null: false
+    t.datetime 'updated_at', null: false
   end
-
 end

data/spec/dummy/spec/factories/position.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :position do |u|
-    u.association(:user, :factory => :user)
-    u.association(:time_slot, :factory => :time_slot)
+    u.association(:user, factory: :user)
+    u.association(:time_slot, factory: :time_slot)
   end
 end

data/spec/dummy/spec/factories/user_meeting.rb

@@ -1,11 +1,11 @@
 FactoryGirl.define do
-  factory :johns_meeting, :class => UserMeeting do |u|
+  factory :johns_meeting, class: UserMeeting do |u|
     u.starts_at '2011-01-05'.to_date
     u.ends_at '2011-01-08'.to_date
     u.user_id 1
   end
 
-  factory :peters_meeting, :class => UserMeeting do |u|
+  factory :peters_meeting, class: UserMeeting do |u|
     u.starts_at '2011-01-05'.to_date
     u.ends_at '2011-01-08'.to_date
     u.user_id 2

data/spec/dummy/spec/models/active_meetings_spec.rb

@@ -2,17 +2,11 @@ require_relative '../../../spec_helper'
 require_relative '../factories/active_meeting'
 
 describe ActiveMeeting do
-
-  before(:all) do
-    ActiveMeeting.delete_all
-  end
-
-  context "scoping" do
-    it "should apply scope" do
-      ActiveMeeting.should_receive(:active).and_call_original
+  context 'scoping' do
+    it 'should apply scope' do
+      expect(ActiveMeeting).to receive(:active).and_call_original
       active_meeting = ActiveMeeting.new
-      active_meeting.should be_valid
+      expect(active_meeting).to be_valid
     end
   end
-
 end

data/spec/dummy/spec/models/end_overlap_meeting_spec.rb

@@ -2,51 +2,48 @@ require_relative '../../../spec_helper'
 require_relative '../factories/end_overlap_meeting'
 
 describe EndOverlapMeeting do
-
-  before(:all) do
-    EndOverlapMeeting.delete_all
+  it 'create meeting' do
+    expect do
+      FactoryGirl.create(:end_overlap_meeting)
+    end.to change(EndOverlapMeeting, :count).by(1)
   end
 
-  it "create meeting" do
-    lambda {
+  context 'Validation with exclude edges ends_at' do
+    before do
       FactoryGirl.create(:end_overlap_meeting)
-    }.should change(EndOverlapMeeting, :count).by(1)
-  end
+    end
 
-  context "Validation with exclude edges ends_at" do
-   @valid_times = {
-        "starts at time of end and ends after" => ['2011-01-08'.to_date, '2011-01-19'.to_date]
+    @valid_times = {
+      '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],
-          "starts before and ends at time of start" => ['2011-01-03'.to_date, '2011-01-05'.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]
+    }
 
     @not_valid_times.each do |description, time_range|
       it "is not valid if exists meeting which #{description}" do
-        meeting = FactoryGirl.build(: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(: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(: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(: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/meeting_spec.rb

@@ -2,64 +2,68 @@ require_relative '../../../spec_helper'
 require_relative '../factories/meeting'
 
 describe Meeting do
-
-  context "Validation" do
-    before(:all) do
-      Meeting.delete_all
-    end
-
-    it "create meeting" do
-      lambda {
+  context 'Validation' do
+    it 'create meeting' do
+      expect do
         FactoryGirl.create(:meeting)
-      }.should change(Meeting, :count).by(1)
+      end.to change(Meeting, :count).by(1)
     end
 
-    OVERLAP_TIME_RANGES.each do |description, time_range|
-      it "is not valid if exists meeting which #{description}" do
-        meeting = FactoryGirl.build(: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
+    context 'simple validation' do
+      let!(:existing_meeting) { FactoryGirl.create(:meeting) }
+
+      OVERLAP_TIME_RANGES.each do |description, time_range|
+        it "is not valid if exists meeting which #{description}" do
+          meeting = FactoryGirl.build(: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
-    end
 
-    it " validate object which has not got overlap" do
-        meeting = FactoryGirl.build(:meeting, :starts_at => "2011-01-09".to_date, :ends_at => "2011-01-11".to_date)
-        meeting.should be_valid
-        meeting.errors[:starts_at].should be_empty
-        meeting.errors[:ends_at].should be_empty
+      it 'validate object which has not got overlap' do
+        meeting = FactoryGirl.build(:meeting, starts_at: '2011-01-09'.to_date, ends_at: '2011-01-11'.to_date)
+        expect(meeting).to be_valid
+        expect(meeting.errors[:starts_at]).to be_empty
+        expect(meeting.errors[:ends_at]).to be_empty
+
+        meeting = FactoryGirl.build(:meeting, starts_at: '2011-01-01'.to_date, ends_at: '2011-01-02'.to_date)
+        expect(meeting).to be_valid
+        expect(meeting.errors[:starts_at]).to be_empty
+        expect(meeting.errors[:ends_at]).to be_empty
+      end
 
-        meeting = FactoryGirl.build(:meeting, :starts_at => "2011-01-01".to_date, :ends_at => "2011-01-02".to_date)
-        meeting.should be_valid
-        meeting.errors[:starts_at].should be_empty
-        meeting.errors[:ends_at].should be_empty
+      describe '@overlapped_records' do
+        it 'store the overlapped records' do
+          meeting = FactoryGirl.build(:meeting, starts_at: '2011-01-05'.to_date, ends_at: '2011-01-08'.to_date)
+          expect(meeting).not_to be_valid
+          expect(meeting.instance_variable_get(:@overlapped_records)).to eq [existing_meeting]
+        end
+      end
     end
 
-  end
 
-  context "Validation of endless objects" do
-    before(:all) do
-      Meeting.delete_all
-      FactoryGirl.create(:meeting, :ends_at => nil)
-    end
+    context 'Validation of endless objects' do
+      xit 'with overlap object' do
+        FactoryGirl.create(:meeting)
+        meeting = FactoryGirl.build(:meeting, starts_at: '2011-01-05'.to_date, ends_at: '2011-01-08'.to_date)
+        expect(meeting).not_to be_valid
+        meeting = FactoryGirl.build(:meeting, starts_at: '2012-01-05'.to_date, ends_at: '2012-01-08'.to_date)
+        expect(meeting).not_to be_valid
+        meeting = FactoryGirl.build(:meeting, starts_at: '2010-01-05'.to_date, ends_at: '2010-01-08'.to_date)
+        expect(meeting).to be_valid
+      end
 
-    it "with overlap object" do
-      meeting = FactoryGirl.build(:meeting, :starts_at => "2011-01-05".to_date, :ends_at => "2011-01-08".to_date)
-      meeting.should_not be_valid
-      meeting = FactoryGirl.build(:meeting, :starts_at => "2012-01-05".to_date, :ends_at => "2012-01-08".to_date)
-      meeting.should_not be_valid
-      meeting = FactoryGirl.build(:meeting, :starts_at => "2010-01-05".to_date, :ends_at => "2010-01-08".to_date)
-      meeting.should be_valid
-    end
+      it 'with another endless object' do
+        FactoryGirl.create(:meeting)
 
-    it "with another endless obejct" do
-      meeting = FactoryGirl.build(:meeting, :starts_at => "2010-01-05".to_date, :ends_at => nil)
-      meeting.should_not be_valid
-      meeting = FactoryGirl.build(:meeting, :starts_at => nil, :ends_at => "2010-01-05".to_date)
-      meeting.should be_valid
-      meeting = FactoryGirl.build(:meeting, :starts_at => nil, :ends_at => nil)
-      meeting.should_not be_valid
+        meeting = FactoryGirl.build(:meeting, starts_at: '2010-01-05'.to_date, ends_at: nil)
+        expect(meeting).not_to be_valid
+        meeting = FactoryGirl.build(:meeting, starts_at: nil, ends_at: '2010-01-05'.to_date)
+        expect(meeting).to be_valid
+        meeting = FactoryGirl.build(:meeting, starts_at: nil, ends_at: nil)
+        expect(meeting).not_to be_valid
+      end
     end
   end
-
 end

data/spec/dummy/spec/models/position_spec.rb

@@ -4,41 +4,31 @@ require_relative '../factories/time_slot'
 require_relative '../factories/user'
 
 describe Position do
-
-  before(:all) do
-    Position.delete_all
-    TimeSlot.delete_all
-    User.delete_all
-  end
-
-  it "create position" do
-    lambda {
+  it 'create position' do
+    expect do
       FactoryGirl.create(:position)
-    }.should change(Position, :count).by(1)
+    end.to change(Position, :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-12".to_date, :ends_at => "2012-10-13".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-12'.to_date, ends_at: '2012-10-13'.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)
-      position2.should_not be_valid
-      position2.errors[:base].should_not be_empty
+      position1 = FactoryGirl.create(:position, time_slot: time_slot1, user: user)
+      position2 = FactoryGirl.build(:position, time_slot: time_slot2, user: user)
+      expect(position2).not_to be_valid
+      expect(position2.errors[:base]).not_to be_empty
     end
 
-    it "is be 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-15".to_date)
+    it 'is be 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-15'.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)
-      position2.should be_valid
-      position2.errors[:base].should be_empty
+      position1 = FactoryGirl.create(:position, time_slot: time_slot1, user: user)
+      position2 = FactoryGirl.build(:position, time_slot: time_slot2, user: user)
+      expect(position2).to be_valid
+      expect(position2.errors[:base]).to be_empty
     end
-
   end
-
 end

data/spec/dummy/spec/models/secure_meeting_spec.rb

@@ -2,20 +2,14 @@ require_relative '../../../spec_helper'
 require_relative '../factories/secure_meeting'
 
 describe SecureMeeting do
-  context "A model with a UUID as a primary key" do
-    before(:all) do
-      if SecureMeeting.count >= 1 then
-        SecureMeeting.delete_all
-      end
-    end
-
-    it "updates the relevant record" do
+  context 'A model with a UUID as a primary key' do
+    it 'updates the relevant record' do
       securemeeting = FactoryGirl.create(:secure_meeting)
       securemeeting.starts_at = '2012-01-05'.to_date
       securemeeting.ends_at = '2012-02-05'.to_date
-      securemeeting.should be_valid
-      securemeeting.errors[:starts_at].should be_empty
-      securemeeting.errors[:ends_at].should be_empty
+      expect(securemeeting).to be_valid
+      expect(securemeeting.errors[:starts_at]).to be_empty
+      expect(securemeeting.errors[:ends_at]).to be_empty
     end
   end
 end