devise 4.5.0 → 4.6.0

data/test/integration/timeoutable_test.rb

@@ -1,186 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-class SessionTimeoutTest < Devise::IntegrationTest
-
-  def last_request_at
-    @controller.user_session['last_request_at']
-  end
-
-  test 'set last request at in user session after each request' do
-    sign_in_as_user
-    assert_not_nil last_request_at
-
-    @controller.user_session.delete('last_request_at')
-    get users_path
-    assert_not_nil last_request_at
-  end
-
-  test 'set last request at in user session after each request is skipped if tracking is disabled' do
-    sign_in_as_user
-    old_last_request = last_request_at
-    assert_not_nil last_request_at
-
-    get users_path, headers: { 'devise.skip_trackable' => true }
-    assert_equal old_last_request, last_request_at
-  end
-
-  test 'does not set last request at in user session after each request if timeoutable is disabled' do
-    sign_in_as_user
-    old_last_request = last_request_at
-    assert_not_nil last_request_at
-
-    new_time = 2.seconds.from_now
-    Time.stubs(:now).returns(new_time)
-
-    get users_path, headers: { 'devise.skip_timeoutable' => true }
-    assert_equal old_last_request, last_request_at
-  end
-
-  test 'does not time out user session before default limit time' do
-    sign_in_as_user
-    assert_response :success
-    assert warden.authenticated?(:user)
-
-    get users_path
-    assert_response :success
-    assert warden.authenticated?(:user)
-  end
-
-  test 'time out user session after default limit time when sign_out_all_scopes is false' do
-    swap Devise, sign_out_all_scopes: false do
-      sign_in_as_admin
-
-      user = sign_in_as_user
-      get expire_user_path(user)
-      assert_not_nil last_request_at
-
-      get users_path
-      assert_redirected_to users_path
-      refute warden.authenticated?(:user)
-      assert warden.authenticated?(:admin)
-    end
-  end
-
-  test 'time out all sessions after default limit time when sign_out_all_scopes is true' do
-    swap Devise, sign_out_all_scopes: true do
-      sign_in_as_admin
-
-      user = sign_in_as_user
-      get expire_user_path(user)
-      assert_not_nil last_request_at
-
-      get root_path
-      refute warden.authenticated?(:user)
-      refute warden.authenticated?(:admin)
-    end
-  end
-
-  test 'time out user session after deault limit time and redirect to latest get request' do
-    user = sign_in_as_user
-    visit edit_form_user_path(user)
-
-    click_button 'Update'
-    sign_in_as_user
-
-    assert_equal edit_form_user_url(user), current_url
-  end
-
-  test 'time out is not triggered on sign out' do
-    user = sign_in_as_user
-    get expire_user_path(user)
-
-    delete destroy_user_session_path
-
-    assert_response :redirect
-    assert_redirected_to root_path
-    follow_redirect!
-    assert_contain 'Signed out successfully'
-  end
-
-  test 'expired session is not extended by sign in page' do
-    user = sign_in_as_user
-    get expire_user_path(user)
-    assert warden.authenticated?(:user)
-
-    get "/users/sign_in"
-    assert_redirected_to "/users/sign_in"
-    follow_redirect!
-
-    assert_response :success
-    assert_contain 'Sign in'
-    refute warden.authenticated?(:user)
-  end
-
-  test 'time out is not triggered on sign in' do
-    user = sign_in_as_user
-    get expire_user_path(user)
-
-    post "/users/sign_in", params: { email: user.email, password: "123456" }
-
-    assert_response :redirect
-    follow_redirect!
-    assert_contain 'You are signed in'
-  end
-
-  test 'user configured timeout limit' do
-    swap Devise, timeout_in: 8.minutes do
-      user = sign_in_as_user
-
-      get users_path
-      assert_not_nil last_request_at
-      assert_response :success
-      assert warden.authenticated?(:user)
-
-      get expire_user_path(user)
-      get users_path
-      assert_redirected_to users_path
-      refute warden.authenticated?(:user)
-    end
-  end
-
-  test 'error message with i18n' do
-    store_translations :en, devise: {
-      failure: { user: { timeout: 'Session expired!' } }
-    } do
-      user = sign_in_as_user
-
-      get expire_user_path(user)
-      get root_path
-      follow_redirect!
-      assert_contain 'Session expired!'
-    end
-  end
-
-  test 'error message with i18n with double redirect' do
-    store_translations :en, devise: {
-      failure: { user: { timeout: 'Session expired!' } }
-    } do
-      user = sign_in_as_user
-
-      get expire_user_path(user)
-      get users_path
-      follow_redirect!
-      follow_redirect!
-      assert_contain 'Session expired!'
-    end
-  end
-
-  test 'time out not triggered if remembered' do
-    user = sign_in_as_user remember_me: true
-    get expire_user_path(user)
-    assert_not_nil last_request_at
-
-    get users_path
-    assert_response :success
-    assert warden.authenticated?(:user)
-  end
-
-  test 'does not crash when the last_request_at is a String' do
-    user = sign_in_as_user
-
-    get edit_form_user_path(user, last_request_at: Time.now.utc.to_s)
-    get users_path
-  end
-end

data/test/integration/trackable_test.rb

@@ -1,99 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-class TrackableHooksTest < Devise::IntegrationTest
-  test "trackable should not run model validations" do
-    sign_in_as_user
-
-    refute User.validations_performed
-  end
-
-  test "current and last sign in timestamps are updated on each sign in" do
-    user = create_user
-    assert_nil user.current_sign_in_at
-    assert_nil user.last_sign_in_at
-
-    sign_in_as_user
-    user.reload
-
-    assert user.current_sign_in_at.acts_like?(:time)
-    assert user.last_sign_in_at.acts_like?(:time)
-
-    assert_equal user.current_sign_in_at, user.last_sign_in_at
-    assert user.current_sign_in_at >= user.created_at
-
-    delete destroy_user_session_path
-    new_time = 2.seconds.from_now
-    Time.stubs(:now).returns(new_time)
-
-    sign_in_as_user
-    user.reload
-    assert user.current_sign_in_at > user.last_sign_in_at
-  end
-
-  test "current and last sign in remote ip are updated on each sign in" do
-    user = create_user
-    assert_nil user.current_sign_in_ip
-    assert_nil user.last_sign_in_ip
-
-    sign_in_as_user
-    user.reload
-
-    assert_equal "127.0.0.1", user.current_sign_in_ip
-    assert_equal "127.0.0.1", user.last_sign_in_ip
-  end
-
-  test "current remote ip returns original ip behind a non transparent proxy" do
-    user = create_user
-
-    arbitrary_ip = '200.121.1.69'
-    sign_in_as_user do
-      header 'HTTP_X_FORWARDED_FOR', arbitrary_ip
-    end
-    user.reload
-    assert_equal arbitrary_ip, user.current_sign_in_ip
-  end
-
-  test "increase sign in count" do
-    user = create_user
-    assert_equal 0, user.sign_in_count
-
-    sign_in_as_user
-    user.reload
-    assert_equal 1, user.sign_in_count
-
-    delete destroy_user_session_path
-    sign_in_as_user
-    user.reload
-    assert_equal 2, user.sign_in_count
-  end
-
-  test "does not update anything if user has signed out along the way" do
-    swap Devise, allow_unconfirmed_access_for: 0.days do
-      user = create_user(confirm: false)
-      sign_in_as_user
-
-      user.reload
-      assert_nil user.current_sign_in_at
-      assert_nil user.last_sign_in_at
-    end
-  end
-
-  test "do not track if devise.skip_trackable is set" do
-    user = create_user
-    sign_in_as_user do
-      header 'devise.skip_trackable', '1'
-    end
-    user.reload
-    assert_equal 0, user.sign_in_count
-    delete destroy_user_session_path
-
-    sign_in_as_user do
-      header 'devise.skip_trackable', false
-    end
-    user.reload
-    assert_equal 1, user.sign_in_count
-  end
-
-end

data/test/mailers/confirmation_instructions_test.rb

@@ -1,117 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-class ConfirmationInstructionsTest < ActionMailer::TestCase
-
-  def setup
-    setup_mailer
-    Devise.mailer = 'Devise::Mailer'
-    Devise.mailer_sender = 'test@example.com'
-  end
-
-  def teardown
-    Devise.mailer = 'Devise::Mailer'
-    Devise.mailer_sender = 'please-change-me@config-initializers-devise.com'
-  end
-
-  def user
-    @user ||= create_user
-  end
-
-  def mail
-    @mail ||= begin
-      user
-      ActionMailer::Base.deliveries.first
-    end
-  end
-
-  test 'email sent after creating the user' do
-    assert_not_nil mail
-  end
-
-  test 'content type should be set to html' do
-    assert mail.content_type.include?('text/html')
-  end
-
-  test 'send confirmation instructions to the user email' do
-    mail
-    assert_equal [user.email], mail.to
-  end
-
-  test 'set up sender from configuration' do
-    assert_equal ['test@example.com'], mail.from
-  end
-
-  test 'set up sender from custom mailer defaults' do
-    Devise.mailer = 'Users::Mailer'
-    assert_equal ['custom@example.com'], mail.from
-  end
-
-  test 'set up sender from custom mailer defaults with proc' do
-    Devise.mailer = 'Users::FromProcMailer'
-    assert_equal ['custom@example.com'], mail.from
-  end
-
-  test 'custom mailer renders parent mailer template' do
-    Devise.mailer = 'Users::Mailer'
-    assert_present mail.body.encoded
-  end
-
-  test 'set up reply to as copy from sender' do
-    assert_equal ['test@example.com'], mail.reply_to
-  end
-
-  test 'set up reply to as different if set in defaults' do
-    Devise.mailer = 'Users::ReplyToMailer'
-    assert_equal ['custom@example.com'], mail.from
-    assert_equal ['custom_reply_to@example.com'], mail.reply_to
-  end
-
-  test 'set up subject from I18n' do
-    store_translations :en, devise: { mailer: { confirmation_instructions: { subject: 'Account Confirmation' } } } do
-      assert_equal 'Account Confirmation', mail.subject
-    end
-  end
-
-  test 'subject namespaced by model' do
-    store_translations :en, devise: { mailer: { confirmation_instructions: { user_subject: 'User Account Confirmation' } } } do
-      assert_equal 'User Account Confirmation', mail.subject
-    end
-  end
-
-  test 'body should have user info' do
-    assert_match user.email, mail.body.encoded
-  end
-
-  test 'body should have link to confirm the account' do
-    host, port = ActionMailer::Base.default_url_options.values_at :host, :port
-
-    if mail.body.encoded =~ %r{<a href=\"http://#{host}:#{port}/users/confirmation\?confirmation_token=([^"]+)">}
-      assert_equal $1, user.confirmation_token
-    else
-      flunk "expected confirmation url regex to match"
-    end
-  end
-
-  test 'renders a scoped if scoped_views is set to true' do
-    swap Devise, scoped_views: true do
-      assert_equal user.email, mail.body.decoded
-    end
-  end
-
-  test 'renders a scoped if scoped_views is set in the mailer class' do
-    begin
-      Devise::Mailer.scoped_views = true
-      assert_equal user.email, mail.body.decoded
-    ensure
-      Devise::Mailer.send :remove_instance_variable, :@scoped_views
-    end
-  end
-
-  test 'mailer sender accepts a proc' do
-    swap Devise, mailer_sender: proc { "another@example.com" } do
-      assert_equal ['another@example.com'], mail.from
-    end
-  end
-end

data/test/mailers/email_changed_test.rb

@@ -1,132 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-class EmailChangedTest < ActionMailer::TestCase
-  def setup
-    setup_mailer
-    Devise.mailer = 'Devise::Mailer'
-    Devise.mailer_sender = 'test@example.com'
-    Devise.send_email_changed_notification = true
-  end
-
-  def teardown
-    Devise.mailer = 'Devise::Mailer'
-    Devise.mailer_sender = 'please-change-me@config-initializers-devise.com'
-    Devise.send_email_changed_notification = false
-  end
-
-  def user
-    @user ||= create_user.tap { |u|
-      @original_user_email = u.email
-      u.update!(email: 'new-email@example.com')
-    }
-  end
-
-  def mail
-    @mail ||= begin
-      user
-      ActionMailer::Base.deliveries.last
-    end
-  end
-
-  test 'email sent after changing the user email' do
-    assert_not_nil mail
-  end
-
-  test 'content type should be set to html' do
-    assert mail.content_type.include?('text/html')
-  end
-
-  test 'send email changed to the original user email' do
-    mail
-    assert_equal [@original_user_email], mail.to
-  end
-
-  test 'set up sender from configuration' do
-    assert_equal ['test@example.com'], mail.from
-  end
-
-  test 'set up sender from custom mailer defaults' do
-    Devise.mailer = 'Users::Mailer'
-    assert_equal ['custom@example.com'], mail.from
-  end
-
-  test 'set up sender from custom mailer defaults with proc' do
-    Devise.mailer = 'Users::FromProcMailer'
-    assert_equal ['custom@example.com'], mail.from
-  end
-
-  test 'custom mailer renders parent mailer template' do
-    Devise.mailer = 'Users::Mailer'
-    assert_present mail.body.encoded
-  end
-
-  test 'set up reply to as copy from sender' do
-    assert_equal ['test@example.com'], mail.reply_to
-  end
-
-  test 'set up reply to as different if set in defaults' do
-    Devise.mailer = 'Users::ReplyToMailer'
-    assert_equal ['custom@example.com'], mail.from
-    assert_equal ['custom_reply_to@example.com'], mail.reply_to
-  end
-
-  test 'set up subject from I18n' do
-    store_translations :en, devise: { mailer: { email_changed: { subject: 'Email Has Changed' } } } do
-      assert_equal 'Email Has Changed', mail.subject
-    end
-  end
-
-  test 'subject namespaced by model' do
-    store_translations :en, devise: { mailer: { email_changed: { user_subject: 'User Email Has Changed' } } } do
-      assert_equal 'User Email Has Changed', mail.subject
-    end
-  end
-
-  test 'body should have user info' do
-    body = mail.body.encoded
-    assert_match "Hello #{@original_user_email}", body
-    assert_match "has been changed to #{user.email}", body
-  end
-end
-
-class EmailChangedReconfirmationTest < ActionMailer::TestCase
-  def setup
-    setup_mailer
-    Devise.mailer = 'Devise::Mailer'
-    Devise.mailer_sender = 'test@example.com'
-    Devise.send_email_changed_notification = true
-  end
-
-  def teardown
-    Devise.mailer = 'Devise::Mailer'
-    Devise.mailer_sender = 'please-change-me@config-initializers-devise.com'
-    Devise.send_email_changed_notification = false
-  end
-
-  def admin
-    @admin ||= create_admin.tap { |u|
-      @original_admin_email = u.email
-      u.update!(email: 'new-email@example.com')
-    }
-  end
-
-  def mail
-    @mail ||= begin
-      admin
-      ActionMailer::Base.deliveries[-2]
-    end
-  end
-
-  test 'send email changed to the original user email' do
-    mail
-    assert_equal [@original_admin_email], mail.to
-  end
-
-  test 'body should have unconfirmed user info' do
-    body = mail.body.encoded
-    assert_match admin.email, body
-    assert_match "is being changed to #{admin.unconfirmed_email}", body
-  end
-end