diff options
| author | Robert | 2017-09-12 09:10:02 +0200 | 
|---|---|---|
| committer | Robert | 2017-09-12 09:10:02 +0200 | 
| commit | 9810dd389cff0bd5dbda26e46806f62d28410ff4 (patch) | |
| tree | 2fd091093640e10e58a65ef039d1df72afdac9f6 | |
| parent | 37865fad65adacae41bff0677651ca0a4d9db974 (diff) | |
| download | chouette-core-9810dd389cff0bd5dbda26e46806f62d28410ff4.tar.bz2 | |
Refs: #4189@2h; Fixing logical merging issues, preparing PR
| -rw-r--r-- | app/models/chouette/route.rb | 1 | ||||
| -rw-r--r-- | spec/models/chouette/stop_point_spec.rb | 2 | 
2 files changed, 1 insertions, 2 deletions
| diff --git a/app/models/chouette/route.rb b/app/models/chouette/route.rb index 8b04b95d0..e361b9e8c 100644 --- a/app/models/chouette/route.rb +++ b/app/models/chouette/route.rb @@ -78,7 +78,6 @@ class Chouette::Route < Chouette::TridentActiveRecord    def duplicate      overrides = { -      'object_version' => object_version - 1,        'opposite_route_id' => nil      }      keys_for_create = attributes.keys - %w{id objectid created_at updated_at} diff --git a/spec/models/chouette/stop_point_spec.rb b/spec/models/chouette/stop_point_spec.rb index 1be000b56..329e76a75 100644 --- a/spec/models/chouette/stop_point_spec.rb +++ b/spec/models/chouette/stop_point_spec.rb @@ -41,7 +41,7 @@ describe StopPoint, :type => :model do    end    describe '#duplicate' do -    let!( :new_route ){ create :route, objectid: 'newroute:Route:1' } +    let!( :new_route ){ create :route }      it 'creates a new instance' do        expect{ subject.duplicate(for_route: new_route) }.to change{ StopPoint.count }.by(1) | 
