Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-11-29 10:08:11 +0300
committerRobert Speicher <rspeicher@gmail.com>2016-11-30 09:45:35 +0300
commitf7351b040b0b0737372d18201ddc955942e0e016 (patch)
treebaf6aa6317b006b1c470fc85856be313c0deae35 /spec/support/matchers
parent4ecb95949230e2a7000b129a35096e25d0c6572c (diff)
Speed up Group security access specs
This is the Group equivalent of 13ad9a745a392e0bf0cedd0e1f318c1acee9b969
Diffstat (limited to 'spec/support/matchers')
-rw-r--r--spec/support/matchers/access_matchers.rb31
1 files changed, 16 insertions, 15 deletions
diff --git a/spec/support/matchers/access_matchers.rb b/spec/support/matchers/access_matchers.rb
index 691d7e05f57..ceddb656596 100644
--- a/spec/support/matchers/access_matchers.rb
+++ b/spec/support/matchers/access_matchers.rb
@@ -7,7 +7,7 @@ module AccessMatchers
extend RSpec::Matchers::DSL
include Warden::Test::Helpers
- def emulate_user(user, project = nil)
+ def emulate_user(user, membership = nil)
case user
when :user
login_as(create(:user))
@@ -19,16 +19,17 @@ module AccessMatchers
login_as(create(:user, external: true))
when User
login_as(user)
- when :owner
- raise ArgumentError, "cannot emulate owner without project" unless project
-
- login_as(project.owner)
- when *Gitlab::Access.sym_options.keys
- raise ArgumentError, "cannot emulate user #{user} without project" unless project
+ when *Gitlab::Access.sym_options_with_owner.keys
+ raise ArgumentError, "cannot emulate #{user} without membership parent" unless membership
role = user
- user = create(:user)
- project.public_send(:"add_#{role}", user)
+
+ if role == :owner && membership.owner
+ user = membership.owner
+ else
+ user = create(:user)
+ membership.public_send(:"add_#{role}", user)
+ end
login_as(user)
else
@@ -47,14 +48,14 @@ module AccessMatchers
matcher :be_allowed_for do |user|
match do |url|
- emulate_user(user, @project)
+ emulate_user(user, @membership)
visit(url)
status_code != 404 && current_path != new_user_session_path
end
- chain :of do |project|
- @project = project
+ chain :of do |membership|
+ @membership = membership
end
description { description_for(user, 'allowed') }
@@ -62,14 +63,14 @@ module AccessMatchers
matcher :be_denied_for do |user|
match do |url|
- emulate_user(user, @project)
+ emulate_user(user, @membership)
visit(url)
status_code == 404 || current_path == new_user_session_path
end
- chain :of do |project|
- @project = project
+ chain :of do |membership|
+ @membership = membership
end
description { description_for(user, 'denied') }