mirror of
https://github.com/discourse/discourse.git
synced 2025-05-28 13:51:18 +08:00
FEATURE: Allow columns on group members page to be sortable.
This commit is contained in:
@ -1,12 +1,12 @@
|
||||
require 'rails_helper'
|
||||
|
||||
describe "Groups" do
|
||||
let(:password) { 'somecomplicatedpassword' }
|
||||
let(:email_token) { Fabricate(:email_token, confirmed: true) }
|
||||
let(:user) { email_token.user }
|
||||
let(:user) { Fabricate(:user) }
|
||||
|
||||
before do
|
||||
user.update_attributes!(password: password)
|
||||
def sign_in(user)
|
||||
password = 'somecomplicatedpassword'
|
||||
user.update!(password: password)
|
||||
Fabricate(:email_token, confirmed: true, user: user)
|
||||
post "/session.json", { login: user.username, password: password }
|
||||
expect(response).to be_success
|
||||
end
|
||||
@ -15,6 +15,7 @@ describe "Groups" do
|
||||
let(:group) { Fabricate(:group, name: 'test', users: [user]) }
|
||||
|
||||
it "should return the right response" do
|
||||
sign_in(user)
|
||||
group
|
||||
|
||||
get "/groups/test/mentionable.json", { name: group.name }
|
||||
@ -40,6 +41,7 @@ describe "Groups" do
|
||||
context "when user is group owner" do
|
||||
before do
|
||||
group.add_owner(user)
|
||||
sign_in(user)
|
||||
end
|
||||
|
||||
it "should be able update the group" do
|
||||
@ -66,6 +68,7 @@ describe "Groups" do
|
||||
context "when user is group admin" do
|
||||
before do
|
||||
user.update_attributes!(admin: true)
|
||||
sign_in(user)
|
||||
end
|
||||
|
||||
it 'should be able to update the group' do
|
||||
@ -78,10 +81,68 @@ describe "Groups" do
|
||||
|
||||
context "when user is not a group owner or admin" do
|
||||
it 'should not be able to update the group' do
|
||||
sign_in(user)
|
||||
|
||||
xhr :put, "/groups/#{group.id}", { group: { name: 'testing' } }
|
||||
|
||||
expect(response.status).to eq(403)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe 'members' do
|
||||
let(:user1) do
|
||||
Fabricate(:user,
|
||||
last_seen_at: Time.zone.now,
|
||||
last_posted_at: Time.zone.now - 1.day,
|
||||
email: 'b@test.org'
|
||||
)
|
||||
end
|
||||
|
||||
let(:user2) do
|
||||
Fabricate(:user,
|
||||
last_seen_at: Time.zone.now - 1 .day,
|
||||
last_posted_at: Time.zone.now,
|
||||
email: 'a@test.org'
|
||||
)
|
||||
end
|
||||
|
||||
let(:group) { Fabricate(:group, users: [user1, user2]) }
|
||||
|
||||
it "should allow members to be sorted by" do
|
||||
xhr :get, "/groups/#{group.name}/members", order: 'last_seen_at', asc: true
|
||||
|
||||
expect(response).to be_success
|
||||
|
||||
members = JSON.parse(response.body)["members"]
|
||||
|
||||
expect(members.map { |m| m["id"] }).to eq([user1.id, user2.id])
|
||||
|
||||
xhr :get, "/groups/#{group.name}/members", order: 'last_seen_at'
|
||||
|
||||
expect(response).to be_success
|
||||
|
||||
members = JSON.parse(response.body)["members"]
|
||||
|
||||
expect(members.map { |m| m["id"] }).to eq([user2.id, user1.id])
|
||||
|
||||
xhr :get, "/groups/#{group.name}/members", order: 'last_posted_at', asc: true
|
||||
|
||||
expect(response).to be_success
|
||||
|
||||
members = JSON.parse(response.body)["members"]
|
||||
|
||||
expect(members.map { |m| m["id"] }).to eq([user2.id, user1.id])
|
||||
end
|
||||
|
||||
it "should not allow members to be sorted by columns that are not allowed" do
|
||||
xhr :get, "/groups/#{group.name}/members", order: 'email'
|
||||
|
||||
expect(response).to be_success
|
||||
|
||||
members = JSON.parse(response.body)["members"]
|
||||
|
||||
expect(members.map { |m| m["id"] }).to eq([user1.id, user2.id])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
Reference in New Issue
Block a user