summaryrefslogtreecommitdiff
path: root/spec/features/merge_requests/widget_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/merge_requests/widget_spec.rb
parentc1cbc27314dd4a83b6a337072e4c386cbcd14ca7 (diff)
downloadgitlab-ce-45fb1f9542fc258d8671c82843d681277ae4aa89.tar.gz
Change `login_as` uses to `gitlab_sign_in`
Diffstat (limited to 'spec/features/merge_requests/widget_spec.rb')
-rw-r--r--spec/features/merge_requests/widget_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/merge_requests/widget_spec.rb b/spec/features/merge_requests/widget_spec.rb
index 4f3a5119915..0d9279b97ee 100644
--- a/spec/features/merge_requests/widget_spec.rb
+++ b/spec/features/merge_requests/widget_spec.rb
@@ -7,7 +7,7 @@ describe 'Merge request', :feature, :js do
before do
project.team << [user, :master]
- login_as(user)
+ gitlab_sign_in(user)
end
context 'new merge request' do
@@ -210,7 +210,7 @@ describe 'Merge request', :feature, :js do
before do
project.team << [user2, :master]
logout
- login_as user2
+ gitlab_sign_in user2
merge_request.update(target_project: fork_project)
visit namespace_project_merge_request_path(project.namespace, project, merge_request)
end