Fix new rubocop warnings

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index deaea8e2da3cbf11308aafa86c66b7d65f5f5d1a..8a196f52e0317b45cc56b4c4ca856e4d353efa97 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -14,6 +14,11 @@ require:
   - rubocop-rails
   - rubocop-rake
 
   - rubocop-rails
   - rubocop-rake
 

+# Offense count: 11
+# Configuration parameters: Include, MaxAmount
+FactoryBot/ExcessiveCreateList:
+  MaxAmount: 200
+

 # Offense count: 557
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # Offense count: 557
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.

diff --git a/test/system/account_deletion_test.rb b/test/system/account_deletion_test.rb
index e6517dccc38b6bd0c5b17bb3463c5e34111bfdd3..ca5ef7fe8bc37578973782fed115478e2037d73c 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_link "Delete Account..."
+    click_on "Delete Account..."

     accept_confirm do
     accept_confirm do

-      click_link "Delete Account"
+      click_on "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_link "Delete Account..."
+    click_on "Delete Account..."

     accept_confirm do
     accept_confirm do

-      click_link "Delete Account"
+      click_on "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_link "Delete Account..."
+    click_on "Delete Account..."

     accept_confirm do
     accept_confirm do

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

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


@@ -47,7 +47,7 @@ class AccountDeletionTest < ApplicationSystemTestCase
       travel 1.hour do
         visit edit_account_path
 
       travel 1.hour do
         visit edit_account_path
 

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

 
         assert_no_content "cannot currently be deleted"
       end
 
         assert_no_content "cannot currently be deleted"
       end


@@ -61,7 +61,7 @@ class AccountDeletionTest < ApplicationSystemTestCase
       travel 1.hour do
         visit edit_account_path
 
       travel 1.hour do
         visit edit_account_path
 

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

 
         assert_no_content "cannot currently be deleted"
       end
 
         assert_no_content "cannot currently be deleted"
       end


@@ -75,7 +75,7 @@ class AccountDeletionTest < ApplicationSystemTestCase
       travel 12.hours do
         visit edit_account_path
 
       travel 12.hours do
         visit edit_account_path
 

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

 
         assert_no_content "cannot currently be deleted"
       end
 
         assert_no_content "cannot currently be deleted"
       end


@@ -89,7 +89,7 @@ class AccountDeletionTest < ApplicationSystemTestCase
       travel 10.hours do
         visit edit_account_path
 
       travel 10.hours do
         visit edit_account_path
 

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

 
         assert_content "cannot currently be deleted"
         assert_content "in about 1 hour"
 
         assert_content "cannot currently be deleted"
         assert_content "in about 1 hour"

diff --git a/test/system/confirmation_resend_test.rb b/test/system/confirmation_resend_test.rb
index f615a6321d55caee39e93079f6c5da1102e53e39..31b9ed7bb10204350f87c93288b25bcf0c279bce 100644 (file)
--- a/test/system/confirmation_resend_test.rb
+++ b/test/system/confirmation_resend_test.rb
@@ -5,16 +5,18 @@ class ConfirmationResendSystemTest < ApplicationSystemTestCase
     @user = build(:user)
     visit user_new_path
 
     @user = build(:user)
     visit user_new_path
 

-    fill_in "Email", :with => @user.email
-    fill_in "Email Confirmation", :with => @user.email
-    fill_in "Display Name", :with => @user.display_name
-    fill_in "Password", :with => "testtest"
-    fill_in "Confirm Password", :with => "testtest"
-    click_button "Sign Up"
+    within ".new_user" do
+      fill_in "Email", :with => @user.email
+      fill_in "Email Confirmation", :with => @user.email
+      fill_in "Display Name", :with => @user.display_name
+      fill_in "Password", :with => "testtest"
+      fill_in "Confirm Password", :with => "testtest"
+      click_on "Sign Up"
+    end

 
     check "I have read and agree to the above contributor terms"
     check "I have read and agree to the Terms of Use"
 
     check "I have read and agree to the above contributor terms"
     check "I have read and agree to the Terms of Use"

-    click_button "Continue"
+    click_on "Continue"

   end
 
   test "flash message should not contain raw html" do
   end
 
   test "flash message should not contain raw html" do

diff --git a/test/system/diary_entry_test.rb b/test/system/diary_entry_test.rb
index 290b94207acec68cedbc8eb86819cfa7dbccfc49..ba091c538465d8dcf6ac7471665d49516b7f925a 100644 (file)
--- a/test/system/diary_entry_test.rb
+++ b/test/system/diary_entry_test.rb
@@ -13,7 +13,7 @@ class DiaryEntrySystemTest < ApplicationSystemTestCase
     sign_in_as(create(:user))
     visit diary_entries_path
 
     sign_in_as(create(:user))
     visit diary_entries_path
 

-    click_link "Send a message to the author"
+    click_on "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 a40306e3c7b1a5064770d8bdbd345eff47750672..b9b989c075132a9604d01c911dc2017f2613538f 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_button "Search"
+    click_on "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_button "Search"
+    click_on "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_button "Search"
+    click_on "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_button "Add Comment"
+    click_on "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_button "Add Comment"
+    click_on "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_button "Add Comment"
+    click_on "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/messages_test.rb b/test/system/messages_test.rb
index 60011e4d6674a822970472f8c1e7744236da68bf..dea0d2208f32e04f9779cda321c892ba22f800c6 100644 (file)
--- a/test/system/messages_test.rb
+++ b/test/system/messages_test.rb
@@ -9,7 +9,7 @@ class MessagesTest < ApplicationSystemTestCase
     visit inbox_messages_path
     assert_text "You have 1 new message and 0 old messages"
 
     visit inbox_messages_path
     assert_text "You have 1 new message and 0 old messages"
 

-    click_button "Delete"
+    click_on "Delete"

     assert_text "You have 0 new messages and 0 old messages"
   end
 
     assert_text "You have 0 new messages and 0 old messages"
   end
 


@@ -21,7 +21,7 @@ class MessagesTest < ApplicationSystemTestCase
     visit outbox_messages_path
     assert_text "You have 1 sent message"
 
     visit outbox_messages_path
     assert_text "You have 1 sent message"
 

-    click_button "Delete"
+    click_on "Delete"

     assert_text "You have 0 sent messages"
   end
 
     assert_text "You have 0 sent messages"
   end
 


@@ -35,7 +35,7 @@ class MessagesTest < ApplicationSystemTestCase
     visit muted_messages_path
     assert_text "1 muted message"
 
     visit muted_messages_path
     assert_text "1 muted message"
 

-    click_button "Delete"
+    click_on "Delete"

     assert_text "0 muted messages"
   end
 end
     assert_text "0 muted messages"
   end
 end

diff --git a/test/system/note_comments_test.rb b/test/system/note_comments_test.rb
index 7666f69e27f143a0fc9afc3a28c4144a1e18538f..70cfc417c16b5de15235faf7f2415300d790fc1e 100644 (file)
--- a/test/system/note_comments_test.rb
+++ b/test/system/note_comments_test.rb
@@ -34,7 +34,7 @@ class NoteCommentsTest < ApplicationSystemTestCase
     assert_button "Comment & Resolve"
     assert_button "Comment", :disabled => false
 
     assert_button "Comment & Resolve"
     assert_button "Comment", :disabled => false
 

-    click_button "Comment"
+    click_on "Comment"

 
     assert_content "Comment from #{user.display_name}"
     assert_content "Some newly added note comment"
 
     assert_content "Comment from #{user.display_name}"
     assert_content "Some newly added note comment"

diff --git a/test/system/oauth2_test.rb b/test/system/oauth2_test.rb
index ed5ec1532921d0a4ff166f4438292b85f22a40db..0b9213aaa14db1fbc3aef89116ebd4bde52a4b22 100644 (file)
--- a/test/system/oauth2_test.rb
+++ b/test/system/oauth2_test.rb
@@ -8,7 +8,7 @@ class Oauth2Test < ApplicationSystemTestCase
     assert_text "OpenStreetMap Web Site"
 
     accept_alert do
     assert_text "OpenStreetMap Web Site"
 
     accept_alert do

-      click_link "Revoke Access"
+      click_on "Revoke Access"

     end
 
     assert_text "You have not yet authorized any OAuth 2 applications."
     end
 
     assert_text "You have not yet authorized any OAuth 2 applications."

diff --git a/test/system/preferences_test.rb b/test/system/preferences_test.rb
index b071b1f73842663839dd9ad81c670d6d333fa1dd..59a7209f5b4d3728fbb8f3049e4db4a03f0326f4 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_button "Update Preferences"
+    click_on "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_button "Update Preferences"
+    click_on "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 15ef1ad3c5177f8ff0e01cf8d689395dc08bb8a4..3504ab061fdeb5c4270036efa49807b1a9c9427f 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_link I18n.t("diary_entries.diary_comment.report")
+    click_on 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_button "Create Report"
+      click_on "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 545723ebb8f7e2f19bf91a155808e43c0a0f7293..dde06cffc31ddeee05e20cbcf75ccb1218bc6996 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_link I18n.t("diary_entries.diary_entry.report")
+    click_on 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_button "Create Report"
+      click_on "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_link I18n.t("diary_entries.diary_entry.report")
+    click_on 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_button "Create Report"
+      click_on "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 b7e1bfc9eaebd4c7252e383871d31b9cd28a6e40..79894eb897d4a514e3ebb94b5a89a680a1bcedf5 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_link I18n.t("notes.show.report")
+    click_on 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_button "Create Report"
+      click_on "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_link I18n.t("notes.show.report")
+    click_on 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_button "Create Report"
+      click_on "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 9a0abe9ea2e5920a78cc8e87f706f661f328c207..7a9e800c8c0da99ebf7351d6a863d9c8cec8ba7a 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_link I18n.t("users.show.report")
+    click_on 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_button "Create Report"
+      click_on "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_link I18n.t("users.show.report")
+    click_on 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_button "Create Report"
+      click_on "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_link I18n.t("users.show.report")
+    click_on 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_button "Create Report"
+      click_on "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_blocks_test.rb b/test/system/user_blocks_test.rb
index 957ecb662a84ee78486c8b4d8fbca95611374ecc..f710f74aae655cbcce4b345f6cc14705f93bbcb7 100644 (file)
--- a/test/system/user_blocks_test.rb
+++ b/test/system/user_blocks_test.rb
@@ -45,7 +45,7 @@ class ReportNoteTest < ApplicationSystemTestCase
     visit user_path(blocked_user)
     assert_link "Revoke all blocks"
 
     visit user_path(blocked_user)
     assert_link "Revoke all blocks"
 

-    click_link "Revoke all blocks"
+    click_on "Revoke all blocks"

     assert_title "Revoking all blocks on #{blocked_user.display_name}"
     assert_text "Revoking all blocks on #{blocked_user.display_name}"
     assert_unchecked_field "Are you sure you wish to revoke 1 active block?"
     assert_title "Revoking all blocks on #{blocked_user.display_name}"
     assert_text "Revoking all blocks on #{blocked_user.display_name}"
     assert_unchecked_field "Are you sure you wish to revoke 1 active block?"


@@ -62,7 +62,7 @@ class ReportNoteTest < ApplicationSystemTestCase
     visit user_path(blocked_user)
     assert_link "Revoke all blocks"
 
     visit user_path(blocked_user)
     assert_link "Revoke all blocks"
 

-    click_link "Revoke all blocks"
+    click_on "Revoke all blocks"

     assert_title "Revoking all blocks on #{blocked_user.display_name}"
     assert_text "Revoking all blocks on #{blocked_user.display_name}"
     assert_unchecked_field "Are you sure you wish to revoke 2 active blocks?"
     assert_title "Revoking all blocks on #{blocked_user.display_name}"
     assert_text "Revoking all blocks on #{blocked_user.display_name}"
     assert_unchecked_field "Are you sure you wish to revoke 2 active blocks?"

diff --git a/test/system/user_logout_test.rb b/test/system/user_logout_test.rb
index fc27b7c1884ed606823f660d9c2ec73f5059bfa5..2f5331711eaa40daa8a331aac883eeed7572af87 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_button user.display_name
-    click_link "Log Out"
+    click_on user.display_name
+    click_on "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_button user.display_name
-    click_link "Log Out"
+    click_on user.display_name
+    click_on "Log Out"

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


@@ -30,7 +30,7 @@ class UserLogoutTest < ApplicationSystemTestCase
     visit logout_path
     assert_content "Logout from OpenStreetMap"
 
     visit logout_path
     assert_content "Logout from OpenStreetMap"
 

-    click_button "Logout"
+    click_on "Logout"

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


@@ -41,7 +41,7 @@ class UserLogoutTest < ApplicationSystemTestCase
     visit logout_path(:referer => "/traces")
     assert_content "Logout from OpenStreetMap"
 
     visit logout_path(:referer => "/traces")
     assert_content "Logout from OpenStreetMap"
 

-    click_button "Logout"
+    click_on "Logout"

     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_muting_test.rb b/test/system/user_muting_test.rb
index ce4346115694d4e6e99a44c35ebd6b7abe5f5527..e70005e647abad142dddac009d1ec0bb477a1a18 100644 (file)
--- a/test/system/user_muting_test.rb
+++ b/test/system/user_muting_test.rb
@@ -10,14 +10,14 @@ class UserMutingTest < ApplicationSystemTestCase
     sign_in_as(user)
 
     visit user_path(other_user)
     sign_in_as(user)
 
     visit user_path(other_user)

-    click_link "Mute this User"
+    click_on "Mute this User"

     assert_content "You muted #{other_user.display_name}"
 
     visit edit_account_path
     assert_content "Muted Users"
     assert_content "You muted #{other_user.display_name}"
 
     visit edit_account_path
     assert_content "Muted Users"

-    click_link "Muted Users"
+    click_on "Muted Users"

     assert_content "You have muted 1 User"
     assert_content "You have muted 1 User"

-    click_link "Unmute"
+    click_on "Unmute"

 
     assert_content "You unmuted #{other_user.display_name}"
     refute_content "Muted Users"
 
     assert_content "You unmuted #{other_user.display_name}"
     refute_content "Muted Users"


@@ -35,7 +35,7 @@ class UserMutingTest < ApplicationSystemTestCase
     fill_in "Body", :with => "some message"
 
     assert_no_emails do
     fill_in "Body", :with => "some message"
 
     assert_no_emails do

-      click_button "Send"
+      click_on "Send"

     end
 
     message = Message.find_by(:sender => muted_user, :recipient => user)
     end
 
     message = Message.find_by(:sender => muted_user, :recipient => user)

diff --git a/test/system/user_signup_test.rb b/test/system/user_signup_test.rb
index 88899d7105b2fc2b74a896c7291a017c7f080701..e97046800738edf107ce30c586873f96d6e958b1 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_link "Register now"
+    click_on "Register now"

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


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

-    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 "Password", :with => "testtest"
-    fill_in "Confirm Password", :with => "testtest"
-    click_button "Sign Up"
+    click_on "Sign Up"
+
+    within ".new_user" do
+      fill_in "Email", :with => user.email
+      fill_in "Email Confirmation", :with => user.email
+      fill_in "Display Name", :with => user.display_name
+      fill_in "Password", :with => "testtest"
+      fill_in "Confirm Password", :with => "testtest"
+      click_on "Sign Up"
+    end

 
     assert_content "Contributor terms"
 
     assert_content "Contributor terms"

-    click_button "Cancel"
+    click_on "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 e4cca1eab5bba38a97fefb866aeb4a0b626a3ca3..30b923732414805ffa98ec08f7c3e409cd24596d 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_link "Unsuspend"
+      click_on "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_link "Confirm"
+      click_on "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 539daaa30933c5e9c8fb3fd3aac278d6cca3cba8..349d0a5bf742c4c97faf980f6055118a4ea10dad 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_button "Update Preferences"
+    click_on "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 19e1a2784611fa219af508a181909c7ead6f320c..9d06d23534f8cdcb9ea297aa4bd1cf048263a6f6 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_button "Login", :match => :first
+      click_on "Login", :match => :first

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