diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-07-09 19:18:15 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-07-09 19:18:15 +0000 |
commit | 64701b51aeacf4f4f932f205a2d831880b757a43 (patch) | |
tree | b5397ce2dc8930a1781dbde1cdbad7940e3be2a7 /spec/features/projects/environments | |
parent | f225cc9b97e97372ab035225112cd5f5d44c0e31 (diff) | |
parent | 60814985e033e4941ff3eb5d33ca55e3fc81593e (diff) | |
download | gitlab-ce-64701b51aeacf4f4f932f205a2d831880b757a43.tar.gz |
Merge branch 'rs-sign_in' into 'master'
Change gitlab_sign_in to sign_in
See merge request !12369
Diffstat (limited to 'spec/features/projects/environments')
3 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/projects/environments/environment_metrics_spec.rb b/spec/features/projects/environments/environment_metrics_spec.rb index 841514ac707..cf0dfcfb1f3 100644 --- a/spec/features/projects/environments/environment_metrics_spec.rb +++ b/spec/features/projects/environments/environment_metrics_spec.rb @@ -15,7 +15,7 @@ feature 'Environment > Metrics', :feature do create(:deployment, environment: environment, deployable: build) stub_all_prometheus_requests(environment.slug) - gitlab_sign_in(user) + sign_in(user) visit_environment(environment) end diff --git a/spec/features/projects/environments/environment_spec.rb b/spec/features/projects/environments/environment_spec.rb index e3f40f8e661..c31b816f7fb 100644 --- a/spec/features/projects/environments/environment_spec.rb +++ b/spec/features/projects/environments/environment_spec.rb @@ -6,7 +6,7 @@ feature 'Environment', :feature do given(:role) { :developer } background do - gitlab_sign_in(user) + sign_in(user) project.team << [user, role] end diff --git a/spec/features/projects/environments/environments_spec.rb b/spec/features/projects/environments/environments_spec.rb index af3af3eb965..99b917cb420 100644 --- a/spec/features/projects/environments/environments_spec.rb +++ b/spec/features/projects/environments/environments_spec.rb @@ -7,7 +7,7 @@ feature 'Environments page', :feature, :js do background do project.team << [user, role] - gitlab_sign_in(user) + sign_in(user) end given!(:environment) { } |