use cuprite in members pagination spec

opf · Nov 21, 2024 · 48588fd · 48588fd
1 parent 82bb693
commit 48588fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/spec/features/members/pagination_spec.rb b/spec/features/members/pagination_spec.rb
@@ -28,7 +28,7 @@
 
 require "spec_helper"
 
-RSpec.describe "members pagination", :js do
+RSpec.describe "members pagination", :js, :with_cuprite do
   shared_let(:admin) { create(:admin) }
   let(:project) do
     create(:project,
@@ -59,11 +59,9 @@
       members_page.set_items_per_page! 2
 
       members_page.visit!
-      SeleniumHubWaiter.wait
       expect(members_page).to have_user "Alice Alison" # members are sorted by last name desc
       members_page.add_user! "Peter Pan", as: "Manager"
 
-      SeleniumHubWaiter.wait
       members_page.go_to_page! 2
       expect(members_page).to have_user "Peter Pan"
     end
@@ -82,12 +80,10 @@
       members_page.set_items_per_page! 1
 
       members_page.visit!
-      SeleniumHubWaiter.wait
       members_page.remove_user! "Alice Alison"
       expect_and_dismiss_flash message: "Removed Alice Alison from project"
       expect(members_page).to have_user "Bob Bobbit"
 
-      SeleniumHubWaiter.wait
       members_page.go_to_page! 2
       expect(members_page).to have_user "Peter Pan"
     end
@@ -98,13 +94,11 @@
       members_page.set_items_per_page! 1
 
       members_page.visit!
-      SeleniumHubWaiter.wait
       members_page.go_to_page! 2
       members_page.edit_user! "Bob Bobbit", add_roles: ["Developer"]
       expect(page).to have_text "Successful update"
       expect(members_page).to have_user "Bob Bobbit", roles: ["Developer", "Manager"]
 
-      SeleniumHubWaiter.wait
       members_page.go_to_page! 1
       expect(members_page).to have_user "Alice Alison"
     end

diff --git a/spec/support/pages/members.rb b/spec/support/pages/members.rb
@@ -55,7 +55,7 @@ def open_filters!
     def search_for_name(name)
       fill_in "name", with: name
       find(".simple-filters--controls input[type=submit]").click
-      wait_for_network_idle
+      wait_for_reload
     end
 
     def expect_menu_item(text, selected: false)
@@ -183,7 +183,7 @@ def edit_user!(name, add_roles: [], remove_roles: [])
       Array(remove_roles).each { |role| uncheck role }
 
       click_on "Change"
-      wait_for_network_idle
+      wait_for_reload
     end
 
     def has_group_membership?(user_name)
@@ -266,7 +266,7 @@ def expect_role(role_name, present: true)
 
     def go_to_page!(number)
       find(".op-pagination--pages a", text: number.to_s).click
-      wait_for_network_idle
+      wait_for_reload
     end
   end
 end