Merge pull request #272 from paviliondev/fix_submission_list_order_in…

…_specs FIX: explicitly order submission list for specs
paviliondev · Oct 4, 2023 · 6d6ffa5 · 6d6ffa5
2 parents 43007d8 + cef2cc1
commit 6d6ffa5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/lib/custom_wizard/submission.rb b/lib/custom_wizard/submission.rb
@@ -131,6 +131,8 @@ def self.list(wizard, order_by: nil, page: nil)
     params[:key] = list_actor_id if list_actor_id
 
     query = PluginStoreRow.where(params)
+    query = query.order(order_by) if order_by
+
     result = OpenStruct.new(submissions: [], total: nil)
 
     query.each do |record|

diff --git a/lib/custom_wizard/subscription.rb b/lib/custom_wizard/subscription.rb
@@ -157,7 +157,7 @@ def type
     return :none unless subscribed?
     return :business if business?
     return :standard if standard?
-    return :community if community?
+    :community if community?
   end
 
   def subscribed?

diff --git a/plugin.rb b/plugin.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 # name: discourse-custom-wizard
 # about: Forms for Discourse. Better onboarding, structured posting, data enrichment, automated actions and much more.
-# version: 2.4.24
+# version: 2.4.25
 # authors: Angus McLeod, Faizaan Gagan, Robert Barrow, Keegan George, Kaitlin Maddever, Juan Marcos Gutierrez Ramos
 # url: https://github.com/paviliondev/discourse-custom-wizard
 # contact_emails: [email protected]

diff --git a/spec/serializers/custom_wizard/submission_serializer_spec.rb b/spec/serializers/custom_wizard/submission_serializer_spec.rb
@@ -40,7 +40,7 @@
 
   it "should return field values, types and labels" do
     wizard = CustomWizard::Wizard.create(template_json["id"])
-    list = CustomWizard::Submission.list(wizard, page: 0)
+    list = CustomWizard::Submission.list(wizard, page: 0, order_by: 'id')
 
     json_array = ActiveModel::ArraySerializer.new(
       list.submissions,