Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-09 06:46:01 +01:00
Code Issues Packages Projects Releases Activity

Fix RuboCop offenses due to r22343: Style/RedundantRegexpEscape, Layout/EmptyLinesAroundMethodBody, and Style/HashSyntax (#39181).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/trunk@22346 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2023-10-16 14:17:35 +00:00
parent 28a45b7144
commit 03280712d3
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/user_query.rb
View File

@@ -176,7 +176,7 @@ class UserQuery < Query
else else
# match = (operator == '~') # match = (operator == '~')
match = !operator.start_with?('!') match = !operator.start_with?('!')
matching_operator = operator.sub /^\!/, '' matching_operator = operator.sub /^!/, ''
name_sql = %w(login firstname lastname).map{|field| sql_for_field(:name, operator, value, User.table_name, field)} name_sql = %w(login firstname lastname).map{|field| sql_for_field(:name, operator, value, User.table_name, field)}
emails = EmailAddress.table_name emails = EmailAddress.table_name
@@ -191,6 +191,5 @@ class UserQuery < Query
op = match ? " OR " : " AND " op = match ? " OR " : " AND "
"(#{conditions.map{|s| "(#{s})"}.join(op)})" "(#{conditions.map{|s| "(#{s})"}.join(op)})"
end end
end end
end end

10
test/integration/api_test/users_test.rb
View File

@@ -83,21 +83,21 @@ class Redmine::ApiTest::UsersTest < Redmine::ApiTest::Base
end end
test "GET /users.json with legacy filter params" do test "GET /users.json with legacy filter params" do
get '/users.json', :headers => credentials('admin'), params: { status: 3 } get '/users.json', headers: credentials('admin'), params: { status: 3 }
assert_response :success assert_response :success
json = ActiveSupport::JSON.decode(response.body) json = ActiveSupport::JSON.decode(response.body)
assert json.key?('users') assert json.key?('users')
users = User.where(status: 3) users = User.where(status: 3)
assert_equal users.size, json['users'].size assert_equal users.size, json['users'].size
get '/users.json', :headers => credentials('admin'), params: { name: 'jsmith' } get '/users.json', headers: credentials('admin'), params: { name: 'jsmith' }
assert_response :success assert_response :success
json = ActiveSupport::JSON.decode(response.body) json = ActiveSupport::JSON.decode(response.body)
assert json.key?('users') assert json.key?('users')
assert_equal 1, json['users'].size assert_equal 1, json['users'].size
assert_equal 2, json['users'][0]['id'] assert_equal 2, json['users'][0]['id']
get '/users.json', :headers => credentials('admin'), params: { group_id: '10' } get '/users.json', headers: credentials('admin'), params: { group_id: '10' }
assert_response :success assert_response :success
json = ActiveSupport::JSON.decode(response.body) json = ActiveSupport::JSON.decode(response.body)
assert json.key?('users') assert json.key?('users')
@@ -107,13 +107,13 @@ class Redmine::ApiTest::UsersTest < Redmine::ApiTest::Base
# there should be an implicit filter for status = 1 # there should be an implicit filter for status = 1
User.where(id: [2, 8]).update_all status: 3 User.where(id: [2, 8]).update_all status: 3
get '/users.json', :headers => credentials('admin'), params: { name: 'jsmith' } get '/users.json', headers: credentials('admin'), params: { name: 'jsmith' }
assert_response :success assert_response :success
json = ActiveSupport::JSON.decode(response.body) json = ActiveSupport::JSON.decode(response.body)
assert json.key?('users') assert json.key?('users')
assert_equal 0, json['users'].size assert_equal 0, json['users'].size
get '/users.json', :headers => credentials('admin'), params: { group_id: '10' } get '/users.json', headers: credentials('admin'), params: { group_id: '10' }
assert_response :success assert_response :success
json = ActiveSupport::JSON.decode(response.body) json = ActiveSupport::JSON.decode(response.body)
assert json.key?('users') assert json.key?('users')