fixing tests
This commit is contained in:
@@ -1,6 +1,24 @@
|
||||
module Danbooru
|
||||
module Extensions
|
||||
module ActiveRecord
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
module ClassMethods
|
||||
def without_timeout
|
||||
connection.execute("SET STATEMENT_TIMEOUT = 0")
|
||||
yield
|
||||
ensure
|
||||
connection.execute("SET STATEMENT_TIMEOUT = 10000")
|
||||
end
|
||||
|
||||
def with_timeout(n)
|
||||
connection.execute("SET STATEMENT_TIMEOUT = #{n}")
|
||||
yield
|
||||
ensure
|
||||
connection.execute("SET STATEMENT_TIMEOUT = 10000")
|
||||
end
|
||||
end
|
||||
|
||||
%w(execute select_value select_values select_all).each do |method_name|
|
||||
define_method("#{method_name}_sql") do |sql, *params|
|
||||
connection.__send__(method_name, self.class.sanitize_sql_array([sql, *params]))
|
||||
|
||||
@@ -1,7 +1,14 @@
|
||||
Danbooru::Application.routes.draw do
|
||||
namespace :admin do
|
||||
match 'users/edit' => 'users#edit', :via => :get
|
||||
match 'users' => 'users#update', :via => :put
|
||||
resources :users, :only => [:get, :put, :destroy]
|
||||
end
|
||||
namespace :moderator do
|
||||
resource :dashboard, :only => [:show]
|
||||
resources :ip_addrs, :only => [:index] do
|
||||
collection do
|
||||
get :search
|
||||
end
|
||||
end
|
||||
end
|
||||
resources :advertisements do
|
||||
resources :hits, :controller => "advertisement_hits", :only => [:create]
|
||||
|
||||
Reference in New Issue
Block a user