summaryrefslogtreecommitdiff
path: root/features/steps/project/merge_requests
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-03-29 16:46:13 -0400
committerRobert Speicher <rspeicher@gmail.com>2017-04-19 18:55:36 -0400
commit40ba2f7d207a16376908ea0f6db6699808aa29e2 (patch)
treeffae34b50f185e0ea215e185c003f66b82dfadb3 /features/steps/project/merge_requests
parent4ef0c6888b7035c1dc6ef8f9ecfa5dfb63884b98 (diff)
downloadgitlab-ce-40ba2f7d207a16376908ea0f6db6699808aa29e2.tar.gz
Except where necessary, use `sign_in` over `login_as` in features
Diffstat (limited to 'features/steps/project/merge_requests')
-rw-r--r--features/steps/project/merge_requests/acceptance.rb2
-rw-r--r--features/steps/project/merge_requests/revert.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/features/steps/project/merge_requests/acceptance.rb b/features/steps/project/merge_requests/acceptance.rb
index d7167352e02..7521a9439e3 100644
--- a/features/steps/project/merge_requests/acceptance.rb
+++ b/features/steps/project/merge_requests/acceptance.rb
@@ -43,7 +43,7 @@ class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps
end
step 'I am signed in as a developer of the project' do
- login_as(@user)
+ sign_in(@user)
end
step 'I should see merge request merged' do
diff --git a/features/steps/project/merge_requests/revert.rb b/features/steps/project/merge_requests/revert.rb
index a8f4e4ef027..1149c1c2426 100644
--- a/features/steps/project/merge_requests/revert.rb
+++ b/features/steps/project/merge_requests/revert.rb
@@ -31,7 +31,7 @@ class Spinach::Features::RevertMergeRequests < Spinach::FeatureSteps
step 'I am signed in as a developer of the project' do
@user = create(:user) { |u| @project.add_developer(u) }
- login_as(@user)
+ sign_in(@user)
end
step 'There is an open Merge Request' do