From 37685ea8cf25c24e909b7e4498c18fc64b11657e Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Tue, 29 Mar 2022 21:15:09 +0200 Subject: [PATCH 1/8] Update action usage --- .../discourse/templates/admin-wizards-api.hbs | 2 +- .../templates/admin-wizards-custom-fields.hbs | 2 +- .../discourse/templates/admin-wizards-wizard-show.hbs | 4 ++-- .../discourse/templates/admin-wizards-wizard.hbs | 2 +- .../templates/components/custom-field-input.hbs | 8 ++++---- .../templates/components/wizard-custom-action.hbs | 2 +- .../templates/components/wizard-custom-field.hbs | 2 +- .../discourse/templates/components/wizard-links.hbs | 11 +++++------ .../discourse/templates/components/wizard-mapper.hbs | 2 +- .../templates/components/wizard-text-editor.hbs | 4 ++-- .../templates/modal/next-session-scheduled.hbs | 2 +- 11 files changed, 20 insertions(+), 21 deletions(-) diff --git a/assets/javascripts/discourse/templates/admin-wizards-api.hbs b/assets/javascripts/discourse/templates/admin-wizards-api.hbs index 00d8ad60..f5e3214d 100644 --- a/assets/javascripts/discourse/templates/admin-wizards-api.hbs +++ b/assets/javascripts/discourse/templates/admin-wizards-api.hbs @@ -8,7 +8,7 @@ )}} {{d-button - action="createApi" + action=(action "createApi") label="admin.wizard.api.create" icon="plus"}} diff --git a/assets/javascripts/discourse/templates/admin-wizards-custom-fields.hbs b/assets/javascripts/discourse/templates/admin-wizards-custom-fields.hbs index 10501498..a90f6299 100644 --- a/assets/javascripts/discourse/templates/admin-wizards-custom-fields.hbs +++ b/assets/javascripts/discourse/templates/admin-wizards-custom-fields.hbs @@ -5,7 +5,7 @@ {{d-button label="admin.wizard.custom_field.add" icon="plus" - action="addField"}} + action=(action "addField")}} diff --git a/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs b/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs index c5ed70a7..6d4fa553 100644 --- a/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs +++ b/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs @@ -101,7 +101,7 @@ {{input type="checkbox" checked=wizard.after_time}} {{i18n "admin.wizard.after_time_label"}} {{d-button - action="setNextSessionScheduled" + action=(action "setNextSessionScheduled") translatedLabel=nextSessionScheduledLabel class="btn-after-time" icon="far-calendar"}} @@ -191,7 +191,7 @@ currentActionId=currentAction.id wizard=wizard apis=apis - removeAction="removeAction" + removeAction=(action "removeAction") wizardFields=wizardFields}} {{/each}} diff --git a/assets/javascripts/discourse/templates/admin-wizards-wizard.hbs b/assets/javascripts/discourse/templates/admin-wizards-wizard.hbs index 081cd5f3..11b0cd11 100644 --- a/assets/javascripts/discourse/templates/admin-wizards-wizard.hbs +++ b/assets/javascripts/discourse/templates/admin-wizards-wizard.hbs @@ -8,7 +8,7 @@ )}} {{d-button - action="createWizard" + action=(action "createWizard") label="admin.wizard.create" icon="plus"}} diff --git a/assets/javascripts/discourse/templates/components/custom-field-input.hbs b/assets/javascripts/discourse/templates/components/custom-field-input.hbs index 43a97be8..5f4d1ba1 100644 --- a/assets/javascripts/discourse/templates/components/custom-field-input.hbs +++ b/assets/javascripts/discourse/templates/components/custom-field-input.hbs @@ -34,17 +34,17 @@ {{/if}} {{/if}} {{d-button - action="destroy" + action=(action "destroy") icon="trash-alt" class="destroy" disabled=destroyDisabled}} {{d-button icon="save" - action="save" + action=(action "save") disabled=saveDisabled class="save"}} {{d-button - action="close" + action=(action "close") icon="times" disabled=closeDisabled}} @@ -69,7 +69,7 @@ {{else}} - {{d-button action="edit" icon="pencil-alt"}} + {{d-button action=(action "edit") icon="pencil-alt"}} {{/if}} {{/if}} diff --git a/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs b/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs index 4c645cf7..c39623d7 100644 --- a/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs +++ b/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs @@ -1,6 +1,6 @@ {{#if showUndo}} {{d-button - action="undoChanges" + action=(action "undoChanges") icon=undoIcon label=undoKey class="undo-changes"}} diff --git a/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs b/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs index f51b9fbb..b9c14999 100644 --- a/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs +++ b/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs @@ -1,6 +1,6 @@ {{#if showUndo}} {{d-button - action="undoChanges" + action=(action "undoChanges") icon=undoIcon label=undoKey class="undo-changes"}} diff --git a/assets/javascripts/discourse/templates/components/wizard-links.hbs b/assets/javascripts/discourse/templates/components/wizard-links.hbs index a7a7662e..368acd35 100644 --- a/assets/javascripts/discourse/templates/components/wizard-links.hbs +++ b/assets/javascripts/discourse/templates/components/wizard-links.hbs @@ -4,17 +4,16 @@ {{#if anyLinks}} {{#each links as |link|}}
- {{d-button action="change" actionParam=link.id translatedLabel=link.label class=link.classes}} + {{d-button action=(action "change") actionParam=link.id translatedLabel=link.label class=link.classes}} {{#unless link.first}} - {{d-button action="back" actionParam=link icon="arrow-left" class="back"}} + {{d-button action=(action "back") actionParam=link icon="arrow-left" class="back"}} {{/unless}} {{#unless link.last}} - {{d-button action="forward" actionParam=link icon="arrow-right" class="forward"}} + {{d-button action=(action "forward") actionParam=link icon="arrow-right" class="forward"}} {{/unless}} - {{d-button action="remove" actionParam=link.id icon="times" class="remove"}} + {{d-button action=(action "remove") actionParam=link.id icon="times" class="remove"}}
{{/each}} {{/if}} - {{d-button action="add" label="admin.wizard.add" icon="plus"}} + {{d-button action=(action "add") label="admin.wizard.add" icon="plus"}} - diff --git a/assets/javascripts/discourse/templates/components/wizard-mapper.hbs b/assets/javascripts/discourse/templates/components/wizard-mapper.hbs index 2de35e0d..c0cc6818 100644 --- a/assets/javascripts/discourse/templates/components/wizard-mapper.hbs +++ b/assets/javascripts/discourse/templates/components/wizard-mapper.hbs @@ -15,6 +15,6 @@ {{#if canAdd}} - {{d-button action="add" label="admin.wizard.add" icon="plus"}} + {{d-button action=(action "add") label="admin.wizard.add" icon="plus"}} {{/if}} diff --git a/assets/javascripts/discourse/templates/components/wizard-text-editor.hbs b/assets/javascripts/discourse/templates/components/wizard-text-editor.hbs index c657049d..37a3e549 100644 --- a/assets/javascripts/discourse/templates/components/wizard-text-editor.hbs +++ b/assets/javascripts/discourse/templates/components/wizard-text-editor.hbs @@ -6,13 +6,13 @@
{{#if previewEnabled}} {{d-button - action="togglePreview" + action=(action "togglePreview") translatedLabel=previewLabel}} {{/if}} {{#if fieldsEnabled}} {{d-button - action="togglePopover" + action=(action "togglePopover") translatedLabel=popoverLabel}} {{#if showPopover}} diff --git a/assets/javascripts/discourse/templates/modal/next-session-scheduled.hbs b/assets/javascripts/discourse/templates/modal/next-session-scheduled.hbs index 1b138360..cbc9d610 100644 --- a/assets/javascripts/discourse/templates/modal/next-session-scheduled.hbs +++ b/assets/javascripts/discourse/templates/modal/next-session-scheduled.hbs @@ -9,7 +9,7 @@
{{d-button - action="submit" + action=(action "submit") class="btn-primary" label="admin.wizard.after_time_modal.done" disabled=submitDisabled}} From 13f5aeda983ece2c21f7af6881e1cd0a80049bc2 Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Wed, 30 Mar 2022 11:01:36 +0200 Subject: [PATCH 2/8] Update admin-wizards-wizard-show.hbs --- .../discourse/templates/admin-wizards-wizard-show.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs b/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs index 6d4fa553..d36ed871 100644 --- a/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs +++ b/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs @@ -185,9 +185,9 @@ items=wizard.actions generateLabels=true}} - {{#each wizard.actions as |action|}} + {{#each wizard.actions as |wizardAction|}} {{wizard-custom-action - action=action + action=wizardAction currentActionId=currentAction.id wizard=wizard apis=apis From 61ad74e07b324789d4b71e1ae6ebacc7dae5c38f Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Mon, 4 Apr 2022 12:14:00 +0200 Subject: [PATCH 3/8] Revert "Update action usage" This reverts commit 37685ea8cf25c24e909b7e4498c18fc64b11657e. --- .../discourse/templates/admin-wizards-api.hbs | 2 +- .../templates/admin-wizards-custom-fields.hbs | 2 +- .../discourse/templates/admin-wizards-wizard-show.hbs | 4 ++-- .../discourse/templates/admin-wizards-wizard.hbs | 2 +- .../templates/components/custom-field-input.hbs | 8 ++++---- .../templates/components/wizard-custom-action.hbs | 2 +- .../templates/components/wizard-custom-field.hbs | 2 +- .../discourse/templates/components/wizard-links.hbs | 11 ++++++----- .../discourse/templates/components/wizard-mapper.hbs | 2 +- .../templates/components/wizard-text-editor.hbs | 4 ++-- .../templates/modal/next-session-scheduled.hbs | 2 +- 11 files changed, 21 insertions(+), 20 deletions(-) diff --git a/assets/javascripts/discourse/templates/admin-wizards-api.hbs b/assets/javascripts/discourse/templates/admin-wizards-api.hbs index f5e3214d..00d8ad60 100644 --- a/assets/javascripts/discourse/templates/admin-wizards-api.hbs +++ b/assets/javascripts/discourse/templates/admin-wizards-api.hbs @@ -8,7 +8,7 @@ )}} {{d-button - action=(action "createApi") + action="createApi" label="admin.wizard.api.create" icon="plus"}}
diff --git a/assets/javascripts/discourse/templates/admin-wizards-custom-fields.hbs b/assets/javascripts/discourse/templates/admin-wizards-custom-fields.hbs index a90f6299..10501498 100644 --- a/assets/javascripts/discourse/templates/admin-wizards-custom-fields.hbs +++ b/assets/javascripts/discourse/templates/admin-wizards-custom-fields.hbs @@ -5,7 +5,7 @@ {{d-button label="admin.wizard.custom_field.add" icon="plus" - action=(action "addField")}} + action="addField"}}
diff --git a/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs b/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs index d36ed871..7fdeb20c 100644 --- a/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs +++ b/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs @@ -101,7 +101,7 @@ {{input type="checkbox" checked=wizard.after_time}} {{i18n "admin.wizard.after_time_label"}} {{d-button - action=(action "setNextSessionScheduled") + action="setNextSessionScheduled" translatedLabel=nextSessionScheduledLabel class="btn-after-time" icon="far-calendar"}} @@ -191,7 +191,7 @@ currentActionId=currentAction.id wizard=wizard apis=apis - removeAction=(action "removeAction") + removeAction="removeAction" wizardFields=wizardFields}} {{/each}} diff --git a/assets/javascripts/discourse/templates/admin-wizards-wizard.hbs b/assets/javascripts/discourse/templates/admin-wizards-wizard.hbs index 11b0cd11..081cd5f3 100644 --- a/assets/javascripts/discourse/templates/admin-wizards-wizard.hbs +++ b/assets/javascripts/discourse/templates/admin-wizards-wizard.hbs @@ -8,7 +8,7 @@ )}} {{d-button - action=(action "createWizard") + action="createWizard" label="admin.wizard.create" icon="plus"}} diff --git a/assets/javascripts/discourse/templates/components/custom-field-input.hbs b/assets/javascripts/discourse/templates/components/custom-field-input.hbs index 5f4d1ba1..43a97be8 100644 --- a/assets/javascripts/discourse/templates/components/custom-field-input.hbs +++ b/assets/javascripts/discourse/templates/components/custom-field-input.hbs @@ -34,17 +34,17 @@ {{/if}} {{/if}} {{d-button - action=(action "destroy") + action="destroy" icon="trash-alt" class="destroy" disabled=destroyDisabled}} {{d-button icon="save" - action=(action "save") + action="save" disabled=saveDisabled class="save"}} {{d-button - action=(action "close") + action="close" icon="times" disabled=closeDisabled}} @@ -69,7 +69,7 @@ {{else}} - {{d-button action=(action "edit") icon="pencil-alt"}} + {{d-button action="edit" icon="pencil-alt"}} {{/if}} {{/if}} diff --git a/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs b/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs index c39623d7..4c645cf7 100644 --- a/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs +++ b/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs @@ -1,6 +1,6 @@ {{#if showUndo}} {{d-button - action=(action "undoChanges") + action="undoChanges" icon=undoIcon label=undoKey class="undo-changes"}} diff --git a/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs b/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs index b9c14999..f51b9fbb 100644 --- a/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs +++ b/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs @@ -1,6 +1,6 @@ {{#if showUndo}} {{d-button - action=(action "undoChanges") + action="undoChanges" icon=undoIcon label=undoKey class="undo-changes"}} diff --git a/assets/javascripts/discourse/templates/components/wizard-links.hbs b/assets/javascripts/discourse/templates/components/wizard-links.hbs index 368acd35..a7a7662e 100644 --- a/assets/javascripts/discourse/templates/components/wizard-links.hbs +++ b/assets/javascripts/discourse/templates/components/wizard-links.hbs @@ -4,16 +4,17 @@ {{#if anyLinks}} {{#each links as |link|}}
- {{d-button action=(action "change") actionParam=link.id translatedLabel=link.label class=link.classes}} + {{d-button action="change" actionParam=link.id translatedLabel=link.label class=link.classes}} {{#unless link.first}} - {{d-button action=(action "back") actionParam=link icon="arrow-left" class="back"}} + {{d-button action="back" actionParam=link icon="arrow-left" class="back"}} {{/unless}} {{#unless link.last}} - {{d-button action=(action "forward") actionParam=link icon="arrow-right" class="forward"}} + {{d-button action="forward" actionParam=link icon="arrow-right" class="forward"}} {{/unless}} - {{d-button action=(action "remove") actionParam=link.id icon="times" class="remove"}} + {{d-button action="remove" actionParam=link.id icon="times" class="remove"}}
{{/each}} {{/if}} - {{d-button action=(action "add") label="admin.wizard.add" icon="plus"}} + {{d-button action="add" label="admin.wizard.add" icon="plus"}} + diff --git a/assets/javascripts/discourse/templates/components/wizard-mapper.hbs b/assets/javascripts/discourse/templates/components/wizard-mapper.hbs index c0cc6818..2de35e0d 100644 --- a/assets/javascripts/discourse/templates/components/wizard-mapper.hbs +++ b/assets/javascripts/discourse/templates/components/wizard-mapper.hbs @@ -15,6 +15,6 @@ {{#if canAdd}} - {{d-button action=(action "add") label="admin.wizard.add" icon="plus"}} + {{d-button action="add" label="admin.wizard.add" icon="plus"}} {{/if}} diff --git a/assets/javascripts/discourse/templates/components/wizard-text-editor.hbs b/assets/javascripts/discourse/templates/components/wizard-text-editor.hbs index 37a3e549..c657049d 100644 --- a/assets/javascripts/discourse/templates/components/wizard-text-editor.hbs +++ b/assets/javascripts/discourse/templates/components/wizard-text-editor.hbs @@ -6,13 +6,13 @@
{{#if previewEnabled}} {{d-button - action=(action "togglePreview") + action="togglePreview" translatedLabel=previewLabel}} {{/if}} {{#if fieldsEnabled}} {{d-button - action=(action "togglePopover") + action="togglePopover" translatedLabel=popoverLabel}} {{#if showPopover}} diff --git a/assets/javascripts/discourse/templates/modal/next-session-scheduled.hbs b/assets/javascripts/discourse/templates/modal/next-session-scheduled.hbs index cbc9d610..1b138360 100644 --- a/assets/javascripts/discourse/templates/modal/next-session-scheduled.hbs +++ b/assets/javascripts/discourse/templates/modal/next-session-scheduled.hbs @@ -9,7 +9,7 @@
{{d-button - action=(action "submit") + action="submit" class="btn-primary" label="admin.wizard.after_time_modal.done" disabled=submitDisabled}} From cd43cdd29b46ff23eb378b536cae466fa3ade7c7 Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Mon, 4 Apr 2022 12:14:05 +0200 Subject: [PATCH 4/8] Revert "Update admin-wizards-wizard-show.hbs" This reverts commit 13f5aeda983ece2c21f7af6881e1cd0a80049bc2. --- .../discourse/templates/admin-wizards-wizard-show.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs b/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs index 7fdeb20c..c5ed70a7 100644 --- a/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs +++ b/assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs @@ -185,9 +185,9 @@ items=wizard.actions generateLabels=true}} - {{#each wizard.actions as |wizardAction|}} + {{#each wizard.actions as |action|}} {{wizard-custom-action - action=wizardAction + action=action currentActionId=currentAction.id wizard=wizard apis=apis From 0b6ba868ce58741531b1db938f56c7225a141de5 Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Mon, 4 Apr 2022 12:15:13 +0200 Subject: [PATCH 5/8] FIX: Ensure we always progress index --- .../discourse/components/wizard-links.js.es6 | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/assets/javascripts/discourse/components/wizard-links.js.es6 b/assets/javascripts/discourse/components/wizard-links.js.es6 index 62c45911..bf0dd242 100644 --- a/assets/javascripts/discourse/components/wizard-links.js.es6 +++ b/assets/javascripts/discourse/components/wizard-links.js.es6 @@ -78,16 +78,9 @@ export default Component.extend({ let params = setWizardDefaults({}, itemType); params.isNew = true; + params.index = items.length; - let index = 0; - if (items.length) { - let last_item = items[items.length - 1]; - index = Number(last_item.id.split("_").pop()); - } - - params.index = index; - - let id = `${itemType}_${index + 1}`; + let id = `${itemType}_${params.index + 1}`; if (itemType === "field") { id = `${this.parentId}_${id}`; } From 449b81a93eff2b640ee057ad49c4d3ddc792969b Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Fri, 22 Apr 2022 15:46:32 +0300 Subject: [PATCH 6/8] COMPATIBILITY: new editor helper fn signatures See https://github.com/discourse/discourse/commit/94207e27d16f120fe8ce01e9542ded41118bccbc --- .../wizard/initializers/custom-wizard-field.js.es6 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/javascripts/wizard/initializers/custom-wizard-field.js.es6 b/assets/javascripts/wizard/initializers/custom-wizard-field.js.es6 index f5deb927..e397af5f 100644 --- a/assets/javascripts/wizard/initializers/custom-wizard-field.js.es6 +++ b/assets/javascripts/wizard/initializers/custom-wizard-field.js.es6 @@ -114,13 +114,13 @@ export default { _wizardInsertText(args = {}) { if (args.fieldId === this.fieldId) { - this._insertText(args.text, args.options); + this.insertText(args.text, args.options); } }, _wizardReplaceText(args = {}) { if (args.fieldId === this.fieldId) { - this._replaceText(args.oldVal, args.newVal, (args.opts = {})); + this.replaceText(args.oldVal, args.newVal, (args.opts = {})); } }, @@ -139,7 +139,7 @@ export default { let html = clipboard.getData("text/html"); let handled = false; - const { pre, lineVal } = this._getSelected(null, { lineVal: true }); + const { pre, lineVal } = this.getSelected(null, { lineVal: true }); const isInlinePasting = pre.match(/[^\n]$/); const isCodeBlock = isInside(pre, /(^|\n)```/g); @@ -150,7 +150,7 @@ export default { !isCodeBlock ) { plainText = plainText.trim().replace(/\r/g, ""); - const table = this._extractTable(plainText); + const table = this.extractTable(plainText); if (table) { this.appEvents.trigger("wizard-editor:insert-text", { fieldId: this.fieldId, From 2c7addb9ae12645fe460ed28b4fe5cd8cd9c329e Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Thu, 12 May 2022 18:14:38 +0200 Subject: [PATCH 7/8] FIX: css grid causes issues for admin editor in safari --- assets/stylesheets/common/wizard-admin.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/assets/stylesheets/common/wizard-admin.scss b/assets/stylesheets/common/wizard-admin.scss index acc6f112..607f9037 100644 --- a/assets/stylesheets/common/wizard-admin.scss +++ b/assets/stylesheets/common/wizard-admin.scss @@ -430,7 +430,6 @@ } .d-editor-textarea-wrapper { - display: grid; margin-bottom: 10px; textarea { From 294c35cf9b4e5f4fee5ccf55d308417b74ff83fe Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Fri, 13 May 2022 11:40:08 +0200 Subject: [PATCH 8/8] COMPATIBILITY: three custom fields were dropped in core https://github.com/discourse/discourse/commit/991b62b6f123e9df63f443bba411eee4f3c3066a --- spec/components/custom_wizard/custom_field_spec.rb | 4 ++-- .../custom_wizard/admin/custom_fields_controller_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/components/custom_wizard/custom_field_spec.rb b/spec/components/custom_wizard/custom_field_spec.rb index 155a6526..cd29f081 100644 --- a/spec/components/custom_wizard/custom_field_spec.rb +++ b/spec/components/custom_wizard/custom_field_spec.rb @@ -220,11 +220,11 @@ describe CustomWizard::CustomField do end it "lists custom field records added by other plugins " do - expect(CustomWizard::CustomField.external_list.length).to eq(11) + expect(CustomWizard::CustomField.external_list.length).to eq(8) end it "lists all custom field records" do - expect(CustomWizard::CustomField.full_list.length).to eq(15) + expect(CustomWizard::CustomField.full_list.length).to eq(12) end end diff --git a/spec/requests/custom_wizard/admin/custom_fields_controller_spec.rb b/spec/requests/custom_wizard/admin/custom_fields_controller_spec.rb index 6f1aea12..1690660f 100644 --- a/spec/requests/custom_wizard/admin/custom_fields_controller_spec.rb +++ b/spec/requests/custom_wizard/admin/custom_fields_controller_spec.rb @@ -18,7 +18,7 @@ describe CustomWizard::AdminCustomFieldsController do it "returns the full list of custom fields" do get "/admin/wizards/custom-fields.json" - expect(response.parsed_body.length).to eq(15) + expect(response.parsed_body.length).to eq(12) end it "saves custom fields" do