Merge remote-tracking branch 'upstream/pull/4934'

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 9d06d23534f8cdcb9ea297aa4bd1cf048263a6f6..1d04f57da0c9cee215350f95e8a1e7a6e0b5118f 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" }


@@ -372,15 +366,58 @@ module ActiveSupport
       end
     end
 
       end
     end
 

-    def with_user_account_deletion_delay(value)
-      freeze_time
-      default_value = Settings.user_account_deletion_delay
-      Settings.user_account_deletion_delay = value
+    def with_settings(settings)
+      saved_settings = Settings.to_hash.slice(*settings.keys)
+
+      Settings.merge!(settings)

 
       yield
 
       yield

+    ensure
+      Settings.merge!(saved_settings)
+    end
+
+    def with_user_account_deletion_delay(value, &block)
+      freeze_time

 
 

-      Settings.user_account_deletion_delay = default_value
+      with_settings(:user_account_deletion_delay => value, &block)
+    ensure

       unfreeze_time
     end
       unfreeze_time
     end

+
+    # This is a convenience method for checks of resources rendered in a map view sidebar
+    # First we check that when we don't have an id, it will correctly return a 404
+    # then we check that we get the correct 404 when a non-existant id is passed
+    # then we check that it will get a successful response, when we do pass an id
+    def sidebar_browse_check(path, id, template)
+      path_method = method(path)
+
+      assert_raise ActionController::UrlGenerationError do
+        get path_method.call
+      end
+
+      assert_raise ActionController::UrlGenerationError do
+        get path_method.call(:id => -10) # we won't have an id that's negative
+      end
+
+      get path_method.call(:id => 0)
+      assert_response :not_found
+      assert_template "browse/not_found"
+      assert_template :layout => "map"
+
+      get path_method.call(:id => 0), :xhr => true
+      assert_response :not_found
+      assert_template "browse/not_found"
+      assert_template :layout => "xhr"
+
+      get path_method.call(:id => id)
+      assert_response :success
+      assert_template template
+      assert_template :layout => "map"
+
+      get path_method.call(:id => id), :xhr => true
+      assert_response :success
+      assert_template template
+      assert_template :layout => "xhr"
+    end

   end
 end
   end
 end