diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-30 14:02:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-30 14:02:35 +0300 |
commit | 434a0ce52d75e13d48eac9ce83774954c7c5d48d (patch) | |
tree | de3b7a7cf1ce8b07555f28df592297c76894c90f /spec/support/matchers/access_matchers.rb | |
parent | 0a0d9493ca481c56b739a3df27c31262283150fe (diff) |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc2
Diffstat (limited to 'spec/support/matchers/access_matchers.rb')
-rw-r--r-- | spec/support/matchers/access_matchers.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/support/matchers/access_matchers.rb b/spec/support/matchers/access_matchers.rb index c9ff777f604..cf97e66fcba 100644 --- a/spec/support/matchers/access_matchers.rb +++ b/spec/support/matchers/access_matchers.rb @@ -52,7 +52,7 @@ module AccessMatchers emulate_user(user, @membership) visit(url) - status_code == 200 && current_path != new_user_session_path + status_code == 200 && !current_path.in?([new_user_session_path, new_admin_session_path]) end chain :of do |membership| @@ -67,7 +67,7 @@ module AccessMatchers emulate_user(user, @membership) visit(url) - [401, 404].include?(status_code) || current_path == new_user_session_path + [401, 404].include?(status_code) || current_path.in?([new_user_session_path, new_admin_session_path]) end chain :of do |membership| |