diff options
author | Robert Speicher <rspeicher@gmail.com> | 2017-06-19 21:06:13 -0500 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2017-06-19 21:06:13 -0500 |
commit | 2dac8f444cd5106d43f77c4946f64c3baccae13b (patch) | |
tree | 77a6ad9463c197d0a8033d9d0a6b07b1e4e6d3de /spec/features/commits_spec.rb | |
parent | 1c64fa08aeab7e56a4bef7da24840b12eb03b9ac (diff) | |
download | gitlab-ce-2dac8f444cd5106d43f77c4946f64c3baccae13b.tar.gz |
Remove implicit dependency on `gitlab_sign_in` assigning `@user`rs-login_as
We shouldn't be using instance variables in specs to begin with, and
depending on this implicit behavior of `gitlab_sign_in` would have made
it more difficult to change to `sign_in` where possible.
...we've also gone ahead and changed to `sign_in` where possible.
Diffstat (limited to 'spec/features/commits_spec.rb')
-rw-r--r-- | spec/features/commits_spec.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb index ab2d85371bf..0373f649ee8 100644 --- a/spec/features/commits_spec.rb +++ b/spec/features/commits_spec.rb @@ -4,10 +4,11 @@ describe 'Commits' do include CiStatusHelper let(:project) { create(:project, :repository) } + let(:user) { create(:user) } describe 'CI' do before do - gitlab_sign_in :user + sign_in(user) stub_ci_pipeline_to_return_yaml_file end @@ -27,7 +28,7 @@ describe 'Commits' do let!(:status) { create(:generic_commit_status, pipeline: pipeline) } before do - project.team << [@user, :reporter] + project.team << [user, :reporter] end describe 'Commit builds' do @@ -52,7 +53,7 @@ describe 'Commits' do context 'when logged as developer' do before do - project.team << [@user, :developer] + project.team << [user, :developer] end describe 'Project commits' do @@ -146,7 +147,7 @@ describe 'Commits' do context "when logged as reporter" do before do - project.team << [@user, :reporter] + project.team << [user, :reporter] build.update_attributes(artifacts_file: artifacts_file) visit ci_status_path(pipeline) end @@ -187,11 +188,10 @@ describe 'Commits' do context 'viewing commits for a branch' do let(:branch_name) { 'master' } - let(:user) { create(:user) } before do project.team << [user, :master] - gitlab_sign_in(user) + sign_in(user) visit namespace_project_commits_path(project.namespace, project, branch_name) end |