diff options
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/api/v1/api_key_spec.rb | 2 | ||||
| -rw-r--r-- | spec/models/ninoxe_extension_spec.rb | 4 | ||||
| -rw-r--r-- | spec/models/referential_spec.rb | 2 | ||||
| -rw-r--r-- | spec/models/time_table_combination_spec.rb | 6 | ||||
| -rw-r--r-- | spec/models/user_spec.rb | 6 | ||||
| -rw-r--r-- | spec/models/vehicle_journey_import_spec.rb | 1 | ||||
| -rw-r--r-- | spec/models/vehicle_translation_spec.rb | 8 |
7 files changed, 15 insertions, 14 deletions
diff --git a/spec/models/api/v1/api_key_spec.rb b/spec/models/api/v1/api_key_spec.rb index 3da11527c..eb8826c0e 100644 --- a/spec/models/api/v1/api_key_spec.rb +++ b/spec/models/api/v1/api_key_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Api::V1::ApiKey, :type => :model do - let!(:referential){Factory(:referential)} + let!(:referential){create(:referential)} subject { Api::V1::ApiKey.create( :name => "test", :referential => referential)} it "test" do diff --git a/spec/models/ninoxe_extension_spec.rb b/spec/models/ninoxe_extension_spec.rb index 91d259fb6..f2970a5cb 100644 --- a/spec/models/ninoxe_extension_spec.rb +++ b/spec/models/ninoxe_extension_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Chouette::StopArea do # check override methods - subject {Factory(:stop_area)} + subject {create(:stop_area)} it "should return referential projection " do subject.referential.projection_type='27572' @@ -31,7 +31,7 @@ end describe Chouette::AccessPoint do # check override methods - subject {Factory(:access_point)} + subject {create(:access_point)} it "should return referential projection " do subject.referential.projection_type='27572' diff --git a/spec/models/referential_spec.rb b/spec/models/referential_spec.rb index 2b6432a2e..c503cd00f 100644 --- a/spec/models/referential_spec.rb +++ b/spec/models/referential_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Referential, :type => :model do it "create a rule_parameter_set" do - referential = Factory.create(:referential) + referential = create(:referential) expect(referential.rule_parameter_sets.size).to eq(1) end end diff --git a/spec/models/time_table_combination_spec.rb b/spec/models/time_table_combination_spec.rb index a0f14bcf0..7b6f9638e 100644 --- a/spec/models/time_table_combination_spec.rb +++ b/spec/models/time_table_combination_spec.rb @@ -1,9 +1,9 @@ require 'spec_helper' describe TimeTableCombination, :type => :model do - let!(:source){ Factory(:time_table)} - let!(:combined){Factory(:time_table)} - subject {Factory.build(:time_table_combination)} + let!(:source){ create(:time_table)} + let!(:combined){create(:time_table)} + subject {build(:time_table_combination)} describe "#combine" do context "when operation is union" do diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index c818f9673..e22e53797 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -5,10 +5,10 @@ describe User, :type => :model do #it { should validate_presence_of :name } describe "#destroy" do - let!(:organisation){Factory(:organisation)} - let!(:user){Factory(:user, :organisation => organisation)} + let!(:organisation){create(:organisation)} + let!(:user){create(:user, :organisation => organisation)} context "user's organisation contains many user" do - let!(:other_user){Factory(:user, :organisation => organisation)} + let!(:other_user){create(:user, :organisation => organisation)} it "should destoy also user's organisation" do user.destroy expect(Organisation.where(:name => organisation.name).exists?).to be_truthy diff --git a/spec/models/vehicle_journey_import_spec.rb b/spec/models/vehicle_journey_import_spec.rb index c2f9f473d..9d9a8e15e 100644 --- a/spec/models/vehicle_journey_import_spec.rb +++ b/spec/models/vehicle_journey_import_spec.rb @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- require 'spec_helper' +require 'csv' describe VehicleJourneyImport, :type => :model do diff --git a/spec/models/vehicle_translation_spec.rb b/spec/models/vehicle_translation_spec.rb index a2f3e486b..7a02eaf94 100644 --- a/spec/models/vehicle_translation_spec.rb +++ b/spec/models/vehicle_translation_spec.rb @@ -1,9 +1,9 @@ require 'spec_helper' describe VehicleTranslation, :type => :model do - let!(:company){ Factory(:company )} - let!(:journey_pattern){Factory(:journey_pattern)} - let!(:vehicle_journey){ Factory(:vehicle_journey, + let!(:company){ create(:company )} + let!(:journey_pattern){create(:journey_pattern)} + let!(:vehicle_journey){ create(:vehicle_journey, :objectid => "dummy", :journey_pattern => journey_pattern, :route => journey_pattern.route, @@ -11,7 +11,7 @@ describe VehicleTranslation, :type => :model do :transport_mode => Chouette::TransportMode.new("metro"), :published_journey_name => "dummy" )} - subject {Factory.build(:vehicle_translation, + subject {build(:vehicle_translation, :vehicle_journey_id => vehicle_journey.id, :first_stop_time => "12:00", :departure_or_arrival => "departure", |