diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-10-09 08:53:20 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-10-09 08:53:20 +0000 |
| commit | a78269289e1b6b08afe5e67c6d6af59b9e10acc6 (patch) | |
| tree | af2a4071adc366fafaa6a1c6503579ca87ff0022 | |
| parent | 3b8d229dcfdceef517930b3e6de29959a21451a0 (diff) | |
| parent | 6c07c24c8ddedec6a8326736c12be48a087526ce (diff) | |
| download | gitlab-ce-a78269289e1b6b08afe5e67c6d6af59b9e10acc6.tar.gz | |
Merge branch 'rails5-user-status-spec' into 'master'
Rails5: fix user edit profile clear status spec
See merge request gitlab-org/gitlab-ce!22169
| -rw-r--r-- | changelogs/unreleased/rails5-user-status-spec.yml | 5 | ||||
| -rw-r--r-- | spec/features/profiles/user_edit_profile_spec.rb | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changelogs/unreleased/rails5-user-status-spec.yml b/changelogs/unreleased/rails5-user-status-spec.yml new file mode 100644 index 00000000000..818d480e9fc --- /dev/null +++ b/changelogs/unreleased/rails5-user-status-spec.yml @@ -0,0 +1,5 @@ +--- +title: 'Rails5: fix user edit profile clear status spec' +merge_request: 22169 +author: Jasper Maes +type: other diff --git a/spec/features/profiles/user_edit_profile_spec.rb b/spec/features/profiles/user_edit_profile_spec.rb index e168bb0fc89..5e0434c1c2c 100644 --- a/spec/features/profiles/user_edit_profile_spec.rb +++ b/spec/features/profiles/user_edit_profile_spec.rb @@ -129,6 +129,8 @@ describe 'User edit profile' do click_button 'js-clear-user-status-button' submit_settings + wait_for_requests + visit user_path(user) expect(page).not_to have_selector '.cover-status' end |