From 87ab2ba9ebaf139227878239445958f13a3cdd5a Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 4 Apr 2017 15:28:39 +0200 Subject: [PATCH] Remove trailing spaces --- app/decorators/dossiers_decorator.rb | 2 +- app/views/admin/mail_templates/edit.html.haml | 4 ++-- app/views/dossiers/_infos_dossier.html.haml | 2 +- app/views/layouts/_ie_lt_10.html.haml | 2 +- spec/fixtures/cassettes/admin_procedure_edit.yml | 2 +- spec/fixtures/cassettes/ban_search_nothing.yml | 2 +- spec/fixtures/cassettes/ban_search_paris.yml | 2 +- spec/fixtures/cassettes/bano_octo.yml | 2 +- spec/fixtures/cassettes/bano_search_nothing.yml | 2 +- spec/fixtures/cassettes/bano_search_paris.yml | 2 +- .../cassettes/call_geo_api_departements.yml | 2 +- .../fixtures/cassettes/complete_demande_spec.yml | 2 +- spec/fixtures/cassettes/geoapi_departements.yml | 2 +- spec/fixtures/cassettes/geoapi_regions.yml | 2 +- spec/fixtures/cassettes/github_lastrelease.yml | 2 +- spec/fixtures/cassettes/search_ban_paris.yml | 4 ++-- spec/views/users/carte/show.html.haml_spec.rb | 16 ++++++++-------- 17 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app/decorators/dossiers_decorator.rb b/app/decorators/dossiers_decorator.rb index 0960972b1..6e8571b6f 100644 --- a/app/decorators/dossiers_decorator.rb +++ b/app/decorators/dossiers_decorator.rb @@ -1,4 +1,4 @@ class DossiersDecorator < Draper::CollectionDecorator delegate :current_page, :per_page, :offset, :total_entries, :total_pages - + end diff --git a/app/views/admin/mail_templates/edit.html.haml b/app/views/admin/mail_templates/edit.html.haml index 35efe2506..31ff8fd7f 100644 --- a/app/views/admin/mail_templates/edit.html.haml +++ b/app/views/admin/mail_templates/edit.html.haml @@ -3,8 +3,8 @@ = @mail_template.class.const_get(:DISPLAYED_NAME) = simple_form_for @mail_template, - as: 'mail_template', - url: admin_procedure_mail_template_path(@procedure, @mail_template.class.slug), + as: 'mail_template', + url: admin_procedure_mail_template_path(@procedure, @mail_template.class.slug), method: :put do |f| .row .col-md-6 diff --git a/app/views/dossiers/_infos_dossier.html.haml b/app/views/dossiers/_infos_dossier.html.haml index 91d85a427..39772f897 100644 --- a/app/views/dossiers/_infos_dossier.html.haml +++ b/app/views/dossiers/_infos_dossier.html.haml @@ -25,7 +25,7 @@ - unless @facade.champs.nil? - @facade.champs.each do |champ| - - next if champ.type_champ == 'explication' + - next if champ.type_champ == 'explication' - if champ.type_champ == 'header_section' .row.title-row.margin-top-40 %div.col-xs-3.split-hr diff --git a/app/views/layouts/_ie_lt_10.html.haml b/app/views/layouts/_ie_lt_10.html.haml index 3dcbb4a40..d9e8093ad 100644 --- a/app/views/layouts/_ie_lt_10.html.haml +++ b/app/views/layouts/_ie_lt_10.html.haml @@ -6,4 +6,4 @@ Votre version d'Internet Explorer est trop ancienne pour être utilisée sur le service TPS. Version minimum : Internet Explorer 10 ="".html_safe - + diff --git a/spec/fixtures/cassettes/admin_procedure_edit.yml b/spec/fixtures/cassettes/admin_procedure_edit.yml index a4f8431cf..40ff5e50e 100644 --- a/spec/fixtures/cassettes/admin_procedure_edit.yml +++ b/spec/fixtures/cassettes/admin_procedure_edit.yml @@ -1339,6 +1339,6 @@ http_interactions: body: encoding: UTF-8 string: '' - http_version: + http_version: recorded_at: Wed, 29 Jun 2016 14:09:51 GMT recorded_with: VCR 3.0.1 diff --git a/spec/fixtures/cassettes/ban_search_nothing.yml b/spec/fixtures/cassettes/ban_search_nothing.yml index 5e36790fd..b2f2c63a5 100644 --- a/spec/fixtures/cassettes/ban_search_nothing.yml +++ b/spec/fixtures/cassettes/ban_search_nothing.yml @@ -37,6 +37,6 @@ http_interactions: string: '{"limit": 1, "attribution": "BAN", "version": "draft", "licence": "ODbL 1.0", "query": "je recherche pas grand chose", "type": "FeatureCollection", "features": []}' - http_version: + http_version: recorded_at: Fri, 16 Dec 2016 14:17:40 GMT recorded_with: VCR 3.0.3 diff --git a/spec/fixtures/cassettes/ban_search_paris.yml b/spec/fixtures/cassettes/ban_search_paris.yml index d61951ec1..8de476502 100644 --- a/spec/fixtures/cassettes/ban_search_paris.yml +++ b/spec/fixtures/cassettes/ban_search_paris.yml @@ -40,6 +40,6 @@ http_interactions: "6", "citycode": "75056", "name": "Paris", "city": "Paris", "postcode": "75000", "context": "75, \u00cele-de-France", "score": 1.0, "label": "Paris", "id": "75056", "type": "city", "population": "2244"}, "type": "Feature"}]}' - http_version: + http_version: recorded_at: Fri, 16 Dec 2016 14:16:43 GMT recorded_with: VCR 3.0.3 diff --git a/spec/fixtures/cassettes/bano_octo.yml b/spec/fixtures/cassettes/bano_octo.yml index ddf8b0b82..9f8ac6c40 100644 --- a/spec/fixtures/cassettes/bano_octo.yml +++ b/spec/fixtures/cassettes/bano_octo.yml @@ -42,6 +42,6 @@ http_interactions: "score": 0.7561038961038961, "label": "50 Avenue des Champs \u00c9lys\u00e9es 75008 Paris", "city": "Paris", "housenumber": "50", "street": "Avenue des Champs \u00c9lys\u00e9es"}, "type": "Feature"}]}' - http_version: + http_version: recorded_at: Fri, 16 Dec 2016 16:22:23 GMT recorded_with: VCR 3.0.3 diff --git a/spec/fixtures/cassettes/bano_search_nothing.yml b/spec/fixtures/cassettes/bano_search_nothing.yml index 597c71025..8eb0b3adf 100644 --- a/spec/fixtures/cassettes/bano_search_nothing.yml +++ b/spec/fixtures/cassettes/bano_search_nothing.yml @@ -37,6 +37,6 @@ http_interactions: string: '{"limit": 5, "attribution": "BAN", "version": "draft", "licence": "ODbL 1.0", "query": "je recherche pas grand chose", "type": "FeatureCollection", "features": []}' - http_version: + http_version: recorded_at: Fri, 16 Dec 2016 16:45:53 GMT recorded_with: VCR 3.0.3 diff --git a/spec/fixtures/cassettes/bano_search_paris.yml b/spec/fixtures/cassettes/bano_search_paris.yml index 571c86ffe..dd4aee086 100644 --- a/spec/fixtures/cassettes/bano_search_paris.yml +++ b/spec/fixtures/cassettes/bano_search_paris.yml @@ -58,6 +58,6 @@ http_interactions: "Bourgueil", "context": "37, Indre-et-Loire, Centre Val-de-Loire", "score": 0.8235454545454545, "label": "Paris Buton 37140 Bourgueil", "id": "37031_X027_0a5e7a", "type": "locality"}, "type": "Feature"}]}' - http_version: + http_version: recorded_at: Fri, 16 Dec 2016 16:43:34 GMT recorded_with: VCR 3.0.3 diff --git a/spec/fixtures/cassettes/call_geo_api_departements.yml b/spec/fixtures/cassettes/call_geo_api_departements.yml index c33905578..a1ff74c3c 100644 --- a/spec/fixtures/cassettes/call_geo_api_departements.yml +++ b/spec/fixtures/cassettes/call_geo_api_departements.yml @@ -65,6 +65,6 @@ http_interactions: N+uzXJ5dyOK7NmjOGeG9r6owU3bcGdur3h5zt88s8GDrk5Vr0XU0k+55AF0I s/CpjoySBUCFk5yHTSkj07kVuSy0/cFiguvi0tfujRJMsSy4M3O7F8FmkmAW irOb5smWiq/kLAnauNjrmi/YzF+Jb/8A5ygzwMEMAAA= - http_version: + http_version: recorded_at: Wed, 19 Oct 2016 09:31:33 GMT recorded_with: VCR 3.0.1 diff --git a/spec/fixtures/cassettes/complete_demande_spec.yml b/spec/fixtures/cassettes/complete_demande_spec.yml index 95841bbea..caa571ec8 100644 --- a/spec/fixtures/cassettes/complete_demande_spec.yml +++ b/spec/fixtures/cassettes/complete_demande_spec.yml @@ -96,6 +96,6 @@ http_interactions: z2SJApORaZaCKuZpGNKAsDNaNNYF8frdH6I8w6Js5tIqibc3b9/wLh0nHWuy u7m8BrwmSaXSFXPVdiuu4KgxpMJ7B/xNLcQ0Vj0N3/vm97RkD/8BJlYZoPAL AAA= - http_version: + http_version: recorded_at: Thu, 09 Jun 2016 14:42:08 GMT recorded_with: VCR 3.0.1 diff --git a/spec/fixtures/cassettes/geoapi_departements.yml b/spec/fixtures/cassettes/geoapi_departements.yml index 6eee3d2bf..5f827279d 100644 --- a/spec/fixtures/cassettes/geoapi_departements.yml +++ b/spec/fixtures/cassettes/geoapi_departements.yml @@ -65,6 +65,6 @@ http_interactions: N+uzXJ5dyOK7NmjOGeG9r6owU3bcGdur3h5zt88s8GDrk5Vr0XU0k+55AF0I s/CpjoySBUCFk5yHTSkj07kVuSy0/cFiguvi0tfujRJMsSy4M3O7F8FmkmAW irOb5smWiq/kLAnauNjrmi/YzF+Jb/8A5ygzwMEMAAA= - http_version: + http_version: recorded_at: Fri, 16 Dec 2016 09:25:37 GMT recorded_with: VCR 3.0.3 diff --git a/spec/fixtures/cassettes/geoapi_regions.yml b/spec/fixtures/cassettes/geoapi_regions.yml index 2de462046..7519677b9 100644 --- a/spec/fixtures/cassettes/geoapi_regions.yml +++ b/spec/fixtures/cassettes/geoapi_regions.yml @@ -52,6 +52,6 @@ http_interactions: vITGxXAG/udbcvktKR9lhzxL3kZ2CdrHLaLQNQanrShRewzREPVXVG5grpaj Hu0xKImVOPQ8p41BK/ZaalE21LW2a0dUXmEWropi1MOpu8XE5syx61FMwqvq i/4Biby7eZXIu+w90GBswyPlSI7F3fRqb99L+pyA3QIAAA== - http_version: + http_version: recorded_at: Fri, 16 Dec 2016 09:24:25 GMT recorded_with: VCR 3.0.3 diff --git a/spec/fixtures/cassettes/github_lastrelease.yml b/spec/fixtures/cassettes/github_lastrelease.yml index 163e5bdea..251adc06c 100644 --- a/spec/fixtures/cassettes/github_lastrelease.yml +++ b/spec/fixtures/cassettes/github_lastrelease.yml @@ -88,6 +88,6 @@ http_interactions: MsC0IZpxkADm3tm4bNnpxecB+3J2Ef3+/N3FkL1DrTrQ4K5WqIy667x3ahI8 qCS5omo3ShFsugfGRc9Uf2pgQWVa90f7eBvTqToJNRraltKlBsbyUYwGlx3I EAhlg5VDW2QyJPYzKNZKRjtiOlVgqzz+4AgY6e7UtgdoZtf/AIfUb6aECAAA - http_version: + http_version: recorded_at: Thu, 15 Dec 2016 15:48:21 GMT recorded_with: VCR 3.0.3 diff --git a/spec/fixtures/cassettes/search_ban_paris.yml b/spec/fixtures/cassettes/search_ban_paris.yml index b13b545b5..40973bfb0 100644 --- a/spec/fixtures/cassettes/search_ban_paris.yml +++ b/spec/fixtures/cassettes/search_ban_paris.yml @@ -43,7 +43,7 @@ http_interactions: "label": "50 Avenue des Champs \u00c9lys\u00e9es 75008 Paris", "city": "Paris", "housenumber": "50", "street": "Avenue des Champs \u00c9lys\u00e9es"}, "type": "Feature"}]}' - http_version: + http_version: recorded_at: Tue, 03 Jan 2017 13:00:54 GMT - request: method: get @@ -88,6 +88,6 @@ http_interactions: "label": "50 Avenue des Champs \u00c9lys\u00e9es 75008 Paris", "city": "Paris", "housenumber": "50", "street": "Avenue des Champs \u00c9lys\u00e9es"}, "type": "Feature"}]}' - http_version: + http_version: recorded_at: Tue, 03 Jan 2017 13:00:55 GMT recorded_with: VCR 3.0.3 diff --git a/spec/views/users/carte/show.html.haml_spec.rb b/spec/views/users/carte/show.html.haml_spec.rb index a20b907f0..b30733034 100644 --- a/spec/views/users/carte/show.html.haml_spec.rb +++ b/spec/views/users/carte/show.html.haml_spec.rb @@ -4,11 +4,11 @@ describe 'users/carte/show.html.haml', type: :view do let(:state) { 'draft' } let(:dossier) { create(:dossier, state: state) } let(:dossier_id) { dossier.id } - + before do assign(:dossier, dossier) end - + context 'sur la page de la carte d\'une demande' do before do render @@ -20,23 +20,23 @@ describe 'users/carte/show.html.haml', type: :view do it 'la carte est bien présente' do expect(rendered).to have_selector('#map') end - + context 'présence des inputs hidden' do it 'stockage du json des polygons dessinés' do expect(rendered).to have_selector('input[type=hidden][id=json_latlngs][name=json_latlngs]', visible: false) end end - + context 'si la page précédente n\'est pas recapitulatif' do it 'le bouton "Etape suivante" est présent' do expect(rendered).to have_selector('#etape_suivante') end - + # it 'le bouton Etape suivante possède un onclick correct' do # expect(rendered).to have_selector('input[type=submit][id=etape_suivante][onclick=\'submit_check_draw(event)\']') # end end - + context 'si la page précédente est recapitularif' do let(:state) { 'initiated' } @@ -47,11 +47,11 @@ describe 'users/carte/show.html.haml', type: :view do it 'le bouton "Modification terminé" est présent' do expect(rendered).to have_selector('#modification_terminee') end - + # it 'le bouton "Modification terminé" possède un onclick correct' do # expect(rendered).to have_selector('input[type=submit][id=modification_terminee][onclick=\'submit_check_draw(event)\']') # end - + it 'le lien de retour au récapitulatif est présent' do expect(rendered).to have_selector("a[href='/users/dossiers/#{dossier_id}/recapitulatif']") end