Fix new rubocop warnings

diff --git a/test/controllers/api/changesets_controller_test.rb b/test/controllers/api/changesets_controller_test.rb
index 4339844140e2df80bcc856a7cfff56137dacb031..b4bc4a5abd21345126dd08b75fe88381dfd940fc 100644 (file)
--- a/test/controllers/api/changesets_controller_test.rb
+++ b/test/controllers/api/changesets_controller_test.rb
@@ -199,7 +199,7 @@ module Api
       assert_equal Settings.api_version, js["version"]
       assert_equal Settings.generator, js["generator"]
       assert_equal changeset.id, js["changeset"]["id"]
       assert_equal Settings.api_version, js["version"]
       assert_equal Settings.generator, js["generator"]
       assert_equal changeset.id, js["changeset"]["id"]

-      assert js["changeset"]["open"]
+      assert_operator js["changeset"], :[], "open"

       assert_equal changeset.created_at.xmlschema, js["changeset"]["created_at"]
       assert_nil js["changeset"]["closed_at"]
       assert_nil js["changeset"]["tags"]
       assert_equal changeset.created_at.xmlschema, js["changeset"]["created_at"]
       assert_nil js["changeset"]["closed_at"]
       assert_nil js["changeset"]["tags"]


@@ -215,7 +215,7 @@ module Api
       assert_equal Settings.api_version, js["version"]
       assert_equal Settings.generator, js["generator"]
       assert_equal changeset.id, js["changeset"]["id"]
       assert_equal Settings.api_version, js["version"]
       assert_equal Settings.generator, js["generator"]
       assert_equal changeset.id, js["changeset"]["id"]

-      assert js["changeset"]["open"]
+      assert_operator js["changeset"], :[], "open"

       assert_equal changeset.created_at.xmlschema, js["changeset"]["created_at"]
       assert_nil js["changeset"]["closed_at"]
       assert_nil js["changeset"]["tags"]
       assert_equal changeset.created_at.xmlschema, js["changeset"]["created_at"]
       assert_nil js["changeset"]["closed_at"]
       assert_nil js["changeset"]["tags"]


@@ -697,10 +697,10 @@ module Api
 
       # check that the changeset bbox is within bounds
       cs = Changeset.find(changeset_id)
 
       # check that the changeset bbox is within bounds
       cs = Changeset.find(changeset_id)

-      assert cs.min_lon >= -180 * GeoRecord::SCALE, "Minimum longitude (#{cs.min_lon / GeoRecord::SCALE}) should be >= -180 to be valid."
-      assert cs.max_lon <= 180 * GeoRecord::SCALE, "Maximum longitude (#{cs.max_lon / GeoRecord::SCALE}) should be <= 180 to be valid."
-      assert cs.min_lat >= -90 * GeoRecord::SCALE, "Minimum latitude (#{cs.min_lat / GeoRecord::SCALE}) should be >= -90 to be valid."
-      assert cs.max_lat <= 90 * GeoRecord::SCALE, "Maximum latitude (#{cs.max_lat / GeoRecord::SCALE}) should be <= 90 to be valid."
+      assert_operator cs.min_lon, :>=, -180 * GeoRecord::SCALE, "Minimum longitude (#{cs.min_lon / GeoRecord::SCALE}) should be >= -180 to be valid."
+      assert_operator cs.max_lon, :<=, 180 * GeoRecord::SCALE, "Maximum longitude (#{cs.max_lon / GeoRecord::SCALE}) should be <= 180 to be valid."
+      assert_operator cs.min_lat, :>=, -90 * GeoRecord::SCALE, "Minimum latitude (#{cs.min_lat / GeoRecord::SCALE}) should be >= -90 to be valid."
+      assert_operator cs.max_lat, :<=, 90 * GeoRecord::SCALE, "Maximum latitude (#{cs.max_lat / GeoRecord::SCALE}) should be <= 90 to be valid."

     end
 
     ##
     end
 
     ##

diff --git a/test/controllers/api/nodes_controller_test.rb b/test/controllers/api/nodes_controller_test.rb
index 95658842b8e498212acf6610e3aaf92ef8d52866..9e680dd068cd9c8fa69fdcb37214aa4a137944cb 100644 (file)
--- a/test/controllers/api/nodes_controller_test.rb
+++ b/test/controllers/api/nodes_controller_test.rb
@@ -258,8 +258,7 @@ module Api
 
       # valid delete should return the new version number, which should
       # be greater than the old version number
 
       # valid delete should return the new version number, which should
       # be greater than the old version number

-      assert @response.body.to_i > node.version,
-             "delete request should return a new version number for node"
+      assert_operator @response.body.to_i, :>, node.version, "delete request should return a new version number for node"

 
       # deleting the same node twice doesn't work
       xml = xml_for_node(node)
 
       # deleting the same node twice doesn't work
       xml = xml_for_node(node)

diff --git a/test/controllers/api/relations_controller_test.rb b/test/controllers/api/relations_controller_test.rb
index 7f2c196654476c6499f058728952e0e2a17348aa..7d011c17ff3678c76dce61c391cee4acf7ddaf4a 100644 (file)
--- a/test/controllers/api/relations_controller_test.rb
+++ b/test/controllers/api/relations_controller_test.rb
@@ -612,8 +612,7 @@ module Api
 
       # valid delete should return the new version number, which should
       # be greater than the old version number
 
       # valid delete should return the new version number, which should
       # be greater than the old version number

-      assert @response.body.to_i > multi_tag_relation.version,
-             "delete request should return a new version number for relation"
+      assert_operator @response.body.to_i, :>, multi_tag_relation.version, "delete request should return a new version number for relation"

 
       # this won't work since the relation is already deleted
       xml = update_changeset(xml_for_relation(deleted_relation), changeset.id)
 
       # this won't work since the relation is already deleted
       xml = update_changeset(xml_for_relation(deleted_relation), changeset.id)

diff --git a/test/controllers/api/users_controller_test.rb b/test/controllers/api/users_controller_test.rb
index aa4bf1e9de85010ac51ba86793a421c6a2a39b84..8e7079b851a2cf7b79ae62bd3495e1dd7d8d43e2 100644 (file)
--- a/test/controllers/api/users_controller_test.rb
+++ b/test/controllers/api/users_controller_test.rb
@@ -731,7 +731,7 @@ module Api
     def check_json_details(js, user, include_private, include_email)
       assert_equal user.id, js["user"]["id"]
       assert_equal user.description, js["user"]["description"]
     def check_json_details(js, user, include_private, include_email)
       assert_equal user.id, js["user"]["id"]
       assert_equal user.description, js["user"]["description"]

-      assert js["user"]["contributor_terms"]["agreed"]
+      assert_operator js["user"]["contributor_terms"], :[], "agreed"

 
       if include_private
         assert_not js["user"]["contributor_terms"]["pd"]
 
       if include_private
         assert_not js["user"]["contributor_terms"]["pd"]

diff --git a/test/controllers/api/ways_controller_test.rb b/test/controllers/api/ways_controller_test.rb
index 0cf30e4fffb176fb1d34b931fcab7934f4cf1a37..2bed0e5d67e7644ad1165471c55c53501cbef515 100644 (file)
--- a/test/controllers/api/ways_controller_test.rb
+++ b/test/controllers/api/ways_controller_test.rb
@@ -379,8 +379,7 @@ module Api
       # check the returned value - should be the new version number
       # valid delete should return the new version number, which should
       # be greater than the old version number
       # check the returned value - should be the new version number
       # valid delete should return the new version number, which should
       # be greater than the old version number

-      assert @response.body.to_i > way.version,
-             "delete request should return a new version number for way"
+      assert_operator @response.body.to_i, :>, way.version, "delete request should return a new version number for way"

 
       # this won't work since the way is already deleted
       xml = xml_for_way(deleted_way)
 
       # this won't work since the way is already deleted
       xml = xml_for_way(deleted_way)

diff --git a/test/controllers/changesets_controller_test.rb b/test/controllers/changesets_controller_test.rb
index a71b5e8feb615773063a7c435c3a23350f524d48..79fd7a571e5f7b919d85b796d5baa879588c2663 100644 (file)
--- a/test/controllers/changesets_controller_test.rb
+++ b/test/controllers/changesets_controller_test.rb
@@ -321,7 +321,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
   ##
   # check the result of a feed
   def check_feed_result(changesets)
   ##
   # check the result of a feed
   def check_feed_result(changesets)

-    assert changesets.size <= 20
+    assert_operator changesets.size, :<=, 20

 
     assert_select "feed", :count => [changesets.size, 1].min do
       assert_select "> title", :count => 1, :text => /^Changesets/
 
     assert_select "feed", :count => [changesets.size, 1].min do
       assert_select "> title", :count => 1, :text => /^Changesets/

diff --git a/test/controllers/user_blocks_controller_test.rb b/test/controllers/user_blocks_controller_test.rb
index 16a77624c75ee8dabc02fb62bb85242e44ee6631..27022c973748deaa3b0f9937d728824b5532ca16 100644 (file)
--- a/test/controllers/user_blocks_controller_test.rb
+++ b/test/controllers/user_blocks_controller_test.rb
@@ -356,7 +356,7 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "revoke"
     b = UserBlock.find(active_block.id)
     assert_response :success
     assert_template "revoke"
     b = UserBlock.find(active_block.id)

-    assert b.ends_at - Time.now.utc > 100
+    assert_operator b.ends_at - Time.now.utc, :>, 100

 
     # Check that revoking a block works using POST
     post revoke_user_block_path(:id => active_block, :confirm => true)
 
     # Check that revoking a block works using POST
     post revoke_user_block_path(:id => active_block, :confirm => true)

diff --git a/test/lib/locale_test.rb b/test/lib/locale_test.rb
index d842390388473757180b18ecd41118df0065d696..9aec035d1c45006b74cfb176dfbc85b08950c256 100644 (file)
--- a/test/lib/locale_test.rb
+++ b/test/lib/locale_test.rb
@@ -80,7 +80,7 @@ class LocaleTest < ActiveSupport::TestCase
   end
 
   def test_available
   end
 
   def test_available

-    assert Locale.available.count <= I18n.available_locales.count
+    assert_operator Locale.available.count, :<=, I18n.available_locales.count

   end
 
   def test_preferred
   end
 
   def test_preferred

diff --git a/test/lib/password_hash_test.rb b/test/lib/password_hash_test.rb
index 2a42de12366e0a58678859e73d17d947ecf3203e..9bfd734969d34aa548a13aac62bdb981c31da550 100644 (file)
--- a/test/lib/password_hash_test.rb
+++ b/test/lib/password_hash_test.rb
@@ -61,6 +61,6 @@ class PasswordHashTest < ActiveSupport::TestCase
     format = Argon2::HashFormat.new(hash)
 
     assert_equal "argon2id", format.variant
     format = Argon2::HashFormat.new(hash)
 
     assert_equal "argon2id", format.variant

-    assert format.version <= 19
+    assert_operator format.version, :<=, 19

   end
 end
   end
 end

diff --git a/test/lib/short_link_test.rb b/test/lib/short_link_test.rb
index a0a1023bb5a558235350d3f2bb74f115acb5e239..a32e1ac205b14a29e67f2e3d47d9bb203385bb2a 100644 (file)
--- a/test/lib/short_link_test.rb
+++ b/test/lib/short_link_test.rb
@@ -20,7 +20,7 @@ class ShortLinkTest < ActiveSupport::TestCase
       # smaller range.
       distance = Math.sqrt(((lat - lat2)**2) + ((lon - lon2)**2))
       max_distance = 360.0 / (1 << (zoom + 8)) * 0.5 * Math.sqrt(5)
       # smaller range.
       distance = Math.sqrt(((lat - lat2)**2) + ((lon - lon2)**2))
       max_distance = 360.0 / (1 << (zoom + 8)) * 0.5 * Math.sqrt(5)

-      assert max_distance > distance, "Maximum expected error exceeded: #{max_distance} <= #{distance} for (#{lat}, #{lon}, #{zoom})."
+      assert_operator max_distance, :>, distance, "Maximum expected error exceeded: #{max_distance} <= #{distance} for (#{lat}, #{lon}, #{zoom})."

     end
   end
 
     end
   end
 

diff --git a/test/system/account_deletion_test.rb b/test/system/account_deletion_test.rb
index 5a55c5838cb6bda7cb6bb4ee776e3ac53cc7e1b6..87e981c6426500443bcbf6811cef581f8ffce9b1 100644 (file)
--- a/test/system/account_deletion_test.rb
+++ b/test/system/account_deletion_test.rb
@@ -9,9 +9,9 @@ class AccountDeletionTest < ApplicationSystemTestCase
   test "the status is deleted and the personal data removed" do
     visit edit_account_path
 
   test "the status is deleted and the personal data removed" do
     visit edit_account_path
 

-    click_on "Delete Account..."
+    click_link "Delete Account..."

     accept_confirm do
     accept_confirm do

-      click_on "Delete Account"
+      click_link "Delete Account"

     end
 
     assert_current_path root_path
     end
 
     assert_current_path root_path


@@ -23,9 +23,9 @@ class AccountDeletionTest < ApplicationSystemTestCase
   test "the user is signed out after deletion" do
     visit edit_account_path
 
   test "the user is signed out after deletion" do
     visit edit_account_path
 

-    click_on "Delete Account..."
+    click_link "Delete Account..."

     accept_confirm do
     accept_confirm do

-      click_on "Delete Account"
+      click_link "Delete Account"

     end
 
     assert_content "Log In"
     end
 
     assert_content "Log In"


@@ -34,9 +34,9 @@ class AccountDeletionTest < ApplicationSystemTestCase
   test "the user is shown a confirmation flash message" do
     visit edit_account_path
 
   test "the user is shown a confirmation flash message" do
     visit edit_account_path
 

-    click_on "Delete Account..."
+    click_link "Delete Account..."

     accept_confirm do
     accept_confirm do

-      click_on "Delete Account"
+      click_link "Delete Account"

     end
 
     assert_content "Account Deleted"
     end
 
     assert_content "Account Deleted"

diff --git a/test/system/diary_entry_test.rb b/test/system/diary_entry_test.rb
index 31e6d7b075e3ba3b9ebb07d6efc3177c0eedeca9..554b89a6db05a3ec2b3353acfe69d9b78c088cf9 100644 (file)
--- a/test/system/diary_entry_test.rb
+++ b/test/system/diary_entry_test.rb
@@ -10,7 +10,7 @@ class DiaryEntrySystemTest < ApplicationSystemTestCase
     sign_in_as(create(:user))
     visit diary_entries_path
 
     sign_in_as(create(:user))
     visit diary_entries_path
 

-    click_on "Send a message to the author"
+    click_link "Send a message to the author"

 
     assert_content "Send a new message"
     assert_equal "Re: #{@diary_entry.title}", page.find_field("Subject").value
 
     assert_content "Send a new message"
     assert_equal "Re: #{@diary_entry.title}", page.find_field("Subject").value

diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb
index b9b989c075132a9604d01c911dc2017f2613538f..a40306e3c7b1a5064770d8bdbd345eff47750672 100644 (file)
--- a/test/system/issues_test.rb
+++ b/test/system/issues_test.rb
@@ -80,21 +80,21 @@ class IssuesTest < ApplicationSystemTestCase
     # No issues against the user
     visit issues_path
     fill_in "search_by_user", :with => good_user.display_name
     # No issues against the user
     visit issues_path
     fill_in "search_by_user", :with => good_user.display_name

-    click_on "Search"
+    click_button "Search"

     assert_no_content I18n.t("issues.index.user_not_found")
     assert_content I18n.t("issues.index.issues_not_found")
 
     # User doesn't exist
     visit issues_path
     fill_in "search_by_user", :with => "Nonexistent User"
     assert_no_content I18n.t("issues.index.user_not_found")
     assert_content I18n.t("issues.index.issues_not_found")
 
     # User doesn't exist
     visit issues_path
     fill_in "search_by_user", :with => "Nonexistent User"

-    click_on "Search"
+    click_button "Search"

     assert_content I18n.t("issues.index.user_not_found")
     assert_content I18n.t("issues.index.issues_not_found")
 
     # Find Issue against bad_user
     visit issues_path
     fill_in "search_by_user", :with => bad_user.display_name
     assert_content I18n.t("issues.index.user_not_found")
     assert_content I18n.t("issues.index.issues_not_found")
 
     # Find Issue against bad_user
     visit issues_path
     fill_in "search_by_user", :with => bad_user.display_name

-    click_on "Search"
+    click_button "Search"

     assert_no_content I18n.t("issues.index.user_not_found")
     assert_no_content I18n.t("issues.index.issues_not_found")
   end
     assert_no_content I18n.t("issues.index.user_not_found")
     assert_no_content I18n.t("issues.index.issues_not_found")
   end


@@ -106,7 +106,7 @@ class IssuesTest < ApplicationSystemTestCase
     visit issue_path(issue)
 
     fill_in :issue_comment_body, :with => "test comment"
     visit issue_path(issue)
 
     fill_in :issue_comment_body, :with => "test comment"

-    click_on "Add Comment"
+    click_button "Add Comment"

     assert_content I18n.t("issue_comments.create.comment_created")
     assert_content "test comment"
 
     assert_content I18n.t("issue_comments.create.comment_created")
     assert_content "test comment"
 


@@ -123,7 +123,7 @@ class IssuesTest < ApplicationSystemTestCase
 
     fill_in :issue_comment_body, :with => "reassigning to moderators"
     check :reassign
 
     fill_in :issue_comment_body, :with => "reassigning to moderators"
     check :reassign

-    click_on "Add Comment"
+    click_button "Add Comment"

 
     assert_content "and the issue was reassigned"
     assert_current_path issues_path(:status => "open")
 
     assert_content "and the issue was reassigned"
     assert_current_path issues_path(:status => "open")


@@ -140,7 +140,7 @@ class IssuesTest < ApplicationSystemTestCase
 
     fill_in :issue_comment_body, :with => "reassigning to moderators"
     check :reassign
 
     fill_in :issue_comment_body, :with => "reassigning to moderators"
     check :reassign

-    click_on "Add Comment"
+    click_button "Add Comment"

 
     assert_content "and the issue was reassigned"
     assert_current_path issue_path(issue)
 
     assert_content "and the issue was reassigned"
     assert_current_path issue_path(issue)

diff --git a/test/system/preferences_test.rb b/test/system/preferences_test.rb
index 59a7209f5b4d3728fbb8f3049e4db4a03f0326f4..b071b1f73842663839dd9ad81c670d6d333fa1dd 100644 (file)
--- a/test/system/preferences_test.rb
+++ b/test/system/preferences_test.rb
@@ -5,7 +5,7 @@ class PreferencesTest < ApplicationSystemTestCase
     sign_in_as(create(:user))
 
     visit edit_preferences_path
     sign_in_as(create(:user))
 
     visit edit_preferences_path

-    click_on "Update Preferences"
+    click_button "Update Preferences"

 
     assert_content "Preferences updated"
   end
 
     assert_content "Preferences updated"
   end


@@ -15,7 +15,7 @@ class PreferencesTest < ApplicationSystemTestCase
 
     visit edit_preferences_path
     fill_in "Preferred Languages", :with => "fr"
 
     visit edit_preferences_path
     fill_in "Preferred Languages", :with => "fr"

-    click_on "Update Preferences"
+    click_button "Update Preferences"

 
     assert_content "Préférences mises à jour"
   end
 
     assert_content "Préférences mises à jour"
   end

diff --git a/test/system/report_diary_comment_test.rb b/test/system/report_diary_comment_test.rb
index 3504ab061fdeb5c4270036efa49807b1a9c9427f..15ef1ad3c5177f8ff0e01cf8d689395dc08bb8a4 100644 (file)
--- a/test/system/report_diary_comment_test.rb
+++ b/test/system/report_diary_comment_test.rb
@@ -19,14 +19,14 @@ class ReportDiaryCommentTest < ApplicationSystemTestCase
     visit diary_entry_path(@diary_entry.user.display_name, @diary_entry)
     assert_content @diary_entry.title
 
     visit diary_entry_path(@diary_entry.user.display_name, @diary_entry)
     assert_content @diary_entry.title
 

-    click_on I18n.t("diary_entries.diary_comment.report")
+    click_link I18n.t("diary_entries.diary_comment.report")

     assert_content "Report"
     assert_content I18n.t("reports.new.disclaimer.intro")
 
     choose I18n.t("reports.new.categories.diary_comment.spam_label")
     fill_in "report_details", :with => "This comment is spam"
     assert_difference "Issue.count", 1 do
     assert_content "Report"
     assert_content I18n.t("reports.new.disclaimer.intro")
 
     choose I18n.t("reports.new.categories.diary_comment.spam_label")
     fill_in "report_details", :with => "This comment is spam"
     assert_difference "Issue.count", 1 do

-      click_on "Create Report"
+      click_button "Create Report"

     end
 
     assert_content "Your report has been registered successfully"
     end
 
     assert_content "Your report has been registered successfully"

diff --git a/test/system/report_diary_entry_test.rb b/test/system/report_diary_entry_test.rb
index efb1070653de48b766cdaf7c5dc6221cdd5bbf97..d4e49b714ffd32b9e2d4077926863eae7fc41efc 100644 (file)
--- a/test/system/report_diary_entry_test.rb
+++ b/test/system/report_diary_entry_test.rb
@@ -18,14 +18,14 @@ class ReportDiaryEntryTest < ApplicationSystemTestCase
     visit diary_entry_path(@diary_entry.user.display_name, @diary_entry)
     assert_content @diary_entry.title
 
     visit diary_entry_path(@diary_entry.user.display_name, @diary_entry)
     assert_content @diary_entry.title
 

-    click_on I18n.t("diary_entries.diary_entry.report")
+    click_link I18n.t("diary_entries.diary_entry.report")

     assert_content "Report"
     assert_content I18n.t("reports.new.disclaimer.intro")
 
     choose I18n.t("reports.new.categories.diary_entry.spam_label")
     fill_in "report_details", :with => "This is advertising"
     assert_difference "Issue.count", 1 do
     assert_content "Report"
     assert_content I18n.t("reports.new.disclaimer.intro")
 
     choose I18n.t("reports.new.categories.diary_entry.spam_label")
     fill_in "report_details", :with => "This is advertising"
     assert_difference "Issue.count", 1 do

-      click_on "Create Report"
+      click_button "Create Report"

     end
 
     assert_content "Your report has been registered successfully"
     end
 
     assert_content "Your report has been registered successfully"


@@ -42,14 +42,14 @@ class ReportDiaryEntryTest < ApplicationSystemTestCase
     visit diary_entry_path(@diary_entry.user.display_name, @diary_entry)
     assert_content @diary_entry.title
 
     visit diary_entry_path(@diary_entry.user.display_name, @diary_entry)
     assert_content @diary_entry.title
 

-    click_on I18n.t("diary_entries.diary_entry.report")
+    click_link I18n.t("diary_entries.diary_entry.report")

     assert_content "Report"
     assert_content I18n.t("reports.new.disclaimer.intro")
 
     choose I18n.t("reports.new.categories.diary_entry.spam_label")
     fill_in "report_details", :with => "This is advertising"
     assert_no_difference "Issue.count" do
     assert_content "Report"
     assert_content I18n.t("reports.new.disclaimer.intro")
 
     choose I18n.t("reports.new.categories.diary_entry.spam_label")
     fill_in "report_details", :with => "This is advertising"
     assert_no_difference "Issue.count" do

-      click_on "Create Report"
+      click_button "Create Report"

     end
 
     issue.reload
     end
 
     issue.reload

diff --git a/test/system/report_note_test.rb b/test/system/report_note_test.rb
index 79894eb897d4a514e3ebb94b5a89a680a1bcedf5..b7e1bfc9eaebd4c7252e383871d31b9cd28a6e40 100644 (file)
--- a/test/system/report_note_test.rb
+++ b/test/system/report_note_test.rb
@@ -14,14 +14,14 @@ class ReportNoteTest < ApplicationSystemTestCase
     sign_in_as(create(:user))
     visit note_path(note)
 
     sign_in_as(create(:user))
     visit note_path(note)
 

-    click_on I18n.t("notes.show.report")
+    click_link I18n.t("notes.show.report")

     assert_content "Report"
     assert_content I18n.t("reports.new.disclaimer.intro")
 
     choose I18n.t("reports.new.categories.note.spam_label")
     fill_in "report_details", :with => "This is spam"
     assert_difference "Issue.count", 1 do
     assert_content "Report"
     assert_content I18n.t("reports.new.disclaimer.intro")
 
     choose I18n.t("reports.new.categories.note.spam_label")
     fill_in "report_details", :with => "This is spam"
     assert_difference "Issue.count", 1 do

-      click_on "Create Report"
+      click_button "Create Report"

     end
 
     assert_content "Your report has been registered successfully"
     end
 
     assert_content "Your report has been registered successfully"


@@ -35,14 +35,14 @@ class ReportNoteTest < ApplicationSystemTestCase
     sign_in_as(create(:user))
     visit note_path(note)
 
     sign_in_as(create(:user))
     visit note_path(note)
 

-    click_on I18n.t("notes.show.report")
+    click_link I18n.t("notes.show.report")

     assert_content "Report"
     assert_content I18n.t("reports.new.disclaimer.intro")
 
     choose I18n.t("reports.new.categories.note.spam_label")
     fill_in "report_details", :with => "This is spam"
     assert_difference "Issue.count", 1 do
     assert_content "Report"
     assert_content I18n.t("reports.new.disclaimer.intro")
 
     choose I18n.t("reports.new.categories.note.spam_label")
     fill_in "report_details", :with => "This is spam"
     assert_difference "Issue.count", 1 do

-      click_on "Create Report"
+      click_button "Create Report"

     end
 
     assert_content "Your report has been registered successfully"
     end
 
     assert_content "Your report has been registered successfully"

diff --git a/test/system/report_user_test.rb b/test/system/report_user_test.rb
index 7a9e800c8c0da99ebf7351d6a863d9c8cec8ba7a..9a0abe9ea2e5920a78cc8e87f706f661f328c207 100644 (file)
--- a/test/system/report_user_test.rb
+++ b/test/system/report_user_test.rb
@@ -14,14 +14,14 @@ class ReportUserTest < ApplicationSystemTestCase
     sign_in_as(create(:user))
     visit user_path(user)
 
     sign_in_as(create(:user))
     visit user_path(user)
 

-    click_on I18n.t("users.show.report")
+    click_link I18n.t("users.show.report")

     assert_content "Report"
     assert_content I18n.t("reports.new.disclaimer.intro")
 
     choose I18n.t("reports.new.categories.user.vandal_label")
     fill_in "report_details", :with => "This user is a vandal"
     assert_difference "Issue.count", 1 do
     assert_content "Report"
     assert_content I18n.t("reports.new.disclaimer.intro")
 
     choose I18n.t("reports.new.categories.user.vandal_label")
     fill_in "report_details", :with => "This user is a vandal"
     assert_difference "Issue.count", 1 do

-      click_on "Create Report"
+      click_button "Create Report"

     end
 
     assert_content "Your report has been registered successfully"
     end
 
     assert_content "Your report has been registered successfully"


@@ -35,14 +35,14 @@ class ReportUserTest < ApplicationSystemTestCase
     sign_in_as(create(:user))
     visit user_path(user)
 
     sign_in_as(create(:user))
     visit user_path(user)
 

-    click_on I18n.t("users.show.report")
+    click_link I18n.t("users.show.report")

     assert_content "Report"
     assert_content I18n.t("reports.new.disclaimer.intro")
 
     choose I18n.t("reports.new.categories.user.vandal_label")
     fill_in "report_details", :with => "This user is a vandal"
     assert_difference "Issue.count", 1 do
     assert_content "Report"
     assert_content I18n.t("reports.new.disclaimer.intro")
 
     choose I18n.t("reports.new.categories.user.vandal_label")
     fill_in "report_details", :with => "This user is a vandal"
     assert_difference "Issue.count", 1 do

-      click_on "Create Report"
+      click_button "Create Report"

     end
 
     assert_content "Your report has been registered successfully"
     end
 
     assert_content "Your report has been registered successfully"


@@ -52,14 +52,14 @@ class ReportUserTest < ApplicationSystemTestCase
 
     visit user_path(user)
 
 
     visit user_path(user)
 

-    click_on I18n.t("users.show.report")
+    click_link I18n.t("users.show.report")

     assert_content "Report"
     assert_content I18n.t("reports.new.disclaimer.intro")
 
     choose I18n.t("reports.new.categories.user.spam_label")
     fill_in "report_details", :with => "This user is a spammer"
     assert_no_difference "Issue.count" do
     assert_content "Report"
     assert_content I18n.t("reports.new.disclaimer.intro")
 
     choose I18n.t("reports.new.categories.user.spam_label")
     fill_in "report_details", :with => "This user is a spammer"
     assert_no_difference "Issue.count" do

-      click_on "Create Report"
+      click_button "Create Report"

     end
 
     assert_content "Your report has been registered successfully"
     end
 
     assert_content "Your report has been registered successfully"

diff --git a/test/system/user_logout_test.rb b/test/system/user_logout_test.rb
index a097b63747a1281f82ee7e1b658580bbad7c42e9..fc27b7c1884ed606823f660d9c2ec73f5059bfa5 100644 (file)
--- a/test/system/user_logout_test.rb
+++ b/test/system/user_logout_test.rb
@@ -6,8 +6,8 @@ class UserLogoutTest < ApplicationSystemTestCase
     sign_in_as(user)
     assert_no_content "Log In"
 
     sign_in_as(user)
     assert_no_content "Log In"
 

-    click_on user.display_name
-    click_on "Log Out"
+    click_button user.display_name
+    click_link "Log Out"

     assert_content "Log In"
   end
 
     assert_content "Log In"
   end
 


@@ -17,8 +17,8 @@ class UserLogoutTest < ApplicationSystemTestCase
     visit traces_path
     assert_no_content "Log In"
 
     visit traces_path
     assert_no_content "Log In"
 

-    click_on user.display_name
-    click_on "Log Out"
+    click_button user.display_name
+    click_link "Log Out"

     assert_content "Log In"
     assert_content "Public GPS Traces"
   end
     assert_content "Log In"
     assert_content "Public GPS Traces"
   end

diff --git a/test/system/user_signup_test.rb b/test/system/user_signup_test.rb
index 5bd88f5a445cadba27891cb62a4af897a4445710..88899d7105b2fc2b74a896c7291a017c7f080701 100644 (file)
--- a/test/system/user_signup_test.rb
+++ b/test/system/user_signup_test.rb
@@ -4,7 +4,7 @@ class UserSignupTest < ApplicationSystemTestCase
   test "Sign up from login page" do
     visit login_path
 
   test "Sign up from login page" do
     visit login_path
 

-    click_on "Register now"
+    click_link "Register now"

 
     assert_content "Confirm Password"
   end
 
     assert_content "Confirm Password"
   end


@@ -13,7 +13,7 @@ class UserSignupTest < ApplicationSystemTestCase
     user = build(:user)
 
     visit root_path
     user = build(:user)
 
     visit root_path

-    click_on "Sign Up"
+    click_link "Sign Up"

     fill_in "Email", :with => user.email
     fill_in "Email Confirmation", :with => user.email
     fill_in "Display Name", :with => user.display_name
     fill_in "Email", :with => user.email
     fill_in "Email Confirmation", :with => user.email
     fill_in "Display Name", :with => user.display_name


@@ -22,7 +22,7 @@ class UserSignupTest < ApplicationSystemTestCase
     click_button "Sign Up"
 
     assert_content "Contributor terms"
     click_button "Sign Up"
 
     assert_content "Contributor terms"

-    click_on "Cancel"
+    click_button "Cancel"

 
     assert_current_path "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
   end
 
     assert_current_path "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
   end

diff --git a/test/system/user_status_change_test.rb b/test/system/user_status_change_test.rb
index 30b923732414805ffa98ec08f7c3e409cd24596d..e4cca1eab5bba38a97fefb866aeb4a0b626a3ca3 100644 (file)
--- a/test/system/user_status_change_test.rb
+++ b/test/system/user_status_change_test.rb
@@ -10,7 +10,7 @@ class UserStatusChangeTest < ApplicationSystemTestCase
     user = create(:user, :suspended)
     visit user_path(user)
     accept_confirm do
     user = create(:user, :suspended)
     visit user_path(user)
     accept_confirm do

-      click_on "Unsuspend"
+      click_link "Unsuspend"

     end
 
     assert_no_content "Unsuspend"
     end
 
     assert_no_content "Unsuspend"


@@ -22,7 +22,7 @@ class UserStatusChangeTest < ApplicationSystemTestCase
     user = create(:user, :suspended)
     visit user_path(user)
     accept_confirm do
     user = create(:user, :suspended)
     visit user_path(user)
     accept_confirm do

-      click_on "Confirm"
+      click_link "Confirm"

     end
 
     assert_no_content "Unsuspend"
     end
 
     assert_no_content "Unsuspend"

diff --git a/test/system/view_communities_test.rb b/test/system/view_communities_test.rb
index 349d0a5bf742c4c97faf980f6055118a4ea10dad..539daaa30933c5e9c8fb3fd3aac278d6cca3cba8 100644 (file)
--- a/test/system/view_communities_test.rb
+++ b/test/system/view_communities_test.rb
@@ -13,7 +13,7 @@ class ViewCommunitiesTest < ApplicationSystemTestCase
 
     visit edit_preferences_path
     fill_in "Preferred Languages", :with => "fr"
 
     visit edit_preferences_path
     fill_in "Preferred Languages", :with => "fr"

-    click_on "Update Preferences"
+    click_button "Update Preferences"

 
     visit "/communities"
     assert_link "OpenStreetMap États-Unis", :href => "https://www.openstreetmap.us/"
 
     visit "/communities"
     assert_link "OpenStreetMap États-Unis", :href => "https://www.openstreetmap.us/"

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 7157abf5a71ed0ef153b70c50c3436a6b99c00c2..68749c0f70f595e00b322b21acee0215b7d46b51 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -245,7 +245,7 @@ module ActiveSupport
       visit login_path
       fill_in "username", :with => user.email
       fill_in "password", :with => "test"
       visit login_path
       fill_in "username", :with => user.email
       fill_in "password", :with => "test"

-      click_on "Login", :match => :first
+      click_button "Login", :match => :first

     end
 
     def session_for(user)
     end
 
     def session_for(user)