From e02f78569a30b78fec9697aca18b0388cb0a5b83 Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Fri, 29 Sep 2023 08:33:39 +0800 Subject: [PATCH] FIX: explicitly order submission list for specs --- lib/custom_wizard/submission.rb | 2 ++ lib/custom_wizard/subscription.rb | 2 +- spec/serializers/custom_wizard/submission_serializer_spec.rb | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/custom_wizard/submission.rb b/lib/custom_wizard/submission.rb index ae616b0b..7387902e 100644 --- a/lib/custom_wizard/submission.rb +++ b/lib/custom_wizard/submission.rb @@ -131,6 +131,8 @@ class CustomWizard::Submission 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 index ee72b7f8..23de1808 100644 --- a/lib/custom_wizard/subscription.rb +++ b/lib/custom_wizard/subscription.rb @@ -157,7 +157,7 @@ class CustomWizard::Subscription 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/spec/serializers/custom_wizard/submission_serializer_spec.rb b/spec/serializers/custom_wizard/submission_serializer_spec.rb index 2fa000e8..d81cfb15 100644 --- a/spec/serializers/custom_wizard/submission_serializer_spec.rb +++ b/spec/serializers/custom_wizard/submission_serializer_spec.rb @@ -40,7 +40,7 @@ describe CustomWizard::SubmissionSerializer do 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,