DEV: correct regression and correct tests

etag change in 31976ecf was incorrect, revert it

Also correct regression in test suite.
This commit is contained in:
Sam Saffron
2020-07-06 10:56:19 +10:00
parent 199a53e936
commit 38a30a6e96
4 changed files with 14 additions and 8 deletions

View File

@ -58,15 +58,18 @@ describe Admin::SiteSettingsController do
let!(:user2) { Fabricate(:user) }
it 'should update all existing user options' do
user2.user_option.email_in_reply_to = false
SiteSetting.default_email_in_reply_to = true
user2.user_option.email_in_reply_to = true
user2.user_option.save!
expect {
put "/admin/site_settings/default_email_in_reply_to.json", params: {
default_email_in_reply_to: false,
updateExistingUsers: true
}
}.to change { UserOption.where(email_in_reply_to: false).count }.by(User.count - 1)
put "/admin/site_settings/default_email_in_reply_to.json", params: {
default_email_in_reply_to: false,
updateExistingUsers: true
}
user2.reload
expect(user2.user_option.email_in_reply_to).to eq(false)
end
it 'should not update existing user options' do