From d9d5600711426d280cc1768820e809357293f14d Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Wed, 28 Jun 2017 22:04:49 +0900
Subject: [PATCH] Make membership required for create_user_by_membership

---
 spec/support/matchers/access_matchers_for_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/support/matchers/access_matchers_for_controller.rb b/spec/support/matchers/access_matchers_for_controller.rb
index c951c6b754d..fb43f51c70c 100644
--- a/spec/support/matchers/access_matchers_for_controller.rb
+++ b/spec/support/matchers/access_matchers_for_controller.rb
@@ -25,6 +25,8 @@ module AccessMatchersForController
       user = role
       sign_in(user)
     when *Gitlab::Access.sym_options_with_owner.keys # owner, master, developer, reporter, guest
+      raise ArgumentError, "cannot emulate #{role} without membership parent" unless membership
+
       user = create_user_by_membership(role, membership)
       sign_in(user)
     else
@@ -34,9 +36,7 @@ module AccessMatchersForController
     user
   end
 
-  def create_user_by_membership(role, membership = nil)
-    raise ArgumentError, "cannot emulate #{role} without membership parent" unless membership
-
+  def create_user_by_membership(role, membership)
     if role == :owner && membership.owner
       user = membership.owner
     else