diff options
| author | Zog | 2018-02-09 10:52:01 +0100 | 
|---|---|---|
| committer | Zog | 2018-02-09 11:08:11 +0100 | 
| commit | 34dca4bbfc60b17a1648d8af34d592ec7c58c0ca (patch) | |
| tree | ed946e3cc5d72fdc4acb0e77b6a0353877d96df8 | |
| parent | 708c2fbe2f579426972a45f9a716d844a8e825ae (diff) | |
| download | chouette-core-34dca4bbfc60b17a1648d8af34d592ec7c58c0ca.tar.bz2 | |
Refs 5669; Fix specs5669-specs-snpashots
4 files changed, 4 insertions, 3 deletions
| diff --git a/spec/support/pundit/pundit_view_policy.rb b/spec/support/pundit/pundit_view_policy.rb index 058f1f6ed..63970de02 100644 --- a/spec/support/pundit/pundit_view_policy.rb +++ b/spec/support/pundit/pundit_view_policy.rb @@ -11,6 +11,7 @@ module Pundit          allow(view).to receive(:current_user) { current_user }          allow(view).to receive(:current_organisation).and_return(organisation)          allow(view).to receive(:current_offer_workbench).and_return(current_offer_workbench) +        allow(view).to receive(:current_workgroup).and_return(current_offer_workbench.workgroup)          allow(view).to receive(:has_feature?){ |f| features.include?(f)}          allow(view).to receive(:user_signed_in?).and_return true          allow(view).to receive(:policy) do |instance| diff --git a/spec/views/companies/__snapshots__/companies/show_destroy.snap b/spec/views/companies/__snapshots__/companies/show_destroy.snap index 5799faf8e..5d574e460 100644 --- a/spec/views/companies/__snapshots__/companies/show_destroy.snap +++ b/spec/views/companies/__snapshots__/companies/show_destroy.snap @@ -3,5 +3,5 @@  <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 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 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"><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/lines/__snapshots__/lines/show_destroy.snap b/spec/views/lines/__snapshots__/lines/show_destroy.snap index dbfba7c66..8ed08a90d 100644 --- a/spec/views/lines/__snapshots__/lines/show_destroy.snap +++ b/spec/views/lines/__snapshots__/lines/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 23/01/2018 <br> Par web service</div></div></div>  </div>  <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> +<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/99"><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/show.html.erb_spec.rb b/spec/views/lines/show.html.erb_spec.rb index aeae62e98..effdcd014 100644 --- a/spec/views/lines/show.html.erb_spec.rb +++ b/spec/views/lines/show.html.erb_spec.rb @@ -23,7 +23,7 @@ describe "/lines/show", :type => :view do    describe "action links" do      set_invariant "line_referential.id", "99" -    set_invariant "line.id", "99" +    set_invariant "line.object.id", "99"      set_invariant "line.object.name", "Name"      set_invariant "line.company.id", "99"      set_invariant "line.network.id", "99" | 
