A platform for community discussion. Free, open, simple.
FIX: Loading more invites on the user invites page (#38386)
Sérgio Saquetima72c45e4f98a
diff --git a/frontend/discourse/app/controllers/user-invited/show.js b/frontend/discourse/app/controllers/user-invited/show.jsindex f663b1039cb..5ffa641c79b 100644--- a/frontend/discourse/app/controllers/user-invited/show.js+++ b/frontend/discourse/app/controllers/user-invited/show.js@@ -140,12 +140,13 @@ export default class UserInvitedShowController extends Controller {this.invitesLoading = true;try {- const inviteList = await Invite.findInvitedBy(+ const result = await Invite.findInvitedBy(this.user,this.filter,this.searchTerm,model.invites.length- ).invites;+ );+ const inviteList = result.invites;this.invitesLoading = false;model.invites.push(...inviteList);diff --git a/spec/system/page_objects/pages/user_invited_pending.rb b/spec/system/page_objects/pages/user_invited_pending.rbindex 3b572df81c2..43895a3f34d 100644--- a/spec/system/page_objects/pages/user_invited_pending.rb+++ b/spec/system/page_objects/pages/user_invited_pending.rb@@ -66,6 +66,10 @@ module PageObjectsfind(".user-content .invite-button")end+ def has_invite_count?(count)+ has_css?(".user-content .user-invite-list tbody tr", count: count)+ end+def invites_listall(".user-content .user-invite-list tbody tr").map { |row| Invite.new(row) }enddiff --git a/spec/system/user_page/user_invites_spec.rb b/spec/system/user_page/user_invites_spec.rbindex 6139f011eb7..039493a0174 100644--- a/spec/system/user_page/user_invites_spec.rb+++ b/spec/system/user_page/user_invites_spec.rb@@ -13,6 +13,18 @@ describe "User invites", type: :system dosign_in(admin)end+ describe "pending invites" do+ let(:user_invite_pending_page) { PageObjects::Pages::UserInvitedPending.new }++ it "can load more invites" do+ SiteSetting.invites_per_page = 3++ user_invite_pending_page.visit(user)++ expect(user_invite_pending_page).to have_invite_count(invites_pending.size)+ end+ end+describe "expired invites" dolet(:user_invite_expired_page) { PageObjects::Pages::UserInvitedExpired.new }it "correctly shows expired invites" do