Merge pull request #4537 from tomhughes/multiple-trace-priority

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 421ae8698847a0d1cbe7090045b69e37d37db389..60edf6e0c25a56caabe8a2bbb193b10d304fd86f 100644 (file)
--- 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_relative "../config/environment"
 require "rails/test_help"
 require "webmock/minitest"

+require "minitest/focus" unless ENV["CI"]

 
 WebMock.disable_net_connect!(:allow_localhost => true)
 
 
 WebMock.disable_net_connect!(:allow_localhost => true)
 


@@ -241,13 +242,6 @@ module ActiveSupport
       end
     end
 
       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" }
     def session_for(user)
       get login_path
       post login_path, :params => { :username => user.display_name, :password => "test" }


@@ -255,7 +249,7 @@ module ActiveSupport
     end
 
     def xml_for_node(node)
     end
 
     def xml_for_node(node)

-      doc = OSM::API.new.get_xml_doc
+      doc = OSM::API.new.xml_doc

       doc.root << xml_node_for_node(node)
       doc
     end
       doc.root << xml_node_for_node(node)
       doc
     end


@@ -277,7 +271,7 @@ module ActiveSupport
     end
 
     def xml_for_way(way)
     end
 
     def xml_for_way(way)

-      doc = OSM::API.new.get_xml_doc
+      doc = OSM::API.new.xml_doc

       doc.root << xml_node_for_way(way)
       doc
     end
       doc.root << xml_node_for_way(way)
       doc
     end


@@ -308,7 +302,7 @@ module ActiveSupport
     end
 
     def xml_for_relation(relation)
     end
 
     def xml_for_relation(relation)

-      doc = OSM::API.new.get_xml_doc
+      doc = OSM::API.new.xml_doc

       doc.root << xml_node_for_relation(relation)
       doc
     end
       doc.root << xml_node_for_relation(relation)
       doc
     end


@@ -371,5 +365,23 @@ module ActiveSupport
         el << tag_el
       end
     end
         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
   end
 end