From 76044a792737e4b966be861b68947d289539c66e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 17 Aug 2021 17:15:21 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-1-stable-ee --- spec/controllers/concerns/routable_actions_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/controllers') diff --git a/spec/controllers/concerns/routable_actions_spec.rb b/spec/controllers/concerns/routable_actions_spec.rb index f28f990ecbb..11eb2ab1c2a 100644 --- a/spec/controllers/concerns/routable_actions_spec.rb +++ b/spec/controllers/concerns/routable_actions_spec.rb @@ -10,7 +10,7 @@ RSpec.describe RoutableActions do def routable @klass = params[:type].constantize - @routable = find_routable!(params[:type].constantize, params[:id]) + @routable = find_routable!(params[:type].constantize, params[:id], '/') end def show @@ -135,7 +135,7 @@ RSpec.describe RoutableActions do end it 'performs checks in the context of the controller' do - check = lambda { |routable| redirect_to routable } + check = lambda { |routable, path_info| redirect_to routable } allow(subject).to receive(:not_found_actions).and_return([check]) get_routable(routable) -- cgit v1.2.3