diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-17 17:15:21 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-17 17:15:21 +0000 |
commit | 76044a792737e4b966be861b68947d289539c66e (patch) | |
tree | 6355ac9d8b54beb5e6e0fd8fe6d28a464f8a5395 /spec | |
parent | f63ce3000c16c04b7a7d5200c5da7c07b9af0cf2 (diff) | |
download | gitlab-ce-76044a792737e4b966be861b68947d289539c66e.tar.gz |
Add latest changes from gitlab-org/gitlab@14-1-stable-ee
Diffstat (limited to 'spec')
-rw-r--r-- | spec/controllers/concerns/routable_actions_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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) |