summaryrefslogtreecommitdiff
path: root/spec/features/projects/merge_request_button_spec.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-06-05 14:44:29 -0400
committerRobert Speicher <rspeicher@gmail.com>2017-06-19 18:59:01 -0500
commit45fb1f9542fc258d8671c82843d681277ae4aa89 (patch)
treeb466767095ec1d9560155d8188140f40cc8a5742 /spec/features/projects/merge_request_button_spec.rb
parentc1cbc27314dd4a83b6a337072e4c386cbcd14ca7 (diff)
downloadgitlab-ce-45fb1f9542fc258d8671c82843d681277ae4aa89.tar.gz
Change `login_as` uses to `gitlab_sign_in`
Diffstat (limited to 'spec/features/projects/merge_request_button_spec.rb')
-rw-r--r--spec/features/projects/merge_request_button_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/projects/merge_request_button_spec.rb b/spec/features/projects/merge_request_button_spec.rb
index 1370ab1c521..6de8855016d 100644
--- a/spec/features/projects/merge_request_button_spec.rb
+++ b/spec/features/projects/merge_request_button_spec.rb
@@ -18,7 +18,7 @@ feature 'Merge Request button', feature: true do
context 'logged in as developer' do
before do
- login_as(user)
+ gitlab_sign_in(user)
project.team << [user, :developer]
end
@@ -52,7 +52,7 @@ feature 'Merge Request button', feature: true do
context 'logged in as non-member' do
before do
- login_as(user)
+ gitlab_sign_in(user)
end
it 'does not show Create merge request button' do