diff options
author | Rémy Coutable <remy@rymai.me> | 2017-08-08 16:45:52 +0200 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-08-08 16:48:20 +0200 |
commit | 3f9cee9a5bf0b9e1a68ed6f493780b95d891f1f1 (patch) | |
tree | f2ac4f0a03a2bd4da67c512b778b9323aec2f656 | |
parent | b612a47da0e0225332a59ab961206f84602ad629 (diff) | |
download | gitlab-ce-3f9cee9a5bf0b9e1a68ed6f493780b95d891f1f1.tar.gz |
Fix Profile > Preferences feature specs36168-fix-transient-preferences-specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r-- | spec/features/profiles/preferences_spec.rb | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/spec/features/profiles/preferences_spec.rb b/spec/features/profiles/preferences_spec.rb index 9123aa9d155..c935cdfd5c4 100644 --- a/spec/features/profiles/preferences_spec.rb +++ b/spec/features/profiles/preferences_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe 'Profile > Preferences' do +describe 'Profile > Preferences', :js do let(:user) { create(:user) } before do @@ -8,28 +8,32 @@ describe 'Profile > Preferences' do visit profile_preferences_path end - describe 'User changes their syntax highlighting theme', js: true do + describe 'User changes their syntax highlighting theme' do it 'creates a flash message' do choose 'user_color_scheme_id_5' + wait_for_requests + expect_preferences_saved_message end it 'updates their preference' do choose 'user_color_scheme_id_5' - allowing_for_delay do - visit page.current_path - expect(page).to have_checked_field('user_color_scheme_id_5') - end + wait_for_requests + refresh + + expect(page).to have_checked_field('user_color_scheme_id_5') end end - describe 'User changes their default dashboard', js: true do + describe 'User changes their default dashboard' do it 'creates a flash message' do select 'Starred Projects', from: 'user_dashboard' click_button 'Save' + wait_for_requests + expect_preferences_saved_message end @@ -37,12 +41,12 @@ describe 'Profile > Preferences' do select 'Starred Projects', from: 'user_dashboard' click_button 'Save' - allowing_for_delay do - find('#logo').click + wait_for_requests + + find('#logo').click - expect(page).to have_content("You don't have starred projects yet") - expect(page.current_path).to eq starred_dashboard_projects_path - end + expect(page).to have_content("You don't have starred projects yet") + expect(page.current_path).to eq starred_dashboard_projects_path find('.shortcuts-activity').trigger('click') |