Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch28717-additional-metrics-review-branch

1 files changed, 6 insertions, 6 deletions

diff --git a/spec/features/projects/view_on_env_spec.rb b/spec/features/projects/view_on_env_spec.rb
index 640f1376548..f6a640b90b4 100644
--- a/spec/features/projects/view_on_env_spec.rb
+++ b/spec/features/projects/view_on_env_spec.rb
@@ -50,7 +50,7 @@ describe 'View on environment', js: true do
         let(:merge_request) { create(:merge_request, :simple, source_project: project, source_branch: branch_name) }
 
         before do
-          login_as(user)
+          gitlab_sign_in(user)
 
           visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request)
 
@@ -66,7 +66,7 @@ describe 'View on environment', js: true do
 
       context 'when visiting a comparison for the branch' do
         before do
-          login_as(user)
+          gitlab_sign_in(user)
 
           visit namespace_project_compare_path(project.namespace, project, from: 'master', to: branch_name)
 
@@ -80,7 +80,7 @@ describe 'View on environment', js: true do
 
       context 'when visiting a comparison for the commit' do
         before do
-          login_as(user)
+          gitlab_sign_in(user)
 
           visit namespace_project_compare_path(project.namespace, project, from: 'master', to: sha)
 
@@ -94,7 +94,7 @@ describe 'View on environment', js: true do
 
       context 'when visiting a blob on the branch' do
         before do
-          login_as(user)
+          gitlab_sign_in(user)
 
           visit namespace_project_blob_path(project.namespace, project, File.join(branch_name, file_path))
 
@@ -108,7 +108,7 @@ describe 'View on environment', js: true do
 
       context 'when visiting a blob on the commit' do
         before do
-          login_as(user)
+          gitlab_sign_in(user)
 
           visit namespace_project_blob_path(project.namespace, project, File.join(sha, file_path))
 
@@ -122,7 +122,7 @@ describe 'View on environment', js: true do
 
       context 'when visiting the commit' do
         before do
-          login_as(user)
+          gitlab_sign_in(user)
 
           visit namespace_project_commit_path(project.namespace, project, sha)