Use a generic name for the search parameter

This way we can use it for any model.
This commit is contained in:
Javi Martín
2020-12-03 11:17:45 +01:00
parent 9a24a8efe2
commit 155da08cf0
26 changed files with 55 additions and 49 deletions

View File

@@ -223,7 +223,7 @@ describe "Admin activity" do
scenario "Shows moderation activity from moderation screen" do
user = create(:user)
visit moderation_users_path(name_or_email: user.username)
visit moderation_users_path(search: user.username)
within("#moderation_users") do
click_link "Block"

View File

@@ -19,7 +19,7 @@ describe "Admin administrators" do
end
scenario "Create Administrator", :js do
fill_in "name_or_email", with: user.email
fill_in "search", with: user.email
click_button "Search"
expect(page).to have_content user.name
@@ -66,7 +66,7 @@ describe "Admin administrators" do
expect(page).to have_content(administrator1.name)
expect(page).to have_content(administrator2.name)
fill_in "name_or_email", with: " "
fill_in "search", with: " "
click_button "Search"
expect(page).to have_content("Administrators: User search")
@@ -79,11 +79,11 @@ describe "Admin administrators" do
expect(page).to have_content(administrator1.name)
expect(page).to have_content(administrator2.name)
fill_in "name_or_email", with: "Sumn"
fill_in "search", with: "Sumn"
click_button "Search"
expect(page).to have_content("Administrators: User search")
expect(page).to have_field "name_or_email", with: "Sumn"
expect(page).to have_field "search", with: "Sumn"
expect(page).to have_content(administrator1.name)
expect(page).not_to have_content(administrator2.name)
end
@@ -92,11 +92,11 @@ describe "Admin administrators" do
expect(page).to have_content(administrator1.email)
expect(page).to have_content(administrator2.email)
fill_in "name_or_email", with: administrator2.email
fill_in "search", with: administrator2.email
click_button "Search"
expect(page).to have_content("Administrators: User search")
expect(page).to have_field "name_or_email", with: administrator2.email
expect(page).to have_field "search", with: administrator2.email
expect(page).to have_content(administrator2.email)
expect(page).not_to have_content(administrator1.email)
end

View File

@@ -15,7 +15,7 @@ describe "Admin managers", :admin do
end
scenario "Create Manager", :js do
fill_in "name_or_email", with: user.email
fill_in "search", with: user.email
click_button "Search"
expect(page).to have_content user.name
@@ -47,7 +47,7 @@ describe "Admin managers", :admin do
expect(page).to have_content(manager1.name)
expect(page).to have_content(manager2.name)
fill_in "name_or_email", with: " "
fill_in "search", with: " "
click_button "Search"
expect(page).to have_content("Managers: User search")
@@ -60,11 +60,11 @@ describe "Admin managers", :admin do
expect(page).to have_content(manager1.name)
expect(page).to have_content(manager2.name)
fill_in "name_or_email", with: "Taylor"
fill_in "search", with: "Taylor"
click_button "Search"
expect(page).to have_content("Managers: User search")
expect(page).to have_field "name_or_email", with: "Taylor"
expect(page).to have_field "search", with: "Taylor"
expect(page).to have_content(manager1.name)
expect(page).not_to have_content(manager2.name)
end
@@ -73,11 +73,11 @@ describe "Admin managers", :admin do
expect(page).to have_content(manager1.email)
expect(page).to have_content(manager2.email)
fill_in "name_or_email", with: manager2.email
fill_in "search", with: manager2.email
click_button "Search"
expect(page).to have_content("Managers: User search")
expect(page).to have_field "name_or_email", with: manager2.email
expect(page).to have_field "search", with: manager2.email
expect(page).to have_content(manager2.email)
expect(page).not_to have_content(manager1.email)
end

View File

@@ -15,7 +15,7 @@ describe "Admin moderators", :admin do
end
scenario "Create Moderator", :js do
fill_in "name_or_email", with: user.email
fill_in "search", with: user.email
click_button "Search"
expect(page).to have_content user.name
@@ -47,7 +47,7 @@ describe "Admin moderators", :admin do
expect(page).to have_content(moderator1.name)
expect(page).to have_content(moderator2.name)
fill_in "name_or_email", with: " "
fill_in "search", with: " "
click_button "Search"
expect(page).to have_content("Moderators: User search")
@@ -60,11 +60,11 @@ describe "Admin moderators", :admin do
expect(page).to have_content(moderator1.name)
expect(page).to have_content(moderator2.name)
fill_in "name_or_email", with: "Eliz"
fill_in "search", with: "Eliz"
click_button "Search"
expect(page).to have_content("Moderators: User search")
expect(page).to have_field "name_or_email", with: "Eliz"
expect(page).to have_field "search", with: "Eliz"
expect(page).to have_content(moderator1.name)
expect(page).not_to have_content(moderator2.name)
end
@@ -73,11 +73,11 @@ describe "Admin moderators", :admin do
expect(page).to have_content(moderator1.email)
expect(page).to have_content(moderator2.email)
fill_in "name_or_email", with: moderator2.email
fill_in "search", with: moderator2.email
click_button "Search"
expect(page).to have_content("Moderators: User search")
expect(page).to have_field "name_or_email", with: moderator2.email
expect(page).to have_field "search", with: moderator2.email
expect(page).to have_content(moderator2.email)
expect(page).not_to have_content(moderator1.email)
end

View File

@@ -38,7 +38,7 @@ describe "Admin officials", :admin do
scenario "Create an official" do
visit admin_officials_path
fill_in "name_or_email", with: citizen.email
fill_in "search", with: citizen.email
click_button "Search"
expect(page).to have_current_path(search_admin_officials_path, ignore_query: true)

View File

@@ -36,7 +36,7 @@ describe "Admin::Organizations" do
visit admin_organizations_path
expect(page).to have_content("Get up, Stand up")
fill_in "term", with: " "
fill_in "search", with: " "
click_button "Search"
expect(page).to have_current_path(search_admin_organizations_path, ignore_query: true)
@@ -49,7 +49,7 @@ describe "Admin::Organizations" do
visit search_admin_organizations_path
expect(page).not_to have_content("Get up, Stand up")
fill_in "term", with: "Up, sta"
fill_in "search", with: "Up, sta"
click_button "Search"
within("#search-results") do
@@ -61,7 +61,7 @@ describe "Admin::Organizations" do
visit search_admin_organizations_path
expect(page).not_to have_content("Get up, Stand up")
fill_in "term", with: user.email
fill_in "search", with: user.email
click_button "Search"
within("#search-results") do
@@ -73,7 +73,7 @@ describe "Admin::Organizations" do
visit search_admin_organizations_path
expect(page).not_to have_content("Get up, Stand up")
fill_in "term", with: user.phone_number
fill_in "search", with: user.phone_number
click_button "Search"
within("#search-results") do

View File

@@ -15,7 +15,7 @@ describe "Admin poll officers", :admin do
end
scenario "Create", :js do
fill_in "email", with: user.email
fill_in "search", with: user.email
click_button "Search"
expect(page).to have_content user.name

View File

@@ -22,7 +22,7 @@ describe "Admin valuators", :admin do
end
scenario "Create", :js do
fill_in "name_or_email", with: user.email
fill_in "search", with: user.email
click_button "Search"
expect(page).to have_content(user.name)
@@ -72,7 +72,7 @@ describe "Admin valuators", :admin do
expect(page).to have_content(valuator1.name)
expect(page).to have_content(valuator2.name)
fill_in "name_or_email", with: " "
fill_in "search", with: " "
click_button "Search"
expect(page).to have_content("Valuators: User search")
@@ -85,11 +85,11 @@ describe "Admin valuators", :admin do
expect(page).to have_content(valuator1.name)
expect(page).to have_content(valuator2.name)
fill_in "name_or_email", with: "Foster"
fill_in "search", with: "Foster"
click_button "Search"
expect(page).to have_content("Valuators: User search")
expect(page).to have_field "name_or_email", with: "Foster"
expect(page).to have_field "search", with: "Foster"
expect(page).to have_content(valuator1.name)
expect(page).not_to have_content(valuator2.name)
end
@@ -98,11 +98,11 @@ describe "Admin valuators", :admin do
expect(page).to have_content(valuator1.email)
expect(page).to have_content(valuator2.email)
fill_in "name_or_email", with: valuator2.email
fill_in "search", with: valuator2.email
click_button "Search"
expect(page).to have_content("Valuators: User search")
expect(page).to have_field "name_or_email", with: valuator2.email
expect(page).to have_field "search", with: valuator2.email
expect(page).to have_content(valuator2.email)
expect(page).not_to have_content(valuator1.email)
end

View File

@@ -22,7 +22,7 @@ describe "Incomplete verifications", :admin do
visit admin_verifications_path
fill_in "name_or_email", with: "juan"
fill_in "search", with: "juan"
click_button "Search"
expect(page).to have_content("Juan_anonymous")