diff --git a/.github/workflows/plugin-tests.yml b/.github/workflows/plugin-tests.yml
index 782ebc4f..f32cdf5c 100644
--- a/.github/workflows/plugin-tests.yml
+++ b/.github/workflows/plugin-tests.yml
@@ -73,18 +73,6 @@ jobs:
ref: "${{ github.base_ref }}"
fetch-depth: 1
- - name: Check spec existence
- id: check_spec
- uses: andstor/file-existence-action@v1
- with:
- files: "plugins/${{ steps.repo-name.outputs.value }}/spec"
-
- - name: Check qunit existence
- id: check_qunit
- uses: andstor/file-existence-action@v1
- with:
- files: "plugins/${{ steps.repo-name.outputs.value }}/test/javascripts"
-
- name: Setup Git
run: |
git config --global user.email "ci@ci.invalid"
@@ -140,7 +128,7 @@ jobs:
bin/rake db:migrate
- name: Plugin RSpec with Coverage
- if: matrix.build_type == 'backend' && steps.check_spec.outputs.files_exists == 'true'
+ if: matrix.build_type == 'backend'
run: |
if [ -e plugins/${{ steps.repo-name.outputs.value }}/.simplecov ]
then
@@ -150,6 +138,6 @@ jobs:
bin/rake plugin:spec[${{ steps.repo-name.outputs.value }}]
- name: Plugin QUnit
- if: matrix.build_type == 'frontend' && steps.check_qunit.outputs.files_exists == 'true'
- run: bundle exec rake plugin:qunit['${{ steps.repo-name.outputs.value }}','1200000']
+ if: matrix.build_type == 'frontend'
+ run: QUNIT_SKIP_CORE=1 LOAD_PLUGINS=1 QUNIT_EMBER_CLI=0 bin/rake "qunit:test['600000','/w/qunit']"
timeout-minutes: 30
diff --git a/app/controllers/custom_wizard/wizard.rb b/app/controllers/custom_wizard/wizard.rb
index 1037c3e6..a7988b0d 100644
--- a/app/controllers/custom_wizard/wizard.rb
+++ b/app/controllers/custom_wizard/wizard.rb
@@ -1,55 +1,40 @@
# frozen_string_literal: true
-class CustomWizard::WizardController < ::ApplicationController
- include ApplicationHelper
- prepend_view_path(Rails.root.join('plugins', 'discourse-custom-wizard', 'app', 'views'))
- layout 'wizard'
+class CustomWizard::WizardController < ::ActionController::Base
+ helper ApplicationHelper
+ include CurrentUser
+ include CanonicalURL::ControllerExtensions
+ include GlobalPath
+
+ prepend_view_path(Rails.root.join('plugins', 'discourse-custom-wizard', 'app', 'views'))
+ layout :set_wizard_layout
+
+ before_action :preload_wizard_json
before_action :ensure_plugin_enabled
before_action :update_subscription, only: [:index]
before_action :ensure_logged_in, only: [:skip]
+
helper_method :wizard_page_title
helper_method :wizard_theme_id
helper_method :wizard_theme_lookup
helper_method :wizard_theme_translations_lookup
- def wizard
- @builder = CustomWizard::Builder.new(params[:wizard_id].underscore, current_user)
- @wizard ||= @builder.build
- @wizard
- end
-
- def wizard_page_title
- wizard ? (wizard.name || wizard.id) : I18n.t('wizard.custom_title')
- end
-
- def wizard_theme_id
- wizard ? wizard.theme_id : nil
- end
-
- def wizard_theme_lookup(name)
- Theme.lookup_field(wizard_theme_id, mobile_view? ? :mobile : :desktop, name)
- end
-
- def wizard_theme_translations_lookup
- Theme.lookup_field(wizard_theme_id, :translations, I18n.locale)
+ def set_wizard_layout
+ action_name === 'qunit' ? 'qunit' : 'wizard'
end
def index
respond_to do |format|
format.json do
- builder = CustomWizard::Builder.new(params[:wizard_id].underscore, current_user)
-
- if builder.wizard.present?
- builder_opts = {}
- builder_opts[:reset] = params[:reset]
- built_wizard = builder.build(builder_opts, params)
-
- render_serialized(built_wizard, ::CustomWizard::WizardSerializer, root: false)
+ if wizard.present?
+ render json: CustomWizard::WizardSerializer.new(wizard, scope: guardian, root: false).as_json, status: 200
else
render json: { error: I18n.t('wizard.none') }
end
end
- format.html {}
+ format.html do
+ render "default/empty"
+ end
end
end
@@ -73,6 +58,64 @@ class CustomWizard::WizardController < ::ApplicationController
render json: result
end
+ def qunit
+ raise Discourse::InvalidAccess.new if Rails.env.production?
+
+ respond_to do |format|
+ format.html do
+ render "default/empty"
+ end
+ end
+ end
+
+ protected
+
+ def ensure_logged_in
+ raise Discourse::NotLoggedIn.new unless current_user.present?
+ end
+
+ def guardian
+ @guardian ||= Guardian.new(current_user, request)
+ end
+
+ def wizard
+ @wizard ||= begin
+ builder = CustomWizard::Builder.new(params[:wizard_id].underscore, current_user)
+ return nil unless builder.present?
+ opts = {}
+ opts[:reset] = params[:reset]
+ builder.build(opts, params)
+ end
+ end
+
+ def wizard_page_title
+ wizard ? (wizard.name || wizard.id) : I18n.t('wizard.custom_title')
+ end
+
+ def wizard_theme_id
+ wizard ? wizard.theme_id : nil
+ end
+
+ def wizard_theme_lookup(name)
+ Theme.lookup_field(wizard_theme_id, view_context.mobile_view? ? :mobile : :desktop, name)
+ end
+
+ def wizard_theme_translations_lookup
+ Theme.lookup_field(wizard_theme_id, :translations, I18n.locale)
+ end
+
+ def preload_wizard_json
+ return if request.xhr? || request.format.json?
+ return if request.method != "GET"
+
+ store_preloaded("siteSettings", SiteSetting.client_settings_json)
+ end
+
+ def store_preloaded(key, json)
+ @preloaded ||= {}
+ @preloaded[key] = json.gsub("
+
+
+ Custom Wizard QUnit Test Runner
+ <%= discourse_stylesheet_link_tag(:test_helper, theme_id: nil) %>
+ <%= discourse_stylesheet_link_tag :wizard, theme_id: nil %>
+ <%= discourse_stylesheet_link_tag :wizard_custom %>
+ <%= preload_script "locales/en" %>
+ <%= preload_script "ember_jquery" %>
+ <%= preload_script "wizard-vendor" %>
+ <%= preload_script "wizard-custom" %>
+ <%= preload_script "wizard-raw-templates" %>
+ <%= preload_script "wizard-plugin" %>
+ <%= preload_script "pretty-text-bundle" %>
+ <%= preload_script "wizard-qunit" %>
+ <%= csrf_meta_tags %>
+
+
+
+ <%= tag.meta id: 'data-discourse-setup', data: client_side_setup_data %>
+
+
+
+
+
+
+
+
diff --git a/app/views/layouts/wizard.html.erb b/app/views/layouts/wizard.html.erb
index 16d119b7..f909ae84 100644
--- a/app/views/layouts/wizard.html.erb
+++ b/app/views/layouts/wizard.html.erb
@@ -11,10 +11,8 @@
<%= preload_script "locales/#{I18n.locale}" %>
<%= preload_script "ember_jquery" %>
<%= preload_script "wizard-vendor" %>
- <%= preload_script "wizard-application" %>
- <%= preload_script "wizard-custom-globals" %>
- <%= preload_script "wizard-raw-templates" %>
<%= preload_script "wizard-custom" %>
+ <%= preload_script "wizard-raw-templates" %>
<%= preload_script "wizard-plugin" %>
<%= preload_script "pretty-text-bundle" %>
@@ -58,5 +56,7 @@
<%= raw SvgSprite.bundle %>
+
+