Skip to content

A platform for community discussion. Free, open, simple.

DEV: Trim redundant workflow button specs

Régis Hanol2f376dd77997
diff --git a/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/post_button_spec.rb b/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/post_button_spec.rb
index d650e52001c..100e1dc223f 100644
--- a/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/post_button_spec.rb
+++ b/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/post_button_spec.rb
@@ -1,8 +1,6 @@
# frozen_string_literal: true
RSpec.describe DiscourseWorkflows::Nodes::PostButton::V1 do
- fab!(:group)
- fab!(:user)
fab!(:post)
describe "#output" do
@@ -22,35 +20,13 @@ RSpec.describe DiscourseWorkflows::Nodes::PostButton::V1 do
[1, 2],
)
end
-
- it "returns an empty array when the parameter is missing" do
- expect(described_class.normalized_group_ids({})).to eq([])
- end
end
describe ".available_to?" do
it "returns false for an anonymous user" do
- expect(described_class.available_to?(nil, "group_ids" => [group.id])).to eq(false)
- end
-
- it "returns false when no groups are configured" do
- expect(described_class.available_to?(user, "group_ids" => [])).to eq(false)
- end
-
- it "returns false when the user is in none of the configured groups" do
- expect(described_class.available_to?(user, "group_ids" => [group.id])).to eq(false)
- end
-
- it "returns true when the user is a member of a configured group" do
- group.add(user)
-
- expect(described_class.available_to?(user, "group_ids" => [group.id])).to eq(true)
- end
-
- it "returns true for any logged-in user when the logged-in users group is configured" do
expect(
- described_class.available_to?(user, "group_ids" => [Group::AUTO_GROUPS[:logged_in_users]]),
- ).to eq(true)
+ described_class.available_to?(nil, "group_ids" => [Group::AUTO_GROUPS[:logged_in_users]]),
+ ).to eq(false)
end
end
@@ -77,30 +53,8 @@ RSpec.describe DiscourseWorkflows::Nodes::PostButton::V1 do
end
describe ".matches_post_number?" do
- it "matches any post when the parameter is missing or blank" do
- expect(described_class.matches_post_number?(post, {})).to eq(true)
- expect(described_class.matches_post_number?(post, "post_number" => "")).to eq(true)
- expect(described_class.matches_post_number?(post, "post_number" => " ")).to eq(true)
- end
-
- it "matches positive integer and numeric string values" do
- expect(described_class.matches_post_number?(post, "post_number" => post.post_number)).to eq(
- true,
- )
- expect(
- described_class.matches_post_number?(post, "post_number" => post.post_number.to_s),
- ).to eq(true)
- expect(
- described_class.matches_post_number?(post, "post_number" => post.post_number + 1),
- ).to eq(false)
- end
-
- it "rejects malformed and nonpositive nonblank values" do
- ["invalid", "1.5", 0, -1].each do |post_number|
- expect(described_class.matches_post_number?(post, "post_number" => post_number)).to eq(
- false,
- )
- end
+ it "does not match any post when the post number is malformed" do
+ expect(described_class.matches_post_number?(post, "post_number" => "invalid")).to eq(false)
end
end
diff --git a/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/topic_admin_button_spec.rb b/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/topic_admin_button_spec.rb
index ff6754f0c49..327b95cc823 100644
--- a/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/topic_admin_button_spec.rb
+++ b/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/topic_admin_button_spec.rb
@@ -2,22 +2,12 @@
RSpec.describe DiscourseWorkflows::Nodes::TopicAdminButton::V1 do
fab!(:topic)
- fab!(:tag) { Fabricate(:tag, name: "test-tag") }
-
- before do
- SiteSetting.tagging_enabled = true
- topic.tags << tag
- end
describe "#output" do
it "returns topic data" do
- output = described_class.new(topic).output
-
- expect(output).to include(
+ expect(described_class.new(topic).output).to include(
topic: include(id: topic.id, title: topic.title, category_id: topic.category_id),
)
- expect(output[:topic][:tags].map { |topic_tag| topic_tag[:name] }).to eq(["test-tag"])
- expect(output[:topic][:posters].map { |poster| poster[:user_id] }).to include(topic.user_id)
end
end
end
diff --git a/plugins/discourse-workflows/spec/requests/discourse_workflows/post_button_controller_spec.rb b/plugins/discourse-workflows/spec/requests/discourse_workflows/post_button_controller_spec.rb
index 6852fdfb32d..2363e1e2b74 100644
--- a/plugins/discourse-workflows/spec/requests/discourse_workflows/post_button_controller_spec.rb
+++ b/plugins/discourse-workflows/spec/requests/discourse_workflows/post_button_controller_spec.rb
@@ -1,10 +1,8 @@
# frozen_string_literal: true
RSpec.describe DiscourseWorkflows::PostButtonController do
- fab!(:admin)
fab!(:group)
fab!(:member) { Fabricate(:user).tap { |user| group.add(user) } }
- fab!(:user)
fab!(:post_record, :post)
fab!(:workflow) do
graph =
@@ -17,30 +15,24 @@ RSpec.describe DiscourseWorkflows::PostButtonController do
"group_ids" => [group.id],
}
end
- Fabricate(:discourse_workflows_workflow, created_by: admin, published: true, **graph)
+ Fabricate(:discourse_workflows_workflow, published: true, **graph)
+ end
+
+ let(:params) do
+ { workflow_id: workflow.id, trigger_node_id: "trigger-1", post_id: post_record.id }
end
describe "POST /discourse-workflows/trigger-post-button" do
it "requires authentication" do
- post "/discourse-workflows/trigger-post-button.json",
- params: {
- workflow_id: workflow.id,
- trigger_node_id: "trigger-1",
- post_id: post_record.id,
- }
+ post "/discourse-workflows/trigger-post-button.json", params: params
expect(response).to have_http_status(:forbidden)
end
it "returns 403 when the user is in none of the configured groups" do
- sign_in(user)
+ sign_in(Fabricate(:user))
- post "/discourse-workflows/trigger-post-button.json",
- params: {
- workflow_id: workflow.id,
- trigger_node_id: "trigger-1",
- post_id: post_record.id,
- }
+ post "/discourse-workflows/trigger-post-button.json", params: params
expect(response).to have_http_status(:forbidden)
end
@@ -49,32 +41,11 @@ RSpec.describe DiscourseWorkflows::PostButtonController do
before { sign_in(member) }
it "returns 204 on success" do
- post "/discourse-workflows/trigger-post-button.json",
- params: {
- workflow_id: workflow.id,
- trigger_node_id: "trigger-1",
- post_id: post_record.id,
- }
+ post "/discourse-workflows/trigger-post-button.json", params: params
expect(response).to have_http_status(:no_content)
end
- it "enqueues an ExecuteWorkflow job" do
- post "/discourse-workflows/trigger-post-button.json",
- params: {
- workflow_id: workflow.id,
- trigger_node_id: "trigger-1",
- post_id: post_record.id,
- }
-
- job = Jobs::DiscourseWorkflows::ExecuteWorkflow.jobs.last
- expect(job["args"].first).to include(
- "trigger_node_id" => "trigger-1",
- "workflow_version_id" => workflow.active_version_id,
- "user_id" => member.id,
- )
- end
-
it "returns 400 when contract is invalid" do
post "/discourse-workflows/trigger-post-button.json", params: {}
@@ -83,63 +54,29 @@ RSpec.describe DiscourseWorkflows::PostButtonController do
it "returns 404 when trigger node does not exist" do
post "/discourse-workflows/trigger-post-button.json",
- params: {
- workflow_id: workflow.id,
- trigger_node_id: "nonexistent",
- post_id: post_record.id,
- }
-
- expect(response).to have_http_status(:not_found)
- end
-
- it "returns 404 when workflow is unpublished" do
- unpublish_workflow!(workflow)
-
- post "/discourse-workflows/trigger-post-button.json",
- params: {
- workflow_id: workflow.id,
- trigger_node_id: "trigger-1",
- post_id: post_record.id,
- }
+ params: params.merge(trigger_node_id: "nonexistent")
expect(response).to have_http_status(:not_found)
end
it "returns 404 when the user cannot see the post" do
- private_category = Fabricate(:private_category, group: Fabricate(:group))
- private_post = Fabricate(:post, topic: Fabricate(:topic, category: private_category))
+ category = Fabricate(:private_category, group: Fabricate(:group))
+ private_post = Fabricate(:post, topic: Fabricate(:topic, category:))
post "/discourse-workflows/trigger-post-button.json",
- params: {
- workflow_id: workflow.id,
- trigger_node_id: "trigger-1",
- post_id: private_post.id,
- }
+ params: params.merge(post_id: private_post.id)
expect(response).to have_http_status(:not_found)
end
- it "returns 403 without enqueuing when the configured post number does not match" do
+ it "returns 403 when the configured post number does not match" do
update_workflow_node(workflow, "trigger-1") do |node|
- node.merge(
- "parameters" => {
- "label" => "Run workflow",
- "icon" => "bolt",
- "group_ids" => [group.id],
- "post_number" => post_record.post_number + 1,
- },
- )
+ node.deep_merge("parameters" => { "post_number" => post_record.post_number + 1 })
end
publish_workflow!(workflow)
- expect do
- post "/discourse-workflows/trigger-post-button.json",
- params: {
- workflow_id: workflow.id,
- trigger_node_id: "trigger-1",
- post_id: post_record.id,
- }
- end.not_to change { Jobs::DiscourseWorkflows::ExecuteWorkflow.jobs.size }
+ post "/discourse-workflows/trigger-post-button.json", params: params
+
expect(response).to have_http_status(:forbidden)
end
end
diff --git a/plugins/discourse-workflows/spec/requests/discourse_workflows/topic_admin_button_controller_spec.rb b/plugins/discourse-workflows/spec/requests/discourse_workflows/topic_admin_button_controller_spec.rb
index 54b7cb80948..b1e71b786d3 100644
--- a/plugins/discourse-workflows/spec/requests/discourse_workflows/topic_admin_button_controller_spec.rb
+++ b/plugins/discourse-workflows/spec/requests/discourse_workflows/topic_admin_button_controller_spec.rb
@@ -2,7 +2,6 @@
RSpec.describe DiscourseWorkflows::TopicAdminButtonController do
fab!(:admin)
- fab!(:user)
fab!(:topic)
fab!(:workflow) do
graph =
@@ -14,28 +13,22 @@ RSpec.describe DiscourseWorkflows::TopicAdminButtonController do
"icon" => "gear",
}
end
- Fabricate(:discourse_workflows_workflow, created_by: admin, published: true, **graph)
+ Fabricate(:discourse_workflows_workflow, published: true, **graph)
end
+ let(:params) { { trigger_node_id: "trigger-1", topic_id: topic.id } }
+
describe "POST /discourse-workflows/trigger-topic-admin-button" do
it "requires authentication" do
- post "/discourse-workflows/trigger-topic-admin-button.json",
- params: {
- trigger_node_id: "trigger-1",
- topic_id: topic.id,
- }
+ post "/discourse-workflows/trigger-topic-admin-button.json", params: params
expect(response).to have_http_status(:forbidden)
end
it "returns 403 when user is not an admin" do
- sign_in(user)
+ sign_in(Fabricate(:user))
- post "/discourse-workflows/trigger-topic-admin-button.json",
- params: {
- trigger_node_id: "trigger-1",
- topic_id: topic.id,
- }
+ post "/discourse-workflows/trigger-topic-admin-button.json", params: params
expect(response).to have_http_status(:forbidden)
end
@@ -44,29 +37,11 @@ RSpec.describe DiscourseWorkflows::TopicAdminButtonController do
before { sign_in(admin) }
it "returns 204 on success" do
- post "/discourse-workflows/trigger-topic-admin-button.json",
- params: {
- trigger_node_id: "trigger-1",
- topic_id: topic.id,
- }
+ post "/discourse-workflows/trigger-topic-admin-button.json", params: params
expect(response).to have_http_status(:no_content)
end
- it "enqueues an ExecuteWorkflow job" do
- post "/discourse-workflows/trigger-topic-admin-button.json",
- params: {
- trigger_node_id: "trigger-1",
- topic_id: topic.id,
- }
-
- job = Jobs::DiscourseWorkflows::ExecuteWorkflow.jobs.last
- expect(job["args"].first).to include(
- "trigger_node_id" => "trigger-1",
- "workflow_version_id" => workflow.active_version_id,
- )
- end
-
it "returns 400 when contract is invalid" do
post "/discourse-workflows/trigger-topic-admin-button.json", params: {}
@@ -75,22 +50,7 @@ RSpec.describe DiscourseWorkflows::TopicAdminButtonController do
it "returns 404 when trigger node does not exist" do
post "/discourse-workflows/trigger-topic-admin-button.json",
- params: {
- trigger_node_id: "nonexistent",
- topic_id: topic.id,
- }
-
- expect(response).to have_http_status(:not_found)
- end
-
- it "returns 404 when workflow is unpublished" do
- unpublish_workflow!(workflow)
-
- post "/discourse-workflows/trigger-topic-admin-button.json",
- params: {
- trigger_node_id: "trigger-1",
- topic_id: topic.id,
- }
+ params: params.merge(trigger_node_id: "nonexistent")
expect(response).to have_http_status(:not_found)
end
diff --git a/plugins/discourse-workflows/spec/serializers/site_serializer_spec.rb b/plugins/discourse-workflows/spec/serializers/site_serializer_spec.rb
index 58321a56a3f..11d5d5bc9c5 100644
--- a/plugins/discourse-workflows/spec/serializers/site_serializer_spec.rb
+++ b/plugins/discourse-workflows/spec/serializers/site_serializer_spec.rb
@@ -178,71 +178,5 @@ RSpec.describe SiteSerializer do
},
)
end
-
- it "serializes numeric post numbers as integers without leaking group ids" do
- update_workflow_node(post_button_workflow, "trigger-1") do |node|
- node.merge(
- "parameters" => {
- "label" => "Run workflow",
- "group_ids" => [group.id],
- "post_number" => 3,
- },
- )
- end
- publish_workflow!(post_button_workflow)
-
- member_guardian = Guardian.new(member)
- data =
- described_class.new(Site.new(member_guardian), scope: member_guardian, root: false).as_json
-
- expect(data[:post_button_workflows]).to contain_exactly(
- {
- trigger_node_id: "trigger-1",
- workflow_id: post_button_workflow.id,
- label: "Run workflow",
- icon: nil,
- post_number: 3,
- position: "last",
- confirmation: false,
- confirmation_message: nil,
- },
- )
- end
-
- it "serializes malformed and nonpositive post numbers to the invalid sentinel" do
- ["invalid", 0].each do |post_number|
- update_workflow_node(post_button_workflow, "trigger-1") do |node|
- node.merge(
- "parameters" => {
- "label" => "Run workflow",
- "group_ids" => [group.id],
- "post_number" => post_number,
- },
- )
- end
- publish_workflow!(post_button_workflow)
-
- member_guardian = Guardian.new(member)
- data =
- described_class.new(
- Site.new(member_guardian),
- scope: member_guardian,
- root: false,
- ).as_json
-
- expect(data[:post_button_workflows]).to contain_exactly(
- {
- trigger_node_id: "trigger-1",
- workflow_id: post_button_workflow.id,
- label: "Run workflow",
- icon: nil,
- post_number: DiscourseWorkflows::Nodes::PostButton::V1::INVALID_POST_NUMBER,
- position: "last",
- confirmation: false,
- confirmation_message: nil,
- },
- )
- end
- end
end
end
diff --git a/plugins/discourse-workflows/spec/services/discourse_workflows/workflow/trigger_post_button_spec.rb b/plugins/discourse-workflows/spec/services/discourse_workflows/workflow/trigger_post_button_spec.rb
index fe2650fd173..3c3b2449360 100644
--- a/plugins/discourse-workflows/spec/services/discourse_workflows/workflow/trigger_post_button_spec.rb
+++ b/plugins/discourse-workflows/spec/services/discourse_workflows/workflow/trigger_post_button_spec.rb
@@ -9,9 +9,8 @@ RSpec.describe DiscourseWorkflows::Workflow::TriggerPostButton do
describe ".call" do
subject(:result) { described_class.call(params:, **dependencies) }
- fab!(:admin)
fab!(:group)
- fab!(:member) { Fabricate(:user).tap { |user| group.add(user) } }
+ fab!(:acting_user) { Fabricate(:user).tap { |user| group.add(user) } }
fab!(:post_record, :post)
fab!(:workflow) do
graph =
@@ -24,15 +23,13 @@ RSpec.describe DiscourseWorkflows::Workflow::TriggerPostButton do
"group_ids" => [group.id],
}
end
- Fabricate(:discourse_workflows_workflow, created_by: admin, published: true, **graph)
+ Fabricate(:discourse_workflows_workflow, published: true, **graph)
end
let(:params) do
{ workflow_id: workflow.id, trigger_node_id: "trigger-1", post_id: post_record.id }
end
- let(:dependencies) { { guardian: Guardian.new(member) } }
-
- before { DiscourseWorkflows::WorkflowDependencyIndexer.call(workflow) }
+ let(:dependencies) { { guardian: acting_user.guardian } }
context "when contract is invalid" do
let(:params) { { trigger_node_id: nil, post_id: nil } }
@@ -41,9 +38,7 @@ RSpec.describe DiscourseWorkflows::Workflow::TriggerPostButton do
end
context "when workflow is not found" do
- let(:params) do
- { workflow_id: workflow.id, trigger_node_id: "nonexistent", post_id: post_record.id }
- end
+ let(:params) { super().merge(trigger_node_id: "nonexistent") }
it { is_expected.to fail_to_find_a_model(:published_trigger) }
end
@@ -54,6 +49,12 @@ RSpec.describe DiscourseWorkflows::Workflow::TriggerPostButton do
it { is_expected.to fail_to_find_a_model(:published_trigger) }
end
+ context "when a legacy request omits the workflow id" do
+ let(:params) { super().except(:workflow_id) }
+
+ it { is_expected.to run_successfully }
+ end
+
context "when published workflows share a trigger node id" do
fab!(:other_workflow) do
graph =
@@ -65,46 +66,28 @@ RSpec.describe DiscourseWorkflows::Workflow::TriggerPostButton do
"group_ids" => [group.id],
}
end
- Fabricate(:discourse_workflows_workflow, created_by: admin, published: true, **graph)
+ Fabricate(:discourse_workflows_workflow, published: true, **graph)
end
- before { DiscourseWorkflows::WorkflowDependencyIndexer.call(other_workflow) }
+ let(:params) { super().merge(workflow_id: other_workflow.id) }
- it "enqueues each specifically requested workflow" do
- service_results = []
+ it "enqueues the requested workflow" do
+ result
- expect do
- [workflow, other_workflow].each do |requested_workflow|
- service_results << described_class.call(
- params: params.merge(workflow_id: requested_workflow.id),
- **dependencies,
- )
- end
- end.to change { Jobs::DiscourseWorkflows::ExecuteWorkflow.jobs.size }.by(2)
-
- service_results.each { |service_result| expect(service_result).to run_successfully }
- expect(
- Jobs::DiscourseWorkflows::ExecuteWorkflow
- .jobs
- .last(2)
- .map { |job| job["args"].first["workflow_id"] },
- ).to eq([workflow.id, other_workflow.id])
+ expect(Jobs::DiscourseWorkflows::ExecuteWorkflow.jobs.last["args"].first).to include(
+ "workflow_id" => other_workflow.id,
+ )
end
- it "fails to find a trigger when a legacy request is ambiguous" do
- legacy_params = params.except(:workflow_id)
- legacy_result = nil
+ context "when a legacy request omits the workflow id" do
+ let(:params) { super().except(:workflow_id) }
- expect do
- legacy_result = described_class.call(params: legacy_params, **dependencies)
- end.not_to change { Jobs::DiscourseWorkflows::ExecuteWorkflow.jobs.size }
- expect(legacy_result).to fail_to_find_a_model(:published_trigger)
+ it { is_expected.to fail_to_find_a_model(:published_trigger) }
end
end
context "when user is in none of the configured groups" do
fab!(:acting_user, :user)
- let(:dependencies) { { guardian: Guardian.new(acting_user) } }
it { is_expected.to fail_a_policy(:can_use_post_button) }
end
@@ -121,28 +104,24 @@ RSpec.describe DiscourseWorkflows::Workflow::TriggerPostButton do
end
context "when post does not exist" do
- let(:params) { { workflow_id: workflow.id, trigger_node_id: "trigger-1", post_id: -1 } }
+ let(:params) { super().merge(post_id: -1) }
it { is_expected.to fail_to_find_a_model(:post) }
end
context "when the user cannot see the post" do
- fab!(:private_post) do
+ fab!(:post_record) do
category = Fabricate(:private_category, group: Fabricate(:group))
- Fabricate(:post, topic: Fabricate(:topic, category: category))
- end
-
- let(:params) do
- { workflow_id: workflow.id, trigger_node_id: "trigger-1", post_id: private_post.id }
+ Fabricate(:post, topic: Fabricate(:topic, category:))
end
it { is_expected.to fail_a_policy(:can_see_post) }
end
context "when a moderator triggers the first post of a deleted topic" do
- fab!(:member) { Fabricate(:moderator).tap { |user| group.add(user) } }
+ fab!(:acting_user) { Fabricate(:moderator).tap { |user| group.add(user) } }
- before { PostDestroyer.new(admin, post_record).destroy }
+ before { PostDestroyer.new(acting_user, post_record).destroy }
it { is_expected.to run_successfully }
end
@@ -150,7 +129,7 @@ RSpec.describe DiscourseWorkflows::Workflow::TriggerPostButton do
context "when a group member triggers a deleted reply" do
fab!(:post_record) { Fabricate(:post, topic: Fabricate(:topic_with_op)) }
- before { post_record.trash!(admin) }
+ before { post_record.trash! }
it { is_expected.to fail_a_policy(:can_see_post) }
end
@@ -158,66 +137,37 @@ RSpec.describe DiscourseWorkflows::Workflow::TriggerPostButton do
context "when the configured post number does not match" do
before do
update_workflow_node(workflow, "trigger-1") do |node|
- node.merge(
- "parameters" => {
- "label" => "Run workflow",
- "icon" => "bolt",
- "group_ids" => [group.id],
- "post_number" => post_record.post_number + 1,
- },
- )
+ node.deep_merge("parameters" => { "post_number" => post_record.post_number + 1 })
end
publish_workflow!(workflow)
end
- it "fails the post-number policy without enqueuing a workflow" do
- expect { result }.not_to change { Jobs::DiscourseWorkflows::ExecuteWorkflow.jobs.size }
- expect(result).to fail_a_policy(:can_trigger_for_post)
- end
+ it { is_expected.to fail_a_policy(:can_trigger_for_post) }
end
- context "when the post number is omitted" do
+ context "when the configured post number matches" do
+ before do
+ update_workflow_node(workflow, "trigger-1") do |node|
+ node.deep_merge("parameters" => { "post_number" => post_record.post_number.to_s })
+ end
+ publish_workflow!(workflow)
+ end
+
it { is_expected.to run_successfully }
+ end
+ context "when everything is valid" do
it "enqueues an ExecuteWorkflow job acting as the clicking user" do
result
- job = Jobs::DiscourseWorkflows::ExecuteWorkflow.jobs.last
- expect(job["args"].first).to include(
+
+ expect(Jobs::DiscourseWorkflows::ExecuteWorkflow.jobs.last["args"].first).to include(
"trigger_node_id" => "trigger-1",
"workflow_id" => workflow.id,
"workflow_version_id" => workflow.active_version_id,
- "user_id" => member.id,
+ "user_id" => acting_user.id,
+ "trigger_data" => a_hash_including("post" => a_hash_including("id" => post_record.id)),
)
- expect(job["args"].first["trigger_data"]["post"]).to include(
- "id" => post_record.id,
- "post_number" => post_record.post_number,
- )
- expect(job["args"].first["trigger_data"]["topic"]).to include("id" => post_record.topic_id)
end
end
-
- context "when a legacy request omits the workflow id" do
- let(:params) { { trigger_node_id: "trigger-1", post_id: post_record.id } }
-
- it { is_expected.to run_successfully }
- end
-
- context "when the configured post number matches" do
- before do
- update_workflow_node(workflow, "trigger-1") do |node|
- node.merge(
- "parameters" => {
- "label" => "Run workflow",
- "icon" => "bolt",
- "group_ids" => [group.id],
- "post_number" => post_record.post_number.to_s,
- },
- )
- end
- publish_workflow!(workflow)
- end
-
- it { is_expected.to run_successfully }
- end
end
end
diff --git a/plugins/discourse-workflows/spec/services/discourse_workflows/workflow/trigger_topic_admin_button_spec.rb b/plugins/discourse-workflows/spec/services/discourse_workflows/workflow/trigger_topic_admin_button_spec.rb
index f6bababb6c9..c9cba82c917 100644
--- a/plugins/discourse-workflows/spec/services/discourse_workflows/workflow/trigger_topic_admin_button_spec.rb
+++ b/plugins/discourse-workflows/spec/services/discourse_workflows/workflow/trigger_topic_admin_button_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe DiscourseWorkflows::Workflow::TriggerTopicAdminButton do
describe ".call" do
subject(:result) { described_class.call(params:, **dependencies) }
- fab!(:admin)
+ fab!(:acting_user, :admin)
fab!(:topic)
fab!(:workflow) do
graph =
@@ -21,13 +21,11 @@ RSpec.describe DiscourseWorkflows::Workflow::TriggerTopicAdminButton do
"icon" => "gear",
}
end
- Fabricate(:discourse_workflows_workflow, created_by: admin, published: true, **graph)
+ Fabricate(:discourse_workflows_workflow, published: true, **graph)
end
let(:params) { { trigger_node_id: "trigger-1", topic_id: topic.id } }
- let(:dependencies) { { guardian: Guardian.new(admin) } }
-
- before { DiscourseWorkflows::WorkflowDependencyIndexer.call(workflow) }
+ let(:dependencies) { { guardian: acting_user.guardian } }
context "when contract is invalid" do
let(:params) { { trigger_node_id: nil, topic_id: nil } }
@@ -37,13 +35,12 @@ RSpec.describe DiscourseWorkflows::Workflow::TriggerTopicAdminButton do
context "when user is not an admin" do
fab!(:acting_user, :user)
- let(:dependencies) { { guardian: Guardian.new(acting_user) } }
it { is_expected.to fail_a_policy(:can_manage_workflows) }
end
context "when workflow is not found" do
- let(:params) { { trigger_node_id: "nonexistent", topic_id: topic.id } }
+ let(:params) { super().merge(trigger_node_id: "nonexistent") }
it { is_expected.to fail_to_find_a_model(:published_trigger) }
end
@@ -55,36 +52,28 @@ RSpec.describe DiscourseWorkflows::Workflow::TriggerTopicAdminButton do
end
context "when topic does not exist" do
- let(:params) { { trigger_node_id: "trigger-1", topic_id: -1 } }
+ let(:params) { super().merge(topic_id: -1) }
it { is_expected.to fail_to_find_a_model(:topic) }
end
context "when topic is deleted" do
- before { topic.trash!(admin) }
+ before { topic.trash! }
it { is_expected.to run_successfully }
end
context "when everything is valid" do
- it { is_expected.to run_successfully }
-
it "enqueues an ExecuteWorkflow job" do
result
- job = Jobs::DiscourseWorkflows::ExecuteWorkflow.jobs.last
- expect(job["args"].first).to include(
+
+ expect(Jobs::DiscourseWorkflows::ExecuteWorkflow.jobs.last["args"].first).to include(
"trigger_node_id" => "trigger-1",
"workflow_id" => workflow.id,
"workflow_version_id" => workflow.active_version_id,
- "user_id" => admin.id,
- )
- expect(job["args"].first["trigger_data"]["topic"]).to include(
- "id" => topic.id,
- "title" => topic.title,
+ "user_id" => acting_user.id,
+ "trigger_data" => a_hash_including("topic" => a_hash_including("id" => topic.id)),
)
- expect(
- job["args"].first["trigger_data"]["topic"]["posters"].map { |poster| poster["user_id"] },
- ).to include(topic.user_id)
end
end
end