diff options
| author | Zog | 2018-02-08 13:48:13 +0100 |
|---|---|---|
| committer | Zog | 2018-02-09 10:22:01 +0100 |
| commit | 708c2fbe2f579426972a45f9a716d844a8e825ae (patch) | |
| tree | a711770ea5c722106eed299ce5f63918de238384 | |
| parent | 3e6f023f87984894c3d0c7e4d70ea65c8966f063 (diff) | |
| download | chouette-core-708c2fbe2f579426972a45f9a716d844a8e825ae.tar.bz2 | |
Refs #5669 @2h; Fix Specs
40 files changed, 95 insertions, 92 deletions
diff --git a/lib/af83/decorator/link.rb b/lib/af83/decorator/link.rb index de7106740..ee09f80dc 100644 --- a/lib/af83/decorator/link.rb +++ b/lib/af83/decorator/link.rb @@ -130,7 +130,9 @@ class AF83::Decorator::Link out[:method] = link_method out[:class] = extra_class out.delete(:link_class) + out.delete(:link_method) out[:class] += " disabled" if disabled + out[:class].strip! out[:disabled] = !!disabled out end diff --git a/spec/support/integration_spec_helper.rb b/spec/support/integration_spec_helper.rb index a9a31f232..7ba7e9f92 100644 --- a/spec/support/integration_spec_helper.rb +++ b/spec/support/integration_spec_helper.rb @@ -3,7 +3,11 @@ module IntegrationSpecHelper def paginate_collection klass, decorator, page=1, context={} collection = klass.page(page) if decorator - collection = ModelDecorator.decorate(collection, with: decorator, context: context) + if decorator < AF83::Decorator + collection = decorator.decorate(collection, context: context) + else + collection = ModelDecorator.decorate(collection, with: decorator, context: context) + end end collection end @@ -55,7 +59,7 @@ RSpec::Matchers.define :have_link_for_each_item do |collection, name, opts| end description { "have #{name} link for each item" } failure_message do - "expected view to have #{name} link for each item, failed with selector: \"#{@selector}\"" + "expected view to have one #{name} link for each item, failed with selector: \"#{@selector}\"" end end diff --git a/spec/views/companies/__snapshots__/companies/index_create.snap b/spec/views/companies/__snapshots__/companies/index_create.snap index edf531f62..df36d5f49 100644 --- a/spec/views/companies/__snapshots__/companies/index_create.snap +++ b/spec/views/companies/__snapshots__/companies/index_create.snap @@ -1,4 +1,4 @@ <div class="container-fluid"><div class="row"> <div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"></div></div> -<div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><a class="btn btn-primary" href="/line_referentials/99/companies/new">Ajouter un transporteur</a></div></div> +<div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><a class="btn btn-default" href="/line_referentials/99/companies/new">Ajouter un transporteur</a></div></div> </div></div>
\ No newline at end of file diff --git a/spec/views/companies/__snapshots__/companies/show.snap b/spec/views/companies/__snapshots__/companies/show.snap index 1bdce4f81..8fe847427 100644 --- a/spec/views/companies/__snapshots__/companies/show.snap +++ b/spec/views/companies/__snapshots__/companies/show.snap @@ -1,7 +1,4 @@ -<div class="container-fluid"> -<div class="row"> -<div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1><span class="translation_missing" title="translation missing: fr.companies.title">Title</span></h1></div></div> +<div class="container-fluid"><div class="row"> +<div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1>Transporteur Company Name</h1></div></div> <div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><div class="small last-update">Dernière mise à jour le 23/01/2018 <br> Par web service</div></div></div> -</div> -<div class="row"><div class="col-lg-12 text-right mb-sm"></div></div> -</div>
\ No newline at end of file +</div></div>
\ No newline at end of file diff --git a/spec/views/companies/__snapshots__/companies/show_create.snap b/spec/views/companies/__snapshots__/companies/show_create.snap index 763ade31f..8fe847427 100644 --- a/spec/views/companies/__snapshots__/companies/show_create.snap +++ b/spec/views/companies/__snapshots__/companies/show_create.snap @@ -1,7 +1,4 @@ -<div class="container-fluid"> -<div class="row"> -<div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1><span class="translation_missing" title="translation missing: fr.companies.title">Title</span></h1></div></div> +<div class="container-fluid"><div class="row"> +<div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1>Transporteur Company Name</h1></div></div> <div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><div class="small last-update">Dernière mise à jour le 23/01/2018 <br> Par web service</div></div></div> -</div> -<div class="row"><div class="col-lg-12 text-right mb-sm"><a class="btn btn-primary" href="/line_referentials/99/companies/new">Ajouter un transporteur</a></div></div> -</div>
\ No newline at end of file +</div></div>
\ No newline at end of file diff --git a/spec/views/companies/__snapshots__/companies/show_destroy.snap b/spec/views/companies/__snapshots__/companies/show_destroy.snap index dc221a1ac..5799faf8e 100644 --- a/spec/views/companies/__snapshots__/companies/show_destroy.snap +++ b/spec/views/companies/__snapshots__/companies/show_destroy.snap @@ -1,7 +1,7 @@ <div class="container-fluid"> <div class="row"> -<div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1><span class="translation_missing" title="translation missing: fr.companies.title">Title</span></h1></div></div> +<div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1>Transporteur Company Name</h1></div></div> <div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><div class="small last-update">Dernière mise à jour le 23/01/2018 <br> Par web service</div></div></div> </div> -<div class="row"><div class="col-lg-12 text-right mb-sm"><a data-confirm="Etes vous sûr de supprimer ce transporteur ?" class="btn btn-primary" rel="nofollow" data-method="delete" href="/line_referentials/99/companies/909"><span class="fa fa-trash"></span><span>Supprimer ce transporteur</span></a></div></div> +<div class="row mb-sm"><div class="col-lg-12 text-right"><a data-confirm="Etes vous sûr de supprimer ce transporteur ?" class="btn btn-primary" rel="nofollow" data-method="delete" href="/line_referentials/99/companies/909/edit"><span class="fa fa-trash mr-xs"></span>Supprimer ce transporteur</a></div></div> </div>
\ No newline at end of file diff --git a/spec/views/companies/__snapshots__/companies/show_update.snap b/spec/views/companies/__snapshots__/companies/show_update.snap index adcbb3cd6..c2fbd3297 100644 --- a/spec/views/companies/__snapshots__/companies/show_update.snap +++ b/spec/views/companies/__snapshots__/companies/show_update.snap @@ -1,7 +1,7 @@ -<div class="container-fluid"> -<div class="row"> -<div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1><span class="translation_missing" title="translation missing: fr.companies.title">Title</span></h1></div></div> -<div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><div class="small last-update">Dernière mise à jour le 23/01/2018 <br> Par web service</div></div></div> -</div> -<div class="row"><div class="col-lg-12 text-right mb-sm"><a class="btn btn-primary" href="/line_referentials/99/companies/909/edit">Editer ce transporteur</a></div></div> -</div>
\ No newline at end of file +<div class="container-fluid"><div class="row"> +<div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1>Transporteur Company Name</h1></div></div> +<div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"> +<div class="small last-update">Dernière mise à jour le 23/01/2018 <br> Par web service</div> +<a class="btn btn-default" href="/line_referentials/99/companies/909/edit">Editer ce transporteur</a> +</div></div> +</div></div>
\ No newline at end of file diff --git a/spec/views/companies/index.html.erb_spec.rb b/spec/views/companies/index.html.erb_spec.rb index 8f3ce9ad3..8ed5f2c21 100644 --- a/spec/views/companies/index.html.erb_spec.rb +++ b/spec/views/companies/index.html.erb_spec.rb @@ -27,8 +27,10 @@ RSpec.describe "/companies/index", :type => :view do before(:each) do allow(view).to receive(:collection).and_return(companies) + allow(view).to receive(:decorated_collection).and_return(companies) allow(view).to receive(:current_referential).and_return(line_referential) controller.request.path_parameters[:line_referential_id] = line_referential.id + allow(view).to receive(:params).and_return({action: :index}) end describe "action links" do diff --git a/spec/views/companies/show.html.erb_spec.rb b/spec/views/companies/show.html.erb_spec.rb index 76e6cd9c6..b127bdf44 100644 --- a/spec/views/companies/show.html.erb_spec.rb +++ b/spec/views/companies/show.html.erb_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe "/companies/show", :type => :view do - let!(:company) { assign(:company, create(:company)) } + let!(:company) { c = create(:company); assign(:company, c.decorate(context: {referential: c.line_referential})) } let!(:line_referential) { assign :line_referential, company.line_referential } # it "should display a map with class 'company'" do @@ -15,11 +15,14 @@ describe "/companies/show", :type => :view do allow(view).to receive(:resource).and_return(company) controller.request.path_parameters[:line_referential_id] = line_referential.id controller.request.path_parameters[:id] = company.id + allow(view).to receive(:params).and_return({action: :show}) end describe "action links" do set_invariant "line_referential.id", "99" - set_invariant "company.id", "909" + set_invariant "company.object.id", "909" + set_invariant "company.object.name", "Company Name" + set_invariant "company.object.updated_at", "2018/01/23".to_time before(:each){ render template: "companies/show", layout: "layouts/application" diff --git a/spec/views/lines/__snapshots__/lines/index_create.snap b/spec/views/lines/__snapshots__/lines/index_create.snap index 5c875b18a..4e4f54e7f 100644 --- a/spec/views/lines/__snapshots__/lines/index_create.snap +++ b/spec/views/lines/__snapshots__/lines/index_create.snap @@ -1,4 +1,4 @@ <div class="container-fluid"><div class="row"> <div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"></div></div> -<div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><a class="btn btn-primary" href="/line_referentials/99/lines/new">Ajouter une ligne</a></div></div> +<div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><a class="btn btn-default" href="/line_referentials/99/lines/new">Ajouter une ligne</a></div></div> </div></div>
\ No newline at end of file diff --git a/spec/views/lines/__snapshots__/lines/show.snap b/spec/views/lines/__snapshots__/lines/show.snap index c66e8ee2b..30eb6786e 100644 --- a/spec/views/lines/__snapshots__/lines/show.snap +++ b/spec/views/lines/__snapshots__/lines/show.snap @@ -1,9 +1,9 @@ <div class="container-fluid"> <div class="row"> -<div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1><span class="translation_missing" title="translation missing: fr.lines.title">Title</span></h1></div></div> +<div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1>Ligne Name</h1></div></div> <div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><div class="small last-update">Dernière mise à jour le 23/01/2018 <br> Par web service</div></div></div> </div> -<div class="row"><div class="col-lg-12 text-right mb-sm"> -<a class="btn btn-primary " href="/line_referentials/99/networks/99">Voir le réseau</a><a class="btn btn-primary " href="/line_referentials/99/companies/99">Voir le transporteur principal</a> +<div class="row mb-sm"><div class="col-lg-12 text-right"> +<a class="btn btn-primary" href="/line_referentials/99/networks/99">Voir le réseau</a><a class="btn btn-primary" href="/line_referentials/99/companies/99">Voir le transporteur principal</a> </div></div> </div>
\ No newline at end of file diff --git a/spec/views/lines/__snapshots__/lines/show_create.snap b/spec/views/lines/__snapshots__/lines/show_create.snap index c8c1f81e2..30eb6786e 100644 --- a/spec/views/lines/__snapshots__/lines/show_create.snap +++ b/spec/views/lines/__snapshots__/lines/show_create.snap @@ -1,9 +1,9 @@ <div class="container-fluid"> <div class="row"> -<div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1><span class="translation_missing" title="translation missing: fr.lines.title">Title</span></h1></div></div> +<div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1>Ligne Name</h1></div></div> <div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><div class="small last-update">Dernière mise à jour le 23/01/2018 <br> Par web service</div></div></div> </div> -<div class="row"><div class="col-lg-12 text-right mb-sm"> -<a class="btn btn-primary " href="/line_referentials/99/networks/99">Voir le réseau</a><a class="btn btn-primary " href="/line_referentials/99/companies/99">Voir le transporteur principal</a><a class="btn btn-primary " href="/line_referentials/99/lines/2/edit">Editer cette ligne</a><a class="btn btn-primary " href="/line_referentials/99/lines/new">Ajouter une ligne</a> +<div class="row mb-sm"><div class="col-lg-12 text-right"> +<a class="btn btn-primary" href="/line_referentials/99/networks/99">Voir le réseau</a><a class="btn btn-primary" href="/line_referentials/99/companies/99">Voir le transporteur principal</a> </div></div> </div>
\ No newline at end of file diff --git a/spec/views/lines/__snapshots__/lines/show_destroy.snap b/spec/views/lines/__snapshots__/lines/show_destroy.snap index 040a6d994..dbfba7c66 100644 --- a/spec/views/lines/__snapshots__/lines/show_destroy.snap +++ b/spec/views/lines/__snapshots__/lines/show_destroy.snap @@ -1,9 +1,9 @@ <div class="container-fluid"> <div class="row"> -<div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1><span class="translation_missing" title="translation missing: fr.lines.title">Title</span></h1></div></div> +<div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1>Ligne Name</h1></div></div> <div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><div class="small last-update">Dernière mise à jour le 23/01/2018 <br> Par web service</div></div></div> </div> -<div class="row"><div class="col-lg-12 text-right mb-sm"> -<a class="btn btn-primary " href="/line_referentials/99/networks/99">Voir le réseau</a><a class="btn btn-primary " href="/line_referentials/99/companies/99">Voir le transporteur principal</a><a data-confirm="Etes vous sûr de supprimer cette ligne ?" class="btn btn-primary " rel="nofollow" data-method="delete" href="/line_referentials/99/lines/4"><span class="fa fa-trash mr-xs"></span>Supprimer cette ligne</a> +<div class="row mb-sm"><div class="col-lg-12 text-right"> +<a class="btn btn-primary" href="/line_referentials/99/networks/99">Voir le réseau</a><a class="btn btn-primary" href="/line_referentials/99/companies/99">Voir le transporteur principal</a><a data-confirm="Etes vous sûr de supprimer cette ligne ?" class="btn btn-primary" rel="nofollow" data-method="delete" href="/line_referentials/99/lines/58"><span class="fa fa-trash mr-xs"></span>Supprimer cette ligne</a> </div></div> </div>
\ No newline at end of file diff --git a/spec/views/lines/__snapshots__/lines/show_update.snap b/spec/views/lines/__snapshots__/lines/show_update.snap index c66e8ee2b..30eb6786e 100644 --- a/spec/views/lines/__snapshots__/lines/show_update.snap +++ b/spec/views/lines/__snapshots__/lines/show_update.snap @@ -1,9 +1,9 @@ <div class="container-fluid"> <div class="row"> -<div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1><span class="translation_missing" title="translation missing: fr.lines.title">Title</span></h1></div></div> +<div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1>Ligne Name</h1></div></div> <div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><div class="small last-update">Dernière mise à jour le 23/01/2018 <br> Par web service</div></div></div> </div> -<div class="row"><div class="col-lg-12 text-right mb-sm"> -<a class="btn btn-primary " href="/line_referentials/99/networks/99">Voir le réseau</a><a class="btn btn-primary " href="/line_referentials/99/companies/99">Voir le transporteur principal</a> +<div class="row mb-sm"><div class="col-lg-12 text-right"> +<a class="btn btn-primary" href="/line_referentials/99/networks/99">Voir le réseau</a><a class="btn btn-primary" href="/line_referentials/99/companies/99">Voir le transporteur principal</a> </div></div> </div>
\ No newline at end of file diff --git a/spec/views/lines/index.html.slim_spec.rb b/spec/views/lines/index.html.slim_spec.rb index df3622e1a..20e1783e3 100644 --- a/spec/views/lines/index.html.slim_spec.rb +++ b/spec/views/lines/index.html.slim_spec.rb @@ -18,6 +18,7 @@ describe "/lines/index", :type => :view do before :each do deactivated_line allow(view).to receive(:collection).and_return(lines) + allow(view).to receive(:decorated_collection).and_return(lines) allow(view).to receive(:current_referential).and_return(line_referential) allow(view).to receive(:params).and_return({action: :index}) controller.request.path_parameters[:line_referential_id] = line_referential.id @@ -27,6 +28,7 @@ describe "/lines/index", :type => :view do describe "action links" do set_invariant "line_referential.id", "99" + set_invariant "line_referential.name", "Name" before(:each){ render template: "lines/index", layout: "layouts/application" @@ -42,8 +44,6 @@ describe "/lines/index", :type => :view do end context "links" do - before(:each){ render } - common_items = ->{ it { should have_link_for_each_item(lines, "show", -> (line){ view.line_referential_line_path(line_referential, line) }) } it { should have_link_for_each_item(lines, "network", -> (line){ view.line_referential_network_path(line_referential, line.network) }) } diff --git a/spec/views/lines/show.html.erb_spec.rb b/spec/views/lines/show.html.erb_spec.rb index 65ac6bdb6..aeae62e98 100644 --- a/spec/views/lines/show.html.erb_spec.rb +++ b/spec/views/lines/show.html.erb_spec.rb @@ -15,16 +15,19 @@ describe "/lines/show", :type => :view do let!(:map) { assign(:map, double(:to_html => '<div id="map"/>'.html_safe)) } before do - allow(view).to receive_messages(current_organisation: referential.organisation) + allow(view).to receive_messages(current_organisation: referential.organisation, resource: line) controller.request.path_parameters[:line_referential_id] = line_referential.id controller.request.path_parameters[:id] = line.id + allow(view).to receive(:params).and_return({action: :show}) end describe "action links" do set_invariant "line_referential.id", "99" set_invariant "line.id", "99" + set_invariant "line.object.name", "Name" set_invariant "line.company.id", "99" set_invariant "line.network.id", "99" + set_invariant "line.updated_at", "2018/01/23".to_time before(:each){ render template: "lines/show", layout: "layouts/application" diff --git a/spec/views/networks/__snapshots__/networks/index_create.snap b/spec/views/networks/__snapshots__/networks/index_create.snap index cf1d5b62f..afd4aa41b 100644 --- a/spec/views/networks/__snapshots__/networks/index_create.snap +++ b/spec/views/networks/__snapshots__/networks/index_create.snap @@ -1,4 +1,4 @@ <div class="container-fluid"><div class="row"> <div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"></div></div> -<div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><a class="btn btn-primary" href="/line_referentials/99/networks/new">Ajouter un réseau</a></div></div> +<div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><a class="btn btn-default" href="/line_referentials/99/networks/new">Ajouter un réseau</a></div></div> </div></div>
\ No newline at end of file diff --git a/spec/views/networks/__snapshots__/networks/show.snap b/spec/views/networks/__snapshots__/networks/show.snap index ea20313c1..8f2992065 100644 --- a/spec/views/networks/__snapshots__/networks/show.snap +++ b/spec/views/networks/__snapshots__/networks/show.snap @@ -1,7 +1,4 @@ -<div class="container-fluid"> -<div class="row"> -<div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1><span class="translation_missing" title="translation missing: fr.networks.title">Title</span></h1></div></div> +<div class="container-fluid"><div class="row"> +<div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1>Réseau Name</h1></div></div> <div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><div class="small last-update">Dernière mise à jour le 23/01/2018 <br> Par web service</div></div></div> -</div> -<div class="row"><div class="col-lg-12 text-right mb-sm"></div></div> -</div>
\ No newline at end of file +</div></div>
\ No newline at end of file diff --git a/spec/views/networks/__snapshots__/networks/show_create.snap b/spec/views/networks/__snapshots__/networks/show_create.snap index 7530ef0e1..8f2992065 100644 --- a/spec/views/networks/__snapshots__/networks/show_create.snap +++ b/spec/views/networks/__snapshots__/networks/show_create.snap @@ -1,7 +1,4 @@ -<div class="container-fluid"> -<div class="row"> -<div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1><span class="translation_missing" title="translation missing: fr.networks.title">Title</span></h1></div></div> +<div class="container-fluid"><div class="row"> +<div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1>Réseau Name</h1></div></div> <div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><div class="small last-update">Dernière mise à jour le 23/01/2018 <br> Par web service</div></div></div> -</div> -<div class="row"><div class="col-lg-12 text-right mb-sm"><a class="btn btn-primary" href="/line_referentials/99/networks/new">Ajouter un réseau</a></div></div> -</div>
\ No newline at end of file +</div></div>
\ No newline at end of file diff --git a/spec/views/networks/__snapshots__/networks/show_destroy.snap b/spec/views/networks/__snapshots__/networks/show_destroy.snap index da3edb94e..c525c05b7 100644 --- a/spec/views/networks/__snapshots__/networks/show_destroy.snap +++ b/spec/views/networks/__snapshots__/networks/show_destroy.snap @@ -1,7 +1,7 @@ <div class="container-fluid"> <div class="row"> -<div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1><span class="translation_missing" title="translation missing: fr.networks.title">Title</span></h1></div></div> +<div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1>Réseau Name</h1></div></div> <div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><div class="small last-update">Dernière mise à jour le 23/01/2018 <br> Par web service</div></div></div> </div> -<div class="row"><div class="col-lg-12 text-right mb-sm"><a data-confirm="Etes vous sûr de supprimer ce réseau ?" class="btn btn-primary" rel="nofollow" data-method="delete" href="/line_referentials/99/networks/4"><span class="fa fa-trash mr-xs"></span>Supprimer ce réseau</a></div></div> +<div class="row mb-sm"><div class="col-lg-12 text-right"><a data-confirm="Etes vous sûr de supprimer ce réseau ?" class="btn btn-primary" rel="nofollow" data-method="delete" href="/line_referentials/99/networks/909"><span class="fa fa-trash mr-xs"></span>Supprimer ce réseau</a></div></div> </div>
\ No newline at end of file diff --git a/spec/views/networks/__snapshots__/networks/show_update.snap b/spec/views/networks/__snapshots__/networks/show_update.snap index a84b4c6f1..35f8ee9ac 100644 --- a/spec/views/networks/__snapshots__/networks/show_update.snap +++ b/spec/views/networks/__snapshots__/networks/show_update.snap @@ -1,7 +1,7 @@ <div class="container-fluid"> <div class="row"> -<div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1><span class="translation_missing" title="translation missing: fr.networks.title">Title</span></h1></div></div> +<div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1>Réseau Name</h1></div></div> <div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><div class="small last-update">Dernière mise à jour le 23/01/2018 <br> Par web service</div></div></div> </div> -<div class="row"><div class="col-lg-12 text-right mb-sm"><a class="btn btn-primary" href="/line_referentials/99/networks/3/edit">Editer ce réseau</a></div></div> +<div class="row mb-sm"><div class="col-lg-12 text-right"><a class="btn btn-primary" href="/line_referentials/99/networks/909/edit">Editer ce réseau</a></div></div> </div>
\ No newline at end of file diff --git a/spec/views/networks/index.html.erb_spec.rb b/spec/views/networks/index.html.erb_spec.rb index f9f16db61..80e755163 100644 --- a/spec/views/networks/index.html.erb_spec.rb +++ b/spec/views/networks/index.html.erb_spec.rb @@ -24,8 +24,10 @@ describe "/networks/index", :type => :view do # end before(:each) do allow(view).to receive(:collection).and_return(networks) + allow(view).to receive(:decorated_collection).and_return(networks) allow(view).to receive(:current_referential).and_return(line_referential) controller.request.path_parameters[:line_referential_id] = line_referential.id + allow(view).to receive(:params).and_return({action: :index}) end describe "action links" do diff --git a/spec/views/networks/show.html.erb_spec.rb b/spec/views/networks/show.html.erb_spec.rb index 9dc872415..998e8ac44 100644 --- a/spec/views/networks/show.html.erb_spec.rb +++ b/spec/views/networks/show.html.erb_spec.rb @@ -16,11 +16,14 @@ describe "/networks/show", :type => :view do allow(view).to receive(:resource).and_return(network) controller.request.path_parameters[:line_referential_id] = line_referential.id controller.request.path_parameters[:id] = network.id + allow(view).to receive(:params).and_return({action: :show}) end describe "action links" do set_invariant "line_referential.id", "99" - set_invariant "network.id", "909" + set_invariant "network.object.id", "909" + set_invariant "network.object.updated_at", "2018/01/23".to_time + set_invariant "network.object.name", "Name" before(:each){ render template: "networks/show", layout: "layouts/application" diff --git a/spec/views/referentials/__snapshots__/referentials/show.snap b/spec/views/referentials/__snapshots__/referentials/show.snap index 06e60d910..83531ac0e 100644 --- a/spec/views/referentials/__snapshots__/referentials/show.snap +++ b/spec/views/referentials/__snapshots__/referentials/show.snap @@ -3,5 +3,7 @@ <div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1>referential_full_name</h1></div></div> <div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><div class="small last-update">Dernière mise à jour le 01/01/2000</div></div></div> </div> -<div class="row mb-sm"><div class="col-lg-12 text-right"><a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a></div></div> +<div class="row mb-sm"><div class="col-lg-12 text-right"> +<a class="btn btn-primary" href="/referentials/99/vehicle_journeys">Courses</a><a class="btn btn-primary" href="/referentials/99/purchase_windows">Calendriers commerciaux</a><a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a> +</div></div> </div>
\ No newline at end of file diff --git a/spec/views/referentials/__snapshots__/referentials/show_create.snap b/spec/views/referentials/__snapshots__/referentials/show_create.snap index 4f0f8352d..e5d309b96 100644 --- a/spec/views/referentials/__snapshots__/referentials/show_create.snap +++ b/spec/views/referentials/__snapshots__/referentials/show_create.snap @@ -4,6 +4,6 @@ <div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><div class="small last-update">Dernière mise à jour le 01/01/2000</div></div></div> </div> <div class="row mb-sm"><div class="col-lg-12 text-right"> -<a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a><a class="btn btn-primary" href="/referentials/new?from=99">Dupliquer</a><a class="btn btn-primary" href="/referentials/99/select_compliance_control_set">Valider</a> +<a class="btn btn-primary" href="/referentials/99/vehicle_journeys">Courses</a><a class="btn btn-primary" href="/referentials/99/purchase_windows">Calendriers commerciaux</a><a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a><a class="btn btn-primary" href="/referentials/new?from=99">Dupliquer</a><a class="btn btn-primary" href="/referentials/99/select_compliance_control_set">Valider</a> </div></div> </div>
\ No newline at end of file diff --git a/spec/views/referentials/__snapshots__/referentials/show_destroy.snap b/spec/views/referentials/__snapshots__/referentials/show_destroy.snap index 49ead7d2a..d90198391 100644 --- a/spec/views/referentials/__snapshots__/referentials/show_destroy.snap +++ b/spec/views/referentials/__snapshots__/referentials/show_destroy.snap @@ -4,6 +4,6 @@ <div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><div class="small last-update">Dernière mise à jour le 01/01/2000</div></div></div> </div> <div class="row mb-sm"><div class="col-lg-12 text-right"> -<a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a><a data-confirm="Etes vous sûr de vouloir supprimer ce jeu de données ?" class="btn btn-primary" rel="nofollow" data-method="delete" href="/referentials/99"><span class="fa fa-trash mr-xs"></span>Supprimer</a> +<a class="btn btn-primary" href="/referentials/99/vehicle_journeys">Courses</a><a class="btn btn-primary" href="/referentials/99/purchase_windows">Calendriers commerciaux</a><a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a><a data-confirm="Etes vous sûr de vouloir supprimer ce jeu de données ?" class="btn btn-primary" rel="nofollow" data-method="delete" href="/referentials/99"><span class="fa fa-trash mr-xs"></span>Supprimer</a> </div></div> </div>
\ No newline at end of file diff --git a/spec/views/referentials/__snapshots__/referentials/show_purchase_windows.snap b/spec/views/referentials/__snapshots__/referentials/show_purchase_windows.snap index 06e60d910..83531ac0e 100644 --- a/spec/views/referentials/__snapshots__/referentials/show_purchase_windows.snap +++ b/spec/views/referentials/__snapshots__/referentials/show_purchase_windows.snap @@ -3,5 +3,7 @@ <div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1>referential_full_name</h1></div></div> <div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><div class="small last-update">Dernière mise à jour le 01/01/2000</div></div></div> </div> -<div class="row mb-sm"><div class="col-lg-12 text-right"><a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a></div></div> +<div class="row mb-sm"><div class="col-lg-12 text-right"> +<a class="btn btn-primary" href="/referentials/99/vehicle_journeys">Courses</a><a class="btn btn-primary" href="/referentials/99/purchase_windows">Calendriers commerciaux</a><a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a> +</div></div> </div>
\ No newline at end of file diff --git a/spec/views/referentials/__snapshots__/referentials/show_purchase_windows_create.snap b/spec/views/referentials/__snapshots__/referentials/show_purchase_windows_create.snap index 4f0f8352d..e5d309b96 100644 --- a/spec/views/referentials/__snapshots__/referentials/show_purchase_windows_create.snap +++ b/spec/views/referentials/__snapshots__/referentials/show_purchase_windows_create.snap @@ -4,6 +4,6 @@ <div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><div class="small last-update">Dernière mise à jour le 01/01/2000</div></div></div> </div> <div class="row mb-sm"><div class="col-lg-12 text-right"> -<a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a><a class="btn btn-primary" href="/referentials/new?from=99">Dupliquer</a><a class="btn btn-primary" href="/referentials/99/select_compliance_control_set">Valider</a> +<a class="btn btn-primary" href="/referentials/99/vehicle_journeys">Courses</a><a class="btn btn-primary" href="/referentials/99/purchase_windows">Calendriers commerciaux</a><a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a><a class="btn btn-primary" href="/referentials/new?from=99">Dupliquer</a><a class="btn btn-primary" href="/referentials/99/select_compliance_control_set">Valider</a> </div></div> </div>
\ No newline at end of file diff --git a/spec/views/referentials/__snapshots__/referentials/show_purchase_windows_destroy.snap b/spec/views/referentials/__snapshots__/referentials/show_purchase_windows_destroy.snap index 49ead7d2a..d90198391 100644 --- a/spec/views/referentials/__snapshots__/referentials/show_purchase_windows_destroy.snap +++ b/spec/views/referentials/__snapshots__/referentials/show_purchase_windows_destroy.snap @@ -4,6 +4,6 @@ <div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><div class="small last-update">Dernière mise à jour le 01/01/2000</div></div></div> </div> <div class="row mb-sm"><div class="col-lg-12 text-right"> -<a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a><a data-confirm="Etes vous sûr de vouloir supprimer ce jeu de données ?" class="btn btn-primary" rel="nofollow" data-method="delete" href="/referentials/99"><span class="fa fa-trash mr-xs"></span>Supprimer</a> +<a class="btn btn-primary" href="/referentials/99/vehicle_journeys">Courses</a><a class="btn btn-primary" href="/referentials/99/purchase_windows">Calendriers commerciaux</a><a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a><a data-confirm="Etes vous sûr de vouloir supprimer ce jeu de données ?" class="btn btn-primary" rel="nofollow" data-method="delete" href="/referentials/99"><span class="fa fa-trash mr-xs"></span>Supprimer</a> </div></div> </div>
\ No newline at end of file diff --git a/spec/views/referentials/__snapshots__/referentials/show_purchase_windows_update.snap b/spec/views/referentials/__snapshots__/referentials/show_purchase_windows_update.snap index 9d8b4f276..32d46beda 100644 --- a/spec/views/referentials/__snapshots__/referentials/show_purchase_windows_update.snap +++ b/spec/views/referentials/__snapshots__/referentials/show_purchase_windows_update.snap @@ -7,6 +7,6 @@ </div></div> </div> <div class="row mb-sm"><div class="col-lg-12 text-right"> -<a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a><a class="btn btn-primary" rel="nofollow" data-method="put" href="/referentials/99/archive">Conserver</a><button type="button" data-toggle="modal" data-target="#purgeModal" class="btn btn-primary">Purger</button> +<a class="btn btn-primary" href="/referentials/99/vehicle_journeys">Courses</a><a class="btn btn-primary" href="/referentials/99/purchase_windows">Calendriers commerciaux</a><a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a><a class="btn btn-primary" rel="nofollow" data-method="put" href="/referentials/99/archive">Conserver</a><button type="button" data-toggle="modal" data-target="#purgeModal" class="btn btn-primary">Purger</button> </div></div> </div>
\ No newline at end of file diff --git a/spec/views/referentials/__snapshots__/referentials/show_readonly.snap b/spec/views/referentials/__snapshots__/referentials/show_readonly.snap index 06e60d910..83531ac0e 100644 --- a/spec/views/referentials/__snapshots__/referentials/show_readonly.snap +++ b/spec/views/referentials/__snapshots__/referentials/show_readonly.snap @@ -3,5 +3,7 @@ <div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1>referential_full_name</h1></div></div> <div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><div class="small last-update">Dernière mise à jour le 01/01/2000</div></div></div> </div> -<div class="row mb-sm"><div class="col-lg-12 text-right"><a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a></div></div> +<div class="row mb-sm"><div class="col-lg-12 text-right"> +<a class="btn btn-primary" href="/referentials/99/vehicle_journeys">Courses</a><a class="btn btn-primary" href="/referentials/99/purchase_windows">Calendriers commerciaux</a><a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a> +</div></div> </div>
\ No newline at end of file diff --git a/spec/views/referentials/__snapshots__/referentials/show_readonly_create.snap b/spec/views/referentials/__snapshots__/referentials/show_readonly_create.snap index 6633fba3e..82a77521a 100644 --- a/spec/views/referentials/__snapshots__/referentials/show_readonly_create.snap +++ b/spec/views/referentials/__snapshots__/referentials/show_readonly_create.snap @@ -4,6 +4,6 @@ <div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><div class="small last-update">Dernière mise à jour le 01/01/2000</div></div></div> </div> <div class="row mb-sm"><div class="col-lg-12 text-right"> -<a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a><a class="btn btn-primary" href="/referentials/new?from=99">Dupliquer</a> +<a class="btn btn-primary" href="/referentials/99/vehicle_journeys">Courses</a><a class="btn btn-primary" href="/referentials/99/purchase_windows">Calendriers commerciaux</a><a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a><a class="btn btn-primary" href="/referentials/new?from=99">Dupliquer</a> </div></div> </div>
\ No newline at end of file diff --git a/spec/views/referentials/__snapshots__/referentials/show_readonly_destroy.snap b/spec/views/referentials/__snapshots__/referentials/show_readonly_destroy.snap index 06e60d910..83531ac0e 100644 --- a/spec/views/referentials/__snapshots__/referentials/show_readonly_destroy.snap +++ b/spec/views/referentials/__snapshots__/referentials/show_readonly_destroy.snap @@ -3,5 +3,7 @@ <div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1>referential_full_name</h1></div></div> <div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><div class="small last-update">Dernière mise à jour le 01/01/2000</div></div></div> </div> -<div class="row mb-sm"><div class="col-lg-12 text-right"><a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a></div></div> +<div class="row mb-sm"><div class="col-lg-12 text-right"> +<a class="btn btn-primary" href="/referentials/99/vehicle_journeys">Courses</a><a class="btn btn-primary" href="/referentials/99/purchase_windows">Calendriers commerciaux</a><a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a> +</div></div> </div>
\ No newline at end of file diff --git a/spec/views/referentials/__snapshots__/referentials/show_readonly_update.snap b/spec/views/referentials/__snapshots__/referentials/show_readonly_update.snap index 06e60d910..83531ac0e 100644 --- a/spec/views/referentials/__snapshots__/referentials/show_readonly_update.snap +++ b/spec/views/referentials/__snapshots__/referentials/show_readonly_update.snap @@ -3,5 +3,7 @@ <div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1>referential_full_name</h1></div></div> <div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><div class="small last-update">Dernière mise à jour le 01/01/2000</div></div></div> </div> -<div class="row mb-sm"><div class="col-lg-12 text-right"><a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a></div></div> +<div class="row mb-sm"><div class="col-lg-12 text-right"> +<a class="btn btn-primary" href="/referentials/99/vehicle_journeys">Courses</a><a class="btn btn-primary" href="/referentials/99/purchase_windows">Calendriers commerciaux</a><a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a> +</div></div> </div>
\ No newline at end of file diff --git a/spec/views/referentials/__snapshots__/referentials/show_referential_vehicle_journeys.snap b/spec/views/referentials/__snapshots__/referentials/show_referential_vehicle_journeys.snap index 06e60d910..83531ac0e 100644 --- a/spec/views/referentials/__snapshots__/referentials/show_referential_vehicle_journeys.snap +++ b/spec/views/referentials/__snapshots__/referentials/show_referential_vehicle_journeys.snap @@ -3,5 +3,7 @@ <div class="col-lg-9 col-md-8 col-sm-7 col-xs-7"><div class="page-title"><h1>referential_full_name</h1></div></div> <div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><div class="small last-update">Dernière mise à jour le 01/01/2000</div></div></div> </div> -<div class="row mb-sm"><div class="col-lg-12 text-right"><a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a></div></div> +<div class="row mb-sm"><div class="col-lg-12 text-right"> +<a class="btn btn-primary" href="/referentials/99/vehicle_journeys">Courses</a><a class="btn btn-primary" href="/referentials/99/purchase_windows">Calendriers commerciaux</a><a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a> +</div></div> </div>
\ No newline at end of file diff --git a/spec/views/referentials/__snapshots__/referentials/show_referential_vehicle_journeys_create.snap b/spec/views/referentials/__snapshots__/referentials/show_referential_vehicle_journeys_create.snap index 4f0f8352d..e5d309b96 100644 --- a/spec/views/referentials/__snapshots__/referentials/show_referential_vehicle_journeys_create.snap +++ b/spec/views/referentials/__snapshots__/referentials/show_referential_vehicle_journeys_create.snap @@ -4,6 +4,6 @@ <div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><div class="small last-update">Dernière mise à jour le 01/01/2000</div></div></div> </div> <div class="row mb-sm"><div class="col-lg-12 text-right"> -<a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a><a class="btn btn-primary" href="/referentials/new?from=99">Dupliquer</a><a class="btn btn-primary" href="/referentials/99/select_compliance_control_set">Valider</a> +<a class="btn btn-primary" href="/referentials/99/vehicle_journeys">Courses</a><a class="btn btn-primary" href="/referentials/99/purchase_windows">Calendriers commerciaux</a><a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a><a class="btn btn-primary" href="/referentials/new?from=99">Dupliquer</a><a class="btn btn-primary" href="/referentials/99/select_compliance_control_set">Valider</a> </div></div> </div>
\ No newline at end of file diff --git a/spec/views/referentials/__snapshots__/referentials/show_referential_vehicle_journeys_destroy.snap b/spec/views/referentials/__snapshots__/referentials/show_referential_vehicle_journeys_destroy.snap index 49ead7d2a..d90198391 100644 --- a/spec/views/referentials/__snapshots__/referentials/show_referential_vehicle_journeys_destroy.snap +++ b/spec/views/referentials/__snapshots__/referentials/show_referential_vehicle_journeys_destroy.snap @@ -4,6 +4,6 @@ <div class="col-lg-3 col-md-4 col-sm-5 col-xs-5 text-right"><div class="page-action"><div class="small last-update">Dernière mise à jour le 01/01/2000</div></div></div> </div> <div class="row mb-sm"><div class="col-lg-12 text-right"> -<a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a><a data-confirm="Etes vous sûr de vouloir supprimer ce jeu de données ?" class="btn btn-primary" rel="nofollow" data-method="delete" href="/referentials/99"><span class="fa fa-trash mr-xs"></span>Supprimer</a> +<a class="btn btn-primary" href="/referentials/99/vehicle_journeys">Courses</a><a class="btn btn-primary" href="/referentials/99/purchase_windows">Calendriers commerciaux</a><a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a><a data-confirm="Etes vous sûr de vouloir supprimer ce jeu de données ?" class="btn btn-primary" rel="nofollow" data-method="delete" href="/referentials/99"><span class="fa fa-trash mr-xs"></span>Supprimer</a> </div></div> </div>
\ No newline at end of file diff --git a/spec/views/referentials/__snapshots__/referentials/show_referential_vehicle_journeys_update.snap b/spec/views/referentials/__snapshots__/referentials/show_referential_vehicle_journeys_update.snap index 9d8b4f276..32d46beda 100644 --- a/spec/views/referentials/__snapshots__/referentials/show_referential_vehicle_journeys_update.snap +++ b/spec/views/referentials/__snapshots__/referentials/show_referential_vehicle_journeys_update.snap @@ -7,6 +7,6 @@ </div></div> </div> <div class="row mb-sm"><div class="col-lg-12 text-right"> -<a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a><a class="btn btn-primary" rel="nofollow" data-method="put" href="/referentials/99/archive">Conserver</a><button type="button" data-toggle="modal" data-target="#purgeModal" class="btn btn-primary">Purger</button> +<a class="btn btn-primary" href="/referentials/99/vehicle_journeys">Courses</a><a class="btn btn-primary" href="/referentials/99/purchase_windows">Calendriers commerciaux</a><a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a><a class="btn btn-primary" rel="nofollow" data-method="put" href="/referentials/99/archive">Conserver</a><button type="button" data-toggle="modal" data-target="#purgeModal" class="btn btn-primary">Purger</button> </div></div> </div>
\ No newline at end of file diff --git a/spec/views/referentials/__snapshots__/referentials/show_update.snap b/spec/views/referentials/__snapshots__/referentials/show_update.snap index 9d8b4f276..32d46beda 100644 --- a/spec/views/referentials/__snapshots__/referentials/show_update.snap +++ b/spec/views/referentials/__snapshots__/referentials/show_update.snap @@ -7,6 +7,6 @@ </div></div> </div> <div class="row mb-sm"><div class="col-lg-12 text-right"> -<a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a><a class="btn btn-primary" rel="nofollow" data-method="put" href="/referentials/99/archive">Conserver</a><button type="button" data-toggle="modal" data-target="#purgeModal" class="btn btn-primary">Purger</button> +<a class="btn btn-primary" href="/referentials/99/vehicle_journeys">Courses</a><a class="btn btn-primary" href="/referentials/99/purchase_windows">Calendriers commerciaux</a><a class="btn btn-primary" href="/referentials/99/time_tables">Calendriers</a><a class="btn btn-primary" rel="nofollow" data-method="put" href="/referentials/99/archive">Conserver</a><button type="button" data-toggle="modal" data-target="#purgeModal" class="btn btn-primary">Purger</button> </div></div> </div>
\ No newline at end of file diff --git a/spec/views/referentials/show.html.erb_spec.rb b/spec/views/referentials/show.html.erb_spec.rb index 9aaa762fe..ea3bc1fe1 100644 --- a/spec/views/referentials/show.html.erb_spec.rb +++ b/spec/views/referentials/show.html.erb_spec.rb @@ -28,22 +28,6 @@ describe "referentials/show", type: :view do allow(referential).to receive(:referential_read_only?){ readonly } end - it "should not present edit button" do - expect(rendered).to_not have_selector("a[href=\"#{view.edit_referential_path(referential)}\"]") - end - - with_permission "referentials.update" do - it "should present edit button" do - expect(rendered).to have_selector("a[href=\"#{view.edit_referential_path(referential)}\"]") - end - - context "with a readonly referential" do - let(:readonly){ true } - it "should not present edit button" do - expect(rendered).to_not have_selector("a[href=\"#{view.edit_referential_path(referential)}\"]") - end - end - end describe "action links" do set_invariant "referential.object.full_name", "referential_full_name" |
