discourse
/
discourse-assign
mirror of https://github.com/discourse/discourse-assign.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Fix a flaky spec and typos (#378)

This commit is contained in:
Jarek Radosz 2022-09-12 09:27:25 +02:00 committed by GitHub
parent 0d9aa9c5fa
commit eea90c9670
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spec/requests/assign_controller_spec.rb
View File

@ -12,9 +12,9 @@ RSpec.describe DiscourseAssign::AssignController do
end end
fab!(:post) { Fabricate(:post) } fab!(:post) { Fabricate(:post) }
fab!(:user2) do fab!(:user2) do
Fabricate(:active_user, name: "David Tylor", username: "david", groups: [default_allowed_group]) Fabricate(:active_user, name: "David Taylor", username: "david", groups: [default_allowed_group])
end end
let(:nonadmin) { Fabricate(:user, groups: [default_allowed_group]) } let(:non_admin) { Fabricate(:user, groups: [default_allowed_group]) }
fab!(:normal_user) { Fabricate(:user) } fab!(:normal_user) { Fabricate(:user) }
fab!(:normal_admin) { Fabricate(:admin) } fab!(:normal_admin) { Fabricate(:admin) }
@ -34,7 +34,7 @@ RSpec.describe DiscourseAssign::AssignController do
expect(response.status).to eq(403) expect(response.status).to eq(403)
end end
it "filters requests where assigne group is not allowed" do it "filters requests where assigned group is not allowed" do
put "/assign/assign.json", put "/assign/assign.json",
params: { params: {
target_id: post.topic_id, target_id: post.topic_id,
@ -76,10 +76,10 @@ RSpec.describe DiscourseAssign::AssignController do
end end
it "does include only visible assign_allowed_on_groups" do it "does include only visible assign_allowed_on_groups" do
sign_in(nonadmin) # Need to use nonadmin to test. Admins can see all groups sign_in(non_admin) # Need to use non-admin to test. Admins can see all groups
visible_group = Fabricate(:group, visibility_level: Group.visibility_levels[:members]) visible_group = Fabricate(:group, visibility_level: Group.visibility_levels[:members])
visible_group.add(nonadmin) visible_group.add(non_admin)
invisible_group = Fabricate(:group, visibility_level: Group.visibility_levels[:members]) invisible_group = Fabricate(:group, visibility_level: Group.visibility_levels[:members])
SiteSetting.assign_allowed_on_groups = "#{visible_group.id}|#{invisible_group.id}" SiteSetting.assign_allowed_on_groups = "#{visible_group.id}|#{invisible_group.id}"
@ -305,7 +305,7 @@ RSpec.describe DiscourseAssign::AssignController do
end end
context "with custom allowed groups" do context "with custom allowed groups" do
let(:custom_allowed_group) { Fabricate(:group, name: "mygroup") } let(:custom_allowed_group) { Fabricate(:group, name: "my-group") }
let(:other_user) { Fabricate(:user, groups: [custom_allowed_group]) } let(:other_user) { Fabricate(:user, groups: [custom_allowed_group]) }
before { SiteSetting.assign_allowed_on_groups += "|#{custom_allowed_group.id}" } before { SiteSetting.assign_allowed_on_groups += "|#{custom_allowed_group.id}" }
@ -351,7 +351,7 @@ RSpec.describe DiscourseAssign::AssignController do
it "doesn't include members with no assignments" do it "doesn't include members with no assignments" do
sign_in(user) sign_in(user)
add_to_assign_allowed_group(nonadmin) add_to_assign_allowed_group(non_admin)
get "/assign/members/#{get_assigned_allowed_group_name}.json" get "/assign/members/#{get_assigned_allowed_group_name}.json"
expect(response.status).to eq(200) expect(response.status).to eq(200)
@ -373,7 +373,7 @@ RSpec.describe DiscourseAssign::AssignController do
expect(response.status).to eq(200) expect(response.status).to eq(200)
expect(JSON.parse(response.body)["members"].map { |m| m["id"] }).to match_array([user2.id]) expect(JSON.parse(response.body)["members"].map { |m| m["id"] }).to match_array([user2.id])
get "/assign/members/#{get_assigned_allowed_group_name}.json", params: { filter: "Tylor" } get "/assign/members/#{get_assigned_allowed_group_name}.json", params: { filter: "Taylor" }
expect(response.status).to eq(200) expect(response.status).to eq(200)
expect(JSON.parse(response.body)["members"].map { |m| m["id"] }).to match_array([user2.id]) expect(JSON.parse(response.body)["members"].map { |m| m["id"] }).to match_array([user2.id])
end end
@ -475,7 +475,7 @@ RSpec.describe DiscourseAssign::AssignController do
expect(response.status).to eq(200) expect(response.status).to eq(200)
notifications = response.parsed_body["notifications"] notifications = response.parsed_body["notifications"]
expect(notifications.map { |n| [n["topic_id"], n["post_number"]] }).to eq( expect(notifications.map { |n| [n["topic_id"], n["post_number"]] }).to match_array(
[ [
[unread_assigned_topic.id, 1], [unread_assigned_topic.id, 1],
[unread_assigned_post.topic.id, unread_assigned_post.post_number], [unread_assigned_post.topic.id, unread_assigned_post.post_number],