diff --git a/db/migrate/20160303183607_clear_common_passwords_cache.rb b/db/migrate/20160303183607_clear_common_passwords_cache.rb new file mode 100644 index 000000000..c4ba8042a --- /dev/null +++ b/db/migrate/20160303183607_clear_common_passwords_cache.rb @@ -0,0 +1,7 @@ +require "common_passwords/common_passwords" + +class ClearCommonPasswordsCache < ActiveRecord::Migration + def change + $redis.without_namespace.del CommonPasswords::LIST_KEY + end +end diff --git a/lib/common_passwords/common_passwords.rb b/lib/common_passwords/common_passwords.rb index 47ef7c5ec..0045cc8a3 100644 --- a/lib/common_passwords/common_passwords.rb +++ b/lib/common_passwords/common_passwords.rb @@ -21,7 +21,6 @@ class CommonPasswords password_list.include?(password) end - private class RedisPasswordList diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 042cd4037..9aeeb1b56 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -333,7 +333,7 @@ describe UsersController do old_token = user.auth_token get :password_reset, token: token - put :password_reset, token: token, password: 'newpassword' + put :password_reset, token: token, password: 'hg9ow8yhg98o' expect(response).to be_success expect(assigns[:error]).to be_blank @@ -372,14 +372,14 @@ describe UsersController do end it "logs in the user" do - put :password_reset, token: token, password: 'newpassword' + put :password_reset, token: token, password: 'ksjafh928r' expect(assigns(:user).errors).to be_blank expect(session[:current_user_id]).to be_present end it "doesn't log in the user when not approved" do SiteSetting.expects(:must_approve_users?).returns(true) - put :password_reset, token: token, password: 'newpassword' + put :password_reset, token: token, password: 'ksjafh928r' expect(assigns(:user).errors).to be_blank expect(session[:current_user_id]).to be_blank end