diff options
| author | Robert | 2017-10-31 08:28:08 +0100 |
|---|---|---|
| committer | Xinhui | 2017-11-03 12:26:42 +0100 |
| commit | 64a1495e8368c3a7f406a2afc531fceea299c537 (patch) | |
| tree | add90a306c176f0bb02c01b7847b97b13db8f942 | |
| parent | d6213f724633abfa2f899715b6f686d8972fe7e1 (diff) | |
| download | chouette-core-64a1495e8368c3a7f406a2afc531fceea299c537.tar.bz2 | |
Fixes: #4774@1h;
Filter Feature Spex of ComplianceControlSet#show implemented
| -rw-r--r-- | config/locales/compliance_controls.fr.yml | 2 | ||||
| -rw-r--r-- | spec/features/compliance_control_sets_spec.rb | 46 |
2 files changed, 24 insertions, 24 deletions
diff --git a/config/locales/compliance_controls.fr.yml b/config/locales/compliance_controls.fr.yml index f6207187a..3fa83a147 100644 --- a/config/locales/compliance_controls.fr.yml +++ b/config/locales/compliance_controls.fr.yml @@ -10,7 +10,7 @@ fr: generic: 'Généric' journey_pattern: 'JourneyPattern' line: 'Ligne' - route: 'Route' + route: 'Itinéraire' routing_constraint_zone: 'ITL' vehicle_journey: 'Course' min_max_values: "la valeur de minimum (%{min}) ne doit pas être superieur à la valuer du maximum (%{max})" diff --git a/spec/features/compliance_control_sets_spec.rb b/spec/features/compliance_control_sets_spec.rb index cbe73f866..500d4ce6f 100644 --- a/spec/features/compliance_control_sets_spec.rb +++ b/spec/features/compliance_control_sets_spec.rb @@ -35,34 +35,34 @@ RSpec.describe "ComplianceControlSets", type: :feature do controls.take(2).each do | control | control.update criticity: 'error' end - within('#severity-filter') do - find('input[value="error"]').click - end + check('error') click_on('Filtrer') - controls.take(2).each do | control | - expect( page ).to have_content(control.code) - end - controls.drop(2).each do | control | - expect( page ).not_to have_content(control.code) + controls.each do | control | + if control.criticity == 'error' + expect( page ).to have_content(control.code) + else + expect( page ).not_to have_content(control.code) + end end end - # it 'we can apply a subclass filter' do - # controls.first.update(origin_code: 'x-Route-y') - # controls.second.update(origin_code: 'x-Line-y') + it 'we can apply a subclass filter' do + controls.first.update(origin_code: 'x-Route-y') + controls.second.update(origin_code: 'x-Line-y') - # within('#subclass-filter') do - # find('input[value="Itinéraire"]').click - # find('input[value="Ligne"]').click - # end - # click_on('Filtrer') - # controls.take(2).each do | control | - # expect( page ).to have_content(control.code) - # end - # controls.drop(2).each do | control | - # expect( page ).not_to have_content(control.code) - # end - # end + within('#subclass-filter') do + check('Itinéraire') + check('Ligne') + end + click_on('Filtrer') + controls.each do | control | + if control.origin_code[/-Generic-/] + expect( page ).not_to have_content(control.code) + else + expect( page ).to have_content(control.code) + end + end + end end |
