Commit c750fc6d authored by Sean McGivern's avatar Sean McGivern Committed by Simon Knox

Merge branch '36168-fix-transient-preferences-specs' into 'master'

Fix Profile > Preferences feature specs

See merge request !13382
parent 69d9d2c3
require 'spec_helper' require 'spec_helper'
describe 'Profile > Preferences' do describe 'Profile > Preferences', :js do
let(:user) { create(:user) } let(:user) { create(:user) }
before do before do
...@@ -8,28 +8,32 @@ describe 'Profile > Preferences' do ...@@ -8,28 +8,32 @@ describe 'Profile > Preferences' do
visit profile_preferences_path visit profile_preferences_path
end 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 it 'creates a flash message' do
choose 'user_color_scheme_id_5' choose 'user_color_scheme_id_5'
wait_for_requests
expect_preferences_saved_message expect_preferences_saved_message
end end
it 'updates their preference' do it 'updates their preference' do
choose 'user_color_scheme_id_5' choose 'user_color_scheme_id_5'
allowing_for_delay do wait_for_requests
visit page.current_path refresh
expect(page).to have_checked_field('user_color_scheme_id_5') expect(page).to have_checked_field('user_color_scheme_id_5')
end end
end end
end
describe 'User changes their default dashboard', js: true do describe 'User changes their default dashboard' do
it 'creates a flash message' do it 'creates a flash message' do
select 'Starred Projects', from: 'user_dashboard' select 'Starred Projects', from: 'user_dashboard'
click_button 'Save' click_button 'Save'
wait_for_requests
expect_preferences_saved_message expect_preferences_saved_message
end end
...@@ -37,12 +41,12 @@ describe 'Profile > Preferences' do ...@@ -37,12 +41,12 @@ describe 'Profile > Preferences' do
select 'Starred Projects', from: 'user_dashboard' select 'Starred Projects', from: 'user_dashboard'
click_button 'Save' click_button 'Save'
allowing_for_delay do wait_for_requests
find('#logo').click find('#logo').click
expect(page).to have_content("You don't have starred projects yet") expect(page).to have_content("You don't have starred projects yet")
expect(page.current_path).to eq starred_dashboard_projects_path expect(page.current_path).to eq starred_dashboard_projects_path
end
find('.shortcuts-activity').trigger('click') find('.shortcuts-activity').trigger('click')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment