ninoxe 1.1.5 → 1.2.0

data/spec/models/chouette/stop_point_spec.rb

@@ -1,17 +1,20 @@
 require 'spec_helper'
 
-describe Chouette::StopPoint do
-  let!(:vehicle_journey) { Factory(:vehicle_journey)}
+describe Chouette::StopPoint, :type => :model do
+  let!(:vehicle_journey) { create(:vehicle_journey)}
   subject { Chouette::Route.find( vehicle_journey.route_id).stop_points.first }
 
-  it { should validate_uniqueness_of :objectid }
-  it { should validate_presence_of :stop_area }
+  it { is_expected.to validate_uniqueness_of :objectid }
+  it { is_expected.to validate_presence_of :stop_area }
 
-  its(:objectid) { should be_kind_of(Chouette::ObjectId) }
+  describe '#objectid' do
+    subject { super().objectid }
+    it { is_expected.to be_kind_of(Chouette::ObjectId) }
+  end
 
   describe "#destroy" do
     before(:each) do
-      @vehicle = Factory(:vehicle_journey)
+      @vehicle = create(:vehicle_journey)
       @stop_point = Chouette::Route.find( @vehicle.route_id).stop_points.first
     end
     def vjas_stop_point_ids( vehicle_id)
@@ -21,18 +24,18 @@ describe Chouette::StopPoint do
       Chouette::JourneyPattern.find( journey_id).stop_points.map(&:id)
     end
     it "should remove dependent vehicle_journey_at_stop" do
-      vjas_stop_point_ids(@vehicle.id).should include(@stop_point.id)
+      expect(vjas_stop_point_ids(@vehicle.id)).to include(@stop_point.id)
 
       @stop_point.destroy
 
-      vjas_stop_point_ids(@vehicle.id).should_not include(@stop_point.id)
+      expect(vjas_stop_point_ids(@vehicle.id)).not_to include(@stop_point.id)
     end
     it "should remove dependent journey_pattern_stop_point" do
-      jpsp_stop_point_ids(@vehicle.journey_pattern_id).should include(@stop_point.id)
+      expect(jpsp_stop_point_ids(@vehicle.journey_pattern_id)).to include(@stop_point.id)
 
       @stop_point.destroy
 
-      jpsp_stop_point_ids(@vehicle.journey_pattern_id).should_not include(@stop_point.id)
+      expect(jpsp_stop_point_ids(@vehicle.journey_pattern_id)).not_to include(@stop_point.id)
     end
   end
 end

data/spec/models/chouette/time_table_period_spec.rb

@@ -1,19 +1,19 @@
 require 'spec_helper'
 
-describe Chouette::TimeTablePeriod do
+describe Chouette::TimeTablePeriod, :type => :model do
 
-  let!(:time_table) { Factory(:time_table)}
-  subject { Factory(:time_table_period ,:time_table => time_table, :period_start => Date.new(2014,6,30), :period_end => Date.new(2014,7,6) ) }
-  let!(:p2) {Factory(:time_table_period ,:time_table => time_table, :period_start => Date.new(2014,7,6), :period_end => Date.new(2014,7,14) ) } 
+  let!(:time_table) { create(:time_table)}
+  subject { create(:time_table_period ,:time_table => time_table, :period_start => Date.new(2014,6,30), :period_end => Date.new(2014,7,6) ) }
+  let!(:p2) {create(:time_table_period ,:time_table => time_table, :period_start => Date.new(2014,7,6), :period_end => Date.new(2014,7,14) ) } 
 
-  it { should validate_presence_of :period_start }
-  it { should validate_presence_of :period_end }
+  it { is_expected.to validate_presence_of :period_start }
+  it { is_expected.to validate_presence_of :period_end }
   
   describe "#overlap" do
     context "when periods intersect, " do
       it "should detect period overlap" do
-         subject.overlap?(p2).should be_true
-         p2.overlap?(subject).should be_true
+         expect(subject.overlap?(p2)).to be_truthy
+         expect(p2.overlap?(subject)).to be_truthy
       end
     end
     context "when periods don't intersect, " do
@@ -21,8 +21,8 @@ describe Chouette::TimeTablePeriod do
         p2.period_start = Date.new(2014,7,7)
       end
       it "should not detect period overlap" do
-         subject.overlap?(p2).should be_false
-         p2.overlap?(subject).should be_false
+         expect(subject.overlap?(p2)).to be_falsey
+         expect(p2.overlap?(subject)).to be_falsey
       end
     end
     context "when period 1 contains period 2, " do
@@ -31,16 +31,16 @@ describe Chouette::TimeTablePeriod do
         p2.period_end = Date.new(2014,7,6)
       end
       it "should detect period overlap" do
-         subject.overlap?(p2).should be_true
-         p2.overlap?(subject).should be_true
+         expect(subject.overlap?(p2)).to be_truthy
+         expect(p2.overlap?(subject)).to be_truthy
       end
     end
   end
   describe "#contains" do
     context "when periods intersect, " do
       it "should not detect period inclusion" do
-         subject.contains?(p2).should be_false
-         p2.contains?(subject).should be_false
+         expect(subject.contains?(p2)).to be_falsey
+         expect(p2.contains?(subject)).to be_falsey
       end
     end
     context "when periods don't intersect, " do
@@ -48,8 +48,8 @@ describe Chouette::TimeTablePeriod do
         p2.period_start = Date.new(2014,7,7)
       end
       it "should not detect period inclusion" do
-         subject.contains?(p2).should be_false
-         p2.contains?(subject).should be_false
+         expect(subject.contains?(p2)).to be_falsey
+         expect(p2.contains?(subject)).to be_falsey
       end
     end
     context "when period 1 contains period 2, " do
@@ -58,8 +58,8 @@ describe Chouette::TimeTablePeriod do
         p2.period_end = Date.new(2014,7,6)
       end
       it "should detect period inclusion" do
-         subject.contains?(p2).should be_true
-         p2.contains?(subject).should be_false
+         expect(subject.contains?(p2)).to be_truthy
+         expect(p2.contains?(subject)).to be_falsey
       end
     end
   end