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/triggers_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/triggers_spec.rb')
-rw-r--r-- | spec/features/triggers_spec.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/features/triggers_spec.rb b/spec/features/triggers_spec.rb index bc3c9917a42..5af2c0e9035 100644 --- a/spec/features/triggers_spec.rb +++ b/spec/features/triggers_spec.rb @@ -7,7 +7,7 @@ feature 'Triggers', feature: true, js: true do let(:guest_user) { create(:user) } before do - gitlab_sign_in(user) + sign_in(user) @project = create(:empty_project) @project.team << [user, :master] @@ -33,7 +33,7 @@ feature 'Triggers', feature: true, js: true do # See if "trigger creation successful" message displayed and description and owner are correct expect(page.find('.flash-notice')).to have_content 'Trigger was created successfully.' expect(page.find('.triggers-list')).to have_content 'trigger desc' - expect(page.find('.triggers-list .trigger-owner')).to have_content @user.name + expect(page.find('.triggers-list .trigger-owner')).to have_content user.name end end @@ -61,7 +61,7 @@ feature 'Triggers', feature: true, js: true do # See if "trigger updated successfully" message displayed and description and owner are correct expect(page.find('.flash-notice')).to have_content 'Trigger was successfully updated.' expect(page.find('.triggers-list')).to have_content new_trigger_title - expect(page.find('.triggers-list .trigger-owner')).to have_content @user.name + expect(page.find('.triggers-list .trigger-owner')).to have_content user.name end scenario 'edit "legacy" trigger and save' do @@ -98,7 +98,7 @@ feature 'Triggers', feature: true, js: true do page.accept_confirm do expect(page.find('.flash-notice')).to have_content 'Trigger was re-assigned.' expect(page.find('.triggers-list')).to have_content trigger_title - expect(page.find('.triggers-list .trigger-owner')).to have_content @user.name + expect(page.find('.triggers-list .trigger-owner')).to have_content user.name end end end @@ -157,7 +157,7 @@ feature 'Triggers', feature: true, js: true do expect(page.find('.triggers-list')).not_to have_selector('button.btn-clipboard') # See if trigger owner name doesn't match with current_user and trigger is non-editable - expect(page.find('.triggers-list .trigger-owner')).not_to have_content @user.name + expect(page.find('.triggers-list .trigger-owner')).not_to have_content user.name expect(page.find('.triggers-list')).not_to have_selector('a[title="Edit"]') end @@ -170,7 +170,7 @@ feature 'Triggers', feature: true, js: true do expect(page.find('.triggers-list')).to have_selector('button.btn-clipboard') # See if trigger owner name matches with current_user and is editable - expect(page.find('.triggers-list .trigger-owner')).to have_content @user.name + expect(page.find('.triggers-list .trigger-owner')).to have_content user.name expect(page.find('.triggers-list')).to have_selector('a[title="Edit"]') end end |