fix tests

app/controllers/bulk_update_requests_controller.rb

@@ -44,7 +44,7 @@ class BulkUpdateRequestsController < ApplicationController
   end
 
   def index
-    @bulk_update_requests = BulkUpdateRequest.search(params[:search]).order("(case status when 'pending' then 0 when 'approved' then 1 else 2 end), id desc").paginate(params[:page], :limit => params[:limit])
+    @bulk_update_requests = BulkUpdateRequest.paginate(params[:page])
     respond_with(@bulk_update_requests)
   end
 

app/logical/downloads/strategies/pixiv.rb

@@ -34,7 +34,7 @@ module Downloads
         if url =~ %r!(/img/.+?/.+?)_m.+$!
           match = $1
           url.sub!(match + "_m", match)
-        elsif url =~ %r!(/img/.+?/.+?)_s.+$! && url !~ %r!/img-inf/!
+        elsif url !~ %r!/img-inf/! && url =~ %r!(/img/.+?/.+?)_s.+$!
           match = $1
           url.sub!(match + "_s", match)
         end

app/models/dmail.rb

@@ -188,12 +188,12 @@ class Dmail < ActiveRecord::Base
     update_column(:is_read, true)
 
     unless Dmail.where(:is_read => false, :owner_id => CurrentUser.user.id).exists?
-      CurrentUser.user.update_column(:has_mail, false)
+      CurrentUser.user.update_attribute(:has_mail, false)
     end
   end
 
   def update_recipient
-    to.update_column(:has_mail, true)
+    to.update_attribute(:has_mail, true)
   end
 
   def visible_to?(user)