X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bd1f568c0a91d8d58b05912fdae1a6912edd3e62..0a9dc1651e1476c904d9172bf9f522b9b18a779a:/test/test_helper.rb?ds=sidebyside

diff --git a/test/test_helper.rb b/test/test_helper.rb
index e1bc91917..c45c73465 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -145,43 +145,6 @@ module ActiveSupport
       { "Authorization" => "Bearer #{token}" }
     end
 
-    ##
-    # make an OAuth signed request
-    def signed_request(method, uri, options = {})
-      uri = URI.parse(uri)
-      uri.scheme ||= "http"
-      uri.host ||= "www.example.com"
-
-      oauth = options.delete(:oauth)
-      params = options.fetch(:params, {}).transform_keys(&:to_s)
-
-      oauth[:consumer] ||= oauth[:token].client_application
-
-      helper = OAuth::Client::Helper.new(nil, oauth)
-
-      request = OAuth::RequestProxy.proxy(
-        "method" => method.to_s.upcase,
-        "uri" => uri,
-        "parameters" => params.merge(helper.oauth_parameters)
-      )
-
-      request.sign!(oauth)
-
-      method(method).call(request.signed_uri, **options)
-    end
-
-    ##
-    # make an OAuth signed GET request
-    def signed_get(uri, options = {})
-      signed_request(:get, uri, options)
-    end
-
-    ##
-    # make an OAuth signed POST request
-    def signed_post(uri, options = {})
-      signed_request(:post, uri, options)
-    end
-
     ##
     # return request header for HTTP Accept
     def accept_format_header(format)
@@ -242,15 +205,6 @@ module ActiveSupport
       end
     end
 
-    def sign_in_as(user)
-      visit login_path
-      within "form", :text => "Email Address or Username" do
-        fill_in "username", :with => user.email
-        fill_in "password", :with => "test"
-        click_on "Login"
-      end
-    end
-
     def session_for(user)
       get login_path
       post login_path, :params => { :username => user.display_name, :password => "test" }
@@ -392,5 +346,41 @@ module ActiveSupport
     ensure
       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