Add feature specs for default dashboard preference
This commit is contained in:
parent
1eb9a02f21
commit
bf9dd4327e
|
@ -33,7 +33,7 @@
|
|||
Behavior
|
||||
.panel-body
|
||||
.form-group
|
||||
= f.label :dashboard, class: 'control-label'
|
||||
= f.label :dashboard, 'Default Dashboard', class: 'control-label'
|
||||
.col-sm-10
|
||||
= f.select :dashboard, dashboard_choices, {}, class: 'form-control'
|
||||
%p.help-block.hint
|
||||
|
|
|
@ -1,4 +1,9 @@
|
|||
// Remove body class for any previous theme, re-add current one
|
||||
$('body').removeClass('<%= Gitlab::Themes.body_classes %>')
|
||||
$('body').addClass('<%= user_application_theme %>')
|
||||
|
||||
// Re-enable the "Save" button
|
||||
$('input[type=submit]').enable()
|
||||
|
||||
// Show the notice flash message
|
||||
new Flash('<%= flash.discard(:notice) %>', 'notice')
|
||||
|
|
|
@ -5,22 +5,25 @@ describe 'Profile > Preferences' do
|
|||
|
||||
before do
|
||||
login_as(user)
|
||||
visit profile_preferences_path
|
||||
end
|
||||
|
||||
describe 'User changes their application theme', js: true do
|
||||
let(:default) { Gitlab::Themes.default }
|
||||
let(:theme) { Gitlab::Themes.by_id(5) }
|
||||
|
||||
before do
|
||||
visit profile_preferences_path
|
||||
end
|
||||
|
||||
it 'creates a flash message' do
|
||||
choose "user_theme_id_#{theme.id}"
|
||||
|
||||
within('.flash-container') do
|
||||
expect(page).to have_content('Preferences saved.')
|
||||
end
|
||||
expect_preferences_saved_message
|
||||
end
|
||||
|
||||
it 'updates their preference' do
|
||||
choose "user_theme_id_#{theme.id}"
|
||||
|
||||
visit page.current_path
|
||||
|
||||
expect(page).to have_checked_field("user_theme_id_#{theme.id}")
|
||||
end
|
||||
|
||||
it 'reflects the changes immediately' do
|
||||
|
@ -33,9 +36,45 @@ describe 'Profile > Preferences' do
|
|||
end
|
||||
end
|
||||
|
||||
describe 'User changes their syntax highlighting theme' do
|
||||
before do
|
||||
visit profile_preferences_path
|
||||
describe 'User changes their syntax highlighting theme', js: true do
|
||||
it 'creates a flash message' do
|
||||
choose 'user_color_scheme_id_5'
|
||||
|
||||
expect_preferences_saved_message
|
||||
end
|
||||
|
||||
it 'updates their preference' do
|
||||
choose 'user_color_scheme_id_5'
|
||||
|
||||
visit page.current_path
|
||||
|
||||
expect(page).to have_checked_field('user_color_scheme_id_5')
|
||||
end
|
||||
end
|
||||
|
||||
describe 'User changes their default dashboard' do
|
||||
it 'creates a flash message' do
|
||||
select 'Starred Projects', from: 'user_dashboard'
|
||||
click_button 'Save'
|
||||
|
||||
expect_preferences_saved_message
|
||||
end
|
||||
|
||||
it 'updates their preference' do
|
||||
select 'Starred Projects', from: 'user_dashboard'
|
||||
click_button 'Save'
|
||||
|
||||
click_link 'Dashboard'
|
||||
expect(page.current_path).to eq starred_dashboard_projects_path
|
||||
|
||||
click_link 'Your Projects'
|
||||
expect(page.current_path).to eq dashboard_path
|
||||
end
|
||||
end
|
||||
|
||||
def expect_preferences_saved_message
|
||||
within('.flash-container') do
|
||||
expect(page).to have_content('Preferences saved.')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue