diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-06-20 04:29:22 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-06-20 04:29:22 +0300 |
| commit | 1c64fa08aeab7e56a4bef7da24840b12eb03b9ac (patch) | |
| tree | c4f4d6ff1de611e6f7ed65ce51984d5b2fd87edd /spec/features/commits_spec.rb | |
| parent | 8d714b0788669451d9e7b2debd232247099434c8 (diff) | |
| parent | 31ce89b1ac772caea0c52b0284ec173b724a91c5 (diff) | |
Merge branch 'rs-gitlab_sign_in' into 'master'
Prepare for bypassing GitLab sign in in feature specs
See merge request !11913
Diffstat (limited to 'spec/features/commits_spec.rb')
| -rw-r--r-- | spec/features/commits_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb index 2772f05982a..ab2d85371bf 100644 --- a/spec/features/commits_spec.rb +++ b/spec/features/commits_spec.rb @@ -7,7 +7,7 @@ describe 'Commits' do describe 'CI' do before do - login_as :user + gitlab_sign_in :user stub_ci_pipeline_to_return_yaml_file end @@ -191,7 +191,7 @@ describe 'Commits' do before do project.team << [user, :master] - login_with(user) + gitlab_sign_in(user) visit namespace_project_commits_path(project.namespace, project, branch_name) end |