Refs #5683 @2H; Fix specs and refactor action_links

Note: Did not fix the missing workgroup in the calendar mailer

3 files changed, 8 insertions, 7 deletions

diff --git a/spec/support/pundit/pundit_view_policy.rb b/spec/support/pundit/pundit_view_policy.rb
index 91be0624c..330209049 100644
--- a/spec/support/pundit/pundit_view_policy.rb
+++ b/spec/support/pundit/pundit_view_policy.rb
@@ -2,9 +2,8 @@ module Pundit
   module PunditViewPolicy
     def self.included into
       into.let(:permissions){ nil }
-      into.let(:organisation){ referential.try(:organisation) }
-      into.let(:current_referential){ referential || build_stubbed(:referential) }
-      into.let(:current_user){ build_stubbed :user, permissions: permissions, organisation: organisation }
+      into.let(:current_referential){ referential || build_stubbed(:referential, organisation: organisation) }
+      into.let(:current_user){ create :user, permissions: permissions, organisation: organisation }
       into.let(:pundit_user){ UserContext.new(current_user, referential: current_referential) }
       into.before do
         allow(view).to receive(:pundit_user) { pundit_user }
diff --git a/spec/support/referential.rb b/spec/support/referential.rb
index 497ff47a8..9acdce73a 100644
--- a/spec/support/referential.rb
+++ b/spec/support/referential.rb
@@ -11,8 +11,8 @@ module ReferentialHelper
   def self.included(base)
     base.class_eval do
       extend ClassMethods
-      alias_method :referential, :first_referential
-      alias_method :organisation, :first_organisation
+      base.let(:referential){ first_referential }
+      base.let(:organisation){ first_organisation }
     end
   end
 
diff --git a/spec/views/referentials/show.html.erb_spec.rb b/spec/views/referentials/show.html.erb_spec.rb
index 4a2afe2ca..6fd51949a 100644
--- a/spec/views/referentials/show.html.erb_spec.rb
+++ b/spec/views/referentials/show.html.erb_spec.rb
@@ -3,20 +3,22 @@ require 'spec_helper'
 describe "referentials/show", type: :view do
 
   let!(:referential) do
-    referential = create(:referential)
+    referential = create(:referential, organisation: organisation)
     assign :referential, referential.decorate(context: {
       current_organisation: referential.organisation
     })
   end
   let(:permissions){ [] }
   let(:current_organisation) { organisation }
-  let(:current_offer_workbench) { create :workbench, organisation: current_organisation}
+  let(:current_offer_workbench) { create :workbench, organisation: organisation}
+  let(:current_workgroup) { current_offer_workbench.workgroup }
   let(:readonly){ false }
 
   before :each do
     assign :reflines, []
     allow(view).to receive(:current_offer_workbench).and_return(current_offer_workbench)
     allow(view).to receive(:current_organisation).and_return(current_organisation)
+    allow(view).to receive(:current_workgroup).and_return(current_workgroup)
     allow(view).to receive(:current_user).and_return(current_user)
 
     allow(view).to receive(:resource).and_return(referential)