X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/44ac569d286ce1159f49b2cded184ff0cc4475f5..71cb2c50fcaf29e2b933fc981e40a00223d94d34:/test/test_helper.rb diff --git a/test/test_helper.rb b/test/test_helper.rb index 7157abf5a..60edf6e0c 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -32,6 +32,7 @@ ENV["RAILS_ENV"] = "test" require_relative "../config/environment" require "rails/test_help" require "webmock/minitest" +require "minitest/focus" unless ENV["CI"] WebMock.disable_net_connect!(:allow_localhost => true) @@ -241,13 +242,6 @@ module ActiveSupport end end - def sign_in_as(user) - visit login_path - fill_in "username", :with => user.email - fill_in "password", :with => "test" - click_on "Login", :match => :first - end - def session_for(user) get login_path post login_path, :params => { :username => user.display_name, :password => "test" } @@ -371,5 +365,23 @@ module ActiveSupport el << tag_el end end + + def with_settings(settings) + saved_settings = Settings.to_hash.slice(*settings.keys) + + Settings.merge!(settings) + + yield + ensure + Settings.merge!(saved_settings) + end + + def with_user_account_deletion_delay(value, &block) + freeze_time + + with_settings(:user_account_deletion_delay => value, &block) + ensure + unfreeze_time + end end end