cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve 96 Rubocop Lint/AmbiguousRegexpLiteral conflicts

Browse source
This commit is contained in:
Wil 2018-06-08 15:51:17 -04:00 • committed by Andy Allan
parent 5a2d2f97ce
commit a182820139
19 changed files with 96 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

10
test/controllers/amf_controller_test.rb
View file

@ -499,7 +499,7 @@ class AmfControllerTest < ActionController::TestCase
assert_equal 2, result.length
assert_equal -1, result[0]
assert_match /must be logged in/, result[1]
assert_match(/must be logged in/, result[1])
blocked_user = create(:user)
create(:user_block, :user => blocked_user)
@ -511,7 +511,7 @@ class AmfControllerTest < ActionController::TestCase
assert_equal 2, result.length
assert_equal -1, result[0]
assert_match /access to the API has been blocked/, result[1]
assert_match(/access to the API has been blocked/, result[1])
end
def test_findgpx_by_id
@ -941,7 +941,7 @@ class AmfControllerTest < ActionController::TestCase
assert_equal 2, result.size
assert_equal -2, result[0]
assert_match /Node is not in the world/, result[1]
assert_match(/Node is not in the world/, result[1])
end
# check that we can create a way
@ -1194,7 +1194,7 @@ class AmfControllerTest < ActionController::TestCase
assert_equal 2, result.size
assert_equal -1, result[0]
assert_match /Way #{way.id} is still used/, result[1]
assert_match(/Way #{way.id} is still used/, result[1])
new_way = Way.find(way.id)
assert_equal way.version, new_way.version
@ -1308,7 +1308,7 @@ class AmfControllerTest < ActionController::TestCase
assert_equal 2, result.size
assert_equal -1, result[0]
assert_match /relation #{relation.id} is used in/, result[1]
assert_match(/relation #{relation.id} is used in/, result[1])
new_relation = Relation.find(relation.id)
assert_equal relation.version, new_relation.version

6
test/controllers/changeset_controller_test.rb
View file

@ -213,7 +213,7 @@ class ChangesetControllerTest < ActionController::TestCase
get :read, :params => { :id => id }
assert_response :not_found, "should get a not found"
rescue ActionController::UrlGenerationError => ex
assert_match /No route matches/, ex.to_s
assert_match(/No route matches/, ex.to_s)
end
end
end
@ -287,7 +287,7 @@ class ChangesetControllerTest < ActionController::TestCase
put :close, :params => { :id => id }
assert_response :unauthorized, "Shouldn't be able close the non-existant changeset #{id}, when not authorized"
rescue ActionController::UrlGenerationError => ex
assert_match /No route matches/, ex.to_s
assert_match(/No route matches/, ex.to_s)
end
end
@ -298,7 +298,7 @@ class ChangesetControllerTest < ActionController::TestCase
put :close, :params => { :id => id }
assert_response :not_found, "The changeset #{id} doesn't exist, so can't be closed"
rescue ActionController::UrlGenerationError => ex
assert_match /No route matches/, ex.to_s
assert_match(/No route matches/, ex.to_s)
end
end
end

4
test/controllers/diary_entry_controller_test.rb
View file

@ -414,8 +414,8 @@ class DiaryEntryControllerTest < ActionController::TestCase
email = ActionMailer::Base.deliveries.first
assert_equal [user.email], email.to
assert_equal "[OpenStreetMap] #{other_user.display_name} commented on a diary entry", email.subject
assert_match /New comment/, email.text_part.decoded
assert_match /New comment/, email.html_part.decoded
assert_match(/New comment/, email.text_part.decoded)
assert_match(/New comment/, email.html_part.decoded)
ActionMailer::Base.deliveries.clear
comment = DiaryComment.order(:id).last
assert_equal entry.id, comment.diary_entry_id

4
test/controllers/messages_controller_test.rb
View file

@ -180,8 +180,8 @@ class MessagesControllerTest < ActionController::TestCase
e = ActionMailer::Base.deliveries.first
assert_equal [recipient_user.email], e.to
assert_equal "[OpenStreetMap] Test Message", e.subject
assert_match /Test message body/, e.text_part.decoded
assert_match /Test message body/, e.html_part.decoded
assert_match(/Test message body/, e.text_part.decoded)
assert_match(/Test message body/, e.html_part.decoded)
assert_match %r{#{SERVER_URL}/messages/[0-9]+}, e.text_part.decoded
ActionMailer::Base.deliveries.clear
m = Message.last

2
test/controllers/old_node_controller_test.rb
View file

@ -161,7 +161,7 @@ class OldNodeControllerTest < ActionController::TestCase
get :version, :params => { :id => id, :version => version }
assert_response :not_found
rescue ActionController::UrlGenerationError => ex
assert_match /No route matches/, ex.to_s
assert_match(/No route matches/, ex.to_s)
end
##

2
test/controllers/redactions_controller_test.rb
View file

@ -112,7 +112,7 @@ class RedactionsControllerTest < ActionController::TestCase
delete :destroy, :params => { :id => redaction.id }
assert_response :redirect
assert_redirected_to(redaction_path(redaction))
assert_match /^Redaction is not empty/, flash[:error]
assert_match(/^Redaction is not empty/, flash[:error])
end
def test_delete_non_moderator

6
test/controllers/swf_controller_test.rb
View file

@ -26,19 +26,19 @@ class SwfControllerTest < ActionController::TestCase
get :trackpoints, :params => { :xmin => -1, :xmax => 1, :ymin => 51, :ymax => 52, :baselong => 0, :basey => 0, :masterscale => 1 }
assert_response :success
assert_equal "application/x-shockwave-flash", response.content_type
assert_match /^FWS/, response.body
assert_match(/^FWS/, response.body)
assert_equal 80, response.body.length
get :trackpoints, :params => { :xmin => -1, :xmax => 1, :ymin => 51, :ymax => 52, :baselong => 0, :basey => 0, :masterscale => 1, :token => other_user.tokens.create.token }
assert_response :success
assert_equal "application/x-shockwave-flash", response.content_type
assert_match /^FWS/, response.body
assert_match(/^FWS/, response.body)
assert_equal 67, response.body.length
get :trackpoints, :params => { :xmin => -1, :xmax => 1, :ymin => 51, :ymax => 52, :baselong => 0, :basey => 0, :masterscale => 1, :token => user.tokens.create.token }
assert_response :success
assert_equal "application/x-shockwave-flash", response.content_type
assert_match /^FWS/, response.body
assert_match(/^FWS/, response.body)
assert_equal 74, response.body.length
end
end

2
test/controllers/traces_controller_test.rb
View file

@ -593,7 +593,7 @@ class TracesControllerTest < ActionController::TestCase
post :create, :params => { :trace => { :gpx_file => file, :description => "New Trace", :tagstring => "new,trace", :visibility => "trackable" } }, :session => { :user => user }
assert_response :redirect
assert_redirected_to :action => :index, :display_name => user.display_name
assert_match /file has been uploaded/, flash[:notice]
assert_match(/file has been uploaded/, flash[:notice])
trace = Trace.order(:id => :desc).first
assert_equal "a.gpx", trace.name
assert_equal "New Trace", trace.description

46
test/controllers/user_controller_test.rb
View file

@ -245,7 +245,7 @@ class UserControllerTest < ActionController::TestCase
register_email = ActionMailer::Base.deliveries.first
assert_equal register_email.to[0], user.email
assert_match /#{@url}/, register_email.body.to_s
assert_match(/#{@url}/, register_email.body.to_s)
# Check the page
assert_redirected_to :action => "confirm", :display_name => user.display_name
@ -404,7 +404,7 @@ class UserControllerTest < ActionController::TestCase
@request.cookies["_osm_session"] = user.display_name
post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
assert_redirected_to login_path
assert_match /Confirmed your account/, flash[:notice]
assert_match(/Confirmed your account/, flash[:notice])
end
def test_confirm_success_good_token_no_referer
@ -427,7 +427,7 @@ class UserControllerTest < ActionController::TestCase
@request.cookies["_osm_session"] = user.display_name
post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }, :session => { :token => token }
assert_redirected_to login_path
assert_match /Confirmed your account/, flash[:notice]
assert_match(/Confirmed your account/, flash[:notice])
end
def test_confirm_success_no_token_with_referer
@ -438,7 +438,7 @@ class UserControllerTest < ActionController::TestCase
@request.cookies["_osm_session"] = user.display_name
post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
assert_redirected_to login_path(:referer => diary_new_path)
assert_match /Confirmed your account/, flash[:notice]
assert_match(/Confirmed your account/, flash[:notice])
end
def test_confirm_success_good_token_with_referer
@ -461,7 +461,7 @@ class UserControllerTest < ActionController::TestCase
@request.cookies["_osm_session"] = user.display_name
post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }, :session => { :token => token }
assert_redirected_to login_path(:referer => diary_new_path)
assert_match /Confirmed your account/, flash[:notice]
assert_match(/Confirmed your account/, flash[:notice])
end
def test_confirm_expired_token
@ -471,7 +471,7 @@ class UserControllerTest < ActionController::TestCase
@request.cookies["_osm_session"] = user.display_name
post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
assert_redirected_to :action => "confirm"
assert_match /confirmation code has expired/, flash[:error]
assert_match(/confirmation code has expired/, flash[:error])
end
def test_confirm_already_confirmed
@ -481,7 +481,7 @@ class UserControllerTest < ActionController::TestCase
@request.cookies["_osm_session"] = user.display_name
post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
assert_redirected_to :action => "login"
assert_match /already been confirmed/, flash[:error]
assert_match(/already been confirmed/, flash[:error])
end
def test_confirm_resend_success
@ -494,7 +494,7 @@ class UserControllerTest < ActionController::TestCase
assert_response :redirect
assert_redirected_to login_path
assert_match /sent a new confirmation/, flash[:notice]
assert_match(/sent a new confirmation/, flash[:notice])
email = ActionMailer::Base.deliveries.last
@ -541,7 +541,7 @@ class UserControllerTest < ActionController::TestCase
post :confirm_email, :params => { :confirm_string => confirm_string }
assert_response :redirect
assert_redirected_to :action => :account, :display_name => user.display_name
assert_match /Confirmed your change of email address/, flash[:notice]
assert_match(/Confirmed your change of email address/, flash[:notice])
end
def test_confirm_email_already_confirmed
@ -551,14 +551,14 @@ class UserControllerTest < ActionController::TestCase
post :confirm_email, :params => { :confirm_string => confirm_string }
assert_response :redirect
assert_redirected_to :action => :account, :display_name => user.display_name
assert_match /already been confirmed/, flash[:error]
assert_match(/already been confirmed/, flash[:error])
end
def test_confirm_email_bad_token
post :confirm_email, :params => { :confirm_string => "XXXXX" }
assert_response :success
assert_template :confirm_email
assert_match /confirmation code has expired or does not exist/, flash[:error]
assert_match(/confirmation code has expired or does not exist/, flash[:error])
end
##
@ -575,7 +575,7 @@ class UserControllerTest < ActionController::TestCase
post :confirm_email, :params => { :confirm_string => confirm_string }
assert_response :redirect
assert_redirected_to :action => :account, :display_name => user.display_name
assert_match /Confirmed your change of email address/, flash[:notice]
assert_match(/Confirmed your change of email address/, flash[:notice])
# gravatar use should now be enabled
assert User.find(user.id).image_use_gravatar
end
@ -590,7 +590,7 @@ class UserControllerTest < ActionController::TestCase
post :confirm_email, :params => { :confirm_string => confirm_string }
assert_response :redirect
assert_redirected_to :action => :account, :display_name => user.display_name
assert_match /Confirmed your change of email address/, flash[:notice]
assert_match(/Confirmed your change of email address/, flash[:notice])
# gravatar use should now be disabled
assert_not User.find(user.id).image_use_gravatar
end
@ -678,7 +678,7 @@ class UserControllerTest < ActionController::TestCase
end
assert_response :redirect
assert_redirected_to :action => :login
assert_match /^Sorry you lost it/, flash[:notice]
assert_match(/^Sorry you lost it/, flash[:notice])
email = ActionMailer::Base.deliveries.first
assert_equal 1, email.to.count
assert_equal user.email, email.to.first
@ -691,7 +691,7 @@ class UserControllerTest < ActionController::TestCase
end
assert_response :redirect
assert_redirected_to :action => :login
assert_match /^Sorry you lost it/, flash[:notice]
assert_match(/^Sorry you lost it/, flash[:notice])
email = ActionMailer::Base.deliveries.first
assert_equal 1, email.to.count
assert_equal uppercase_user.email, email.to.first
@ -714,7 +714,7 @@ class UserControllerTest < ActionController::TestCase
end
assert_response :redirect
assert_redirected_to :action => :login
assert_match /^Sorry you lost it/, flash[:notice]
assert_match(/^Sorry you lost it/, flash[:notice])
email = ActionMailer::Base.deliveries.first
assert_equal 1, email.to.count
assert_equal third_user.email, email.to.first
@ -727,7 +727,7 @@ class UserControllerTest < ActionController::TestCase
end
assert_response :redirect
assert_redirected_to :action => :login
assert_match /^Sorry you lost it/, flash[:notice]
assert_match(/^Sorry you lost it/, flash[:notice])
email = ActionMailer::Base.deliveries.first
assert_equal 1, email.to.count
assert_equal third_user.email, email.to.first
@ -1251,7 +1251,7 @@ class UserControllerTest < ActionController::TestCase
post :make_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
end
assert_redirected_to user_path(:display_name => friend.display_name)
assert_match /is now your friend/, flash[:notice]
assert_match(/is now your friend/, flash[:notice])
assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
email = ActionMailer::Base.deliveries.first
assert_equal 1, email.to.count
@ -1263,7 +1263,7 @@ class UserControllerTest < ActionController::TestCase
post :make_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
end
assert_redirected_to user_path(:display_name => friend.display_name)
assert_match /You are already friends with/, flash[:warning]
assert_match(/You are already friends with/, flash[:warning])
assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
end
@ -1290,7 +1290,7 @@ class UserControllerTest < ActionController::TestCase
post :make_friend, :params => { :display_name => friend.display_name, :referer => "/test" }, :session => { :user => user }
end
assert_redirected_to "/test"
assert_match /is now your friend/, flash[:notice]
assert_match(/is now your friend/, flash[:notice])
assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
email = ActionMailer::Base.deliveries.first
assert_equal 1, email.to.count
@ -1336,13 +1336,13 @@ class UserControllerTest < ActionController::TestCase
# When logged in a POST should remove the friendship
post :remove_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
assert_redirected_to user_path(:display_name => friend.display_name)
assert_match /was removed from your friends/, flash[:notice]
assert_match(/was removed from your friends/, flash[:notice])
assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
# A second POST should report that the friendship does not exist
post :remove_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
assert_redirected_to user_path(:display_name => friend.display_name)
assert_match /is not one of your friends/, flash[:error]
assert_match(/is not one of your friends/, flash[:error])
assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
end
@ -1368,7 +1368,7 @@ class UserControllerTest < ActionController::TestCase
# When logged in a POST should remove the friendship and refer
post :remove_friend, :params => { :display_name => friend.display_name, :referer => "/test" }, :session => { :user => user }
assert_redirected_to "/test"
assert_match /was removed from your friends/, flash[:notice]
assert_match(/was removed from your friends/, flash[:notice])
assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
end