Merge branch 'main' into admin-acceptance-tests

.github/workflows/discourse-plugin.yml

@@ -5,6 +5,8 @@ on:
     branches:
       - main
   pull_request:
+  schedule:
+    - cron: "0 0 * * *"
 
 jobs:
   ci:

assets/javascripts/discourse/lib/wizard-mapper.js.es6

@@ -35,6 +35,7 @@ function inputTypesContent(options = {}) {
 const connectors = {
   pair: [
     "equal",
+    "not_equal",
     "greater",
     "less",
     "greater_or_equal",

config/locales/client.en.yml

@@ -324,6 +324,7 @@ en:
           then: "then"
           set: "set"
           equal: '='
+          not_equal: '!='
           greater: '>'
           less: '<'
           greater_or_equal: '>='

lib/custom_wizard/log.rb

@@ -15,13 +15,13 @@ class CustomWizard::Log
     @username = attrs['username']
   end
 
-  def self.create(wizard_id, action, username, message)
+  def self.create(wizard_id, action, username, message, date = Time.now)
     log_id = SecureRandom.hex(12)
 
     PluginStore.set('custom_wizard_log',
       log_id.to_s,
       {
-        date: Time.now,
+        date: date,
         wizard_id: wizard_id,
         action: action,
         username: username,

lib/custom_wizard/mapper.rb

@@ -30,6 +30,7 @@ class CustomWizard::Mapper
 
   OPERATORS = {
     equal: '==',
+    not_equal: "!=",
     greater: '>',
     less: '<',
     greater_or_equal: '>=',

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.3.2
+# version: 2.3.4
 # authors: Angus McLeod, Faizaan Gagan, Robert Barrow, Keegan George, Kaitlin Maddever
 # url: https://github.com/paviliondev/discourse-custom-wizard
 # contact_emails: development@pavilion.tech

spec/components/custom_wizard/mapper_spec.rb

@@ -291,6 +291,19 @@ describe CustomWizard::Mapper do
     end
   end
 
+  it "handles not equal pairs" do
+    expect(CustomWizard::Mapper.new(
+      inputs: inputs['not_equals_pair'],
+      data: data,
+      user: user1
+    ).perform).to eq(true)
+    expect(CustomWizard::Mapper.new(
+      inputs: inputs['not_equals_pair'],
+      data: data,
+      user: user2
+    ).perform).to eq(false)
+  end
+
   it "handles greater than pairs" do
     expect(CustomWizard::Mapper.new(
       inputs: inputs['greater_than_pair'],

spec/fixtures/mapper/inputs.json

@@ -195,6 +195,21 @@
       ]
     }
   ],
+  "not_equals_pair": [
+    {
+      "type": "validation",
+      "pairs": [
+        {
+          "index": 0,
+          "key": "trust_level",
+          "key_type": "user_field",
+          "value": "1",
+          "value_type": "text",
+          "connector": "not_equal"
+        }
+      ]
+    }
+  ],
   "greater_than_pair": [
     {
       "type": "validation",

spec/serializers/custom_wizard/log_serializer_spec.rb

@@ -4,7 +4,7 @@ describe CustomWizard::LogSerializer do
   fab!(:user) { Fabricate(:user) }
 
   it 'should return log attributes' do
-    CustomWizard::Log.create('first-test-wizard', 'perform_first_action', 'first_test_user', 'First log message')
+    CustomWizard::Log.create('first-test-wizard', 'perform_first_action', 'first_test_user', 'First log message', 1.day.ago)
     CustomWizard::Log.create('second-test-wizard', 'perform_second_action', 'second_test_user', 'Second log message')
 
     json_array = ActiveModel::ArraySerializer.new(