github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-04 23:14:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Push null fields to last when sorting group members.

Browse Source
This commit is contained in:
Guo Xiang Tan
2016-12-22 14:55:24 +08:00
parent 5605700fa9
commit 5aee2673c7
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spec/integration/groups_spec.rb
View File

@ -168,7 +168,15 @@ describe "Groups" do
)
end
let(:group) { Fabricate(:group, users: [user1, user2]) }
let(:user3) do
Fabricate(:user,
last_seen_at: nil,
last_posted_at: nil,
email: 'c@test.org'
)
end
let(:group) { Fabricate(:group, users: [user1, user2, user3]) }
it "should allow members to be sorted by" do
xhr :get, "/groups/#{group.name}/members", order: 'last_seen_at', desc: true
@ -177,7 +185,7 @@ describe "Groups" do
members = JSON.parse(response.body)["members"]
expect(members.map { |m| m["id"] }).to eq([user1.id, user2.id])
expect(members.map { |m| m["id"] }).to eq([user1.id, user2.id, user3.id])
xhr :get, "/groups/#{group.name}/members", order: 'last_seen_at'
@ -185,7 +193,7 @@ describe "Groups" do
members = JSON.parse(response.body)["members"]
expect(members.map { |m| m["id"] }).to eq([user2.id, user1.id])
expect(members.map { |m| m["id"] }).to eq([user2.id, user1.id, user3.id])
xhr :get, "/groups/#{group.name}/members", order: 'last_posted_at', desc: true
@ -193,7 +201,7 @@ describe "Groups" do
members = JSON.parse(response.body)["members"]
expect(members.map { |m| m["id"] }).to eq([user2.id, user1.id])
expect(members.map { |m| m["id"] }).to eq([user2.id, user1.id, user3.id])
end
it "should not allow members to be sorted by columns that are not allowed" do
@ -203,7 +211,7 @@ describe "Groups" do
members = JSON.parse(response.body)["members"]
expect(members.map { |m| m["id"] }).to eq([user1.id, user2.id])
expect(members.map { |m| m["id"] }).to eq([user1.id, user2.id, user3.id])
end
end