diff options
| author | cedricnjanga | 2017-12-13 21:08:19 +0100 |
|---|---|---|
| committer | cedricnjanga | 2017-12-13 21:08:19 +0100 |
| commit | f5681428184d2cdc1dc49b4426da60101c107f35 (patch) | |
| tree | a42bf08d67f666138fffad366f21c13931eec672 /spec | |
| parent | 7a78e65f6b765cced904c6214c3f48a16ca36261 (diff) | |
| parent | 3b291a73e977737cb8f6da7fce7f914504426b93 (diff) | |
| download | chouette-core-f5681428184d2cdc1dc49b4426da60101c107f35.tar.bz2 | |
Merge branch 'master' into staging
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/decorators/referential_decorator_spec.rb | 3 | ||||
| -rw-r--r-- | spec/javascript/vehicle_journeys/reducers/vehicle_journeys_spec.js | 1 | ||||
| -rw-r--r-- | spec/lib/compliance_control_set_cloner_spec.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/spec/decorators/referential_decorator_spec.rb b/spec/decorators/referential_decorator_spec.rb index 3959a5924..cbeaf2407 100644 --- a/spec/decorators/referential_decorator_spec.rb +++ b/spec/decorators/referential_decorator_spec.rb @@ -33,8 +33,7 @@ RSpec.describe ReferentialDecorator, type: [:helper, :decorator] do expect_action_link_elements.to be_empty expect_action_link_hrefs.to eq([ referential_time_tables_path(object), - new_referential_path(from: object), - referential_select_compliance_control_set_path(object) + new_referential_path(from: object) ]) end end diff --git a/spec/javascript/vehicle_journeys/reducers/vehicle_journeys_spec.js b/spec/javascript/vehicle_journeys/reducers/vehicle_journeys_spec.js index c02ab3398..1c2cc1577 100644 --- a/spec/javascript/vehicle_journeys/reducers/vehicle_journeys_spec.js +++ b/spec/javascript/vehicle_journeys/reducers/vehicle_journeys_spec.js @@ -106,6 +106,7 @@ describe('vehicleJourneys reducer', () => { company: fakeSelectedCompany, published_journey_name: 'test', published_journey_identifier: '', + short_id: '', objectid: '', footnotes: [], time_tables: [], diff --git a/spec/lib/compliance_control_set_cloner_spec.rb b/spec/lib/compliance_control_set_cloner_spec.rb index c17f0bb52..7efe27659 100644 --- a/spec/lib/compliance_control_set_cloner_spec.rb +++ b/spec/lib/compliance_control_set_cloner_spec.rb @@ -102,7 +102,7 @@ RSpec.describe ComplianceControlSetCloner do # Check correctly copied blocks target_blox.zip(source_blox).each do | target_block, source_block | expect( target_block.compliance_control_set ).to eq(target_set) - expect( target_block.name ).to eq( [block_prefix, source_block.name].join(' ') ) + expect( target_block.name ).to eq(source_block.name) expect( target_block.condition_attributes ).to eq( source_block.condition_attributes ) end |