Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Update specs and live preview

Matthew Kennedy2cd3fe22835b
diff --git a/api/spec/requests/spree/api/v2/platform/cms_page_spec.rb b/api/spec/requests/spree/api/v2/platform/cms_pages_spec.rb
similarity index 83%
rename from api/spec/requests/spree/api/v2/platform/cms_page_spec.rb
rename to api/spec/requests/spree/api/v2/platform/cms_pages_spec.rb
index e74339f415..45620fa818 100644
--- a/api/spec/requests/spree/api/v2/platform/cms_page_spec.rb
+++ b/api/spec/requests/spree/api/v2/platform/cms_pages_spec.rb
@@ -1,11 +1,11 @@
require 'spec_helper'
-describe 'Platform API v2 CmsPage', type: :request do
+describe 'Platform API v2 CmsPages', type: :request do
include_context 'API v2 tokens'
include_context 'Platform API v2'
- let!(:store) { create(:store, default: true) }
- let!(:page) { create(:cms_homepage, store: store) }
+ let(:store) { create(:store, default: true) }
+ let(:page) { create(:cms_homepage, store: store) }
let(:bearer_token) { { 'Authorization' => valid_authorization } }
describe 'cms_page#toggle_visibility' do
diff --git a/api/spec/requests/spree/api/v2/platform/cms_section_spec.rb b/api/spec/requests/spree/api/v2/platform/cms_sections_spec.rb
similarity index 79%
rename from api/spec/requests/spree/api/v2/platform/cms_section_spec.rb
rename to api/spec/requests/spree/api/v2/platform/cms_sections_spec.rb
index 75a22b27ac..06e20420bc 100644
--- a/api/spec/requests/spree/api/v2/platform/cms_section_spec.rb
+++ b/api/spec/requests/spree/api/v2/platform/cms_sections_spec.rb
@@ -1,15 +1,15 @@
require 'spec_helper'
-describe 'Platform API v2 CmsSection', type: :request do
+describe 'Platform API v2 CmsSections', type: :request do
include_context 'API v2 tokens'
include_context 'Platform API v2'
- let!(:store) { create(:store, default: true) }
- let!(:page) { create(:cms_homepage, store: store) }
- let!(:section_a) { create(:cms_section, cms_page: page) }
- let!(:section_b) { create(:cms_section, cms_page: page) }
- let!(:section_c) { create(:cms_section, cms_page: page) }
- let!(:section_d) { create(:cms_section, cms_page: page) }
+ let(:store) { create(:store, default: true) }
+ let(:page) { create(:cms_homepage, store: store) }
+ let(:section_a) { create(:cms_section, cms_page: page) }
+ let(:section_b) { create(:cms_section, cms_page: page) }
+ let(:section_c) { create(:cms_section, cms_page: page) }
+ let(:section_d) { create(:cms_section, cms_page: page) }
let(:bearer_token) { { 'Authorization' => valid_authorization } }
describe 'cms_section#reposition' do
diff --git a/api/spec/requests/spree/api/v2/platform/menu_item_spec.rb b/api/spec/requests/spree/api/v2/platform/menu_items_spec.rb
similarity index 92%
rename from api/spec/requests/spree/api/v2/platform/menu_item_spec.rb
rename to api/spec/requests/spree/api/v2/platform/menu_items_spec.rb
index c506017778..c2807cb29d 100644
--- a/api/spec/requests/spree/api/v2/platform/menu_item_spec.rb
+++ b/api/spec/requests/spree/api/v2/platform/menu_items_spec.rb
@@ -1,11 +1,11 @@
require 'spec_helper'
-describe 'Platform API v2 MenuItem', type: :request do
+describe 'Platform API v2 MenuItems', type: :request do
include_context 'API v2 tokens'
include_context 'Platform API v2'
- let!(:store) { create(:store, default: true) }
- let!(:menu) { create(:menu, store: store) }
+ let(:store) { create(:store, default: true) }
+ let(:menu) { create(:menu, store: store) }
let!(:menu_item_a) { create(:menu_item, menu: menu) }
let!(:menu_item_b) { create(:menu_item, menu: menu) }
let!(:menu_item_c) { create(:menu_item, menu: menu, parent: menu_item_b) }
diff --git a/backend/app/views/spree/admin/cms_pages/edit.html.erb b/backend/app/views/spree/admin/cms_pages/edit.html.erb
index bfbdba6edc..88b58bc5ee 100644
--- a/backend/app/views/spree/admin/cms_pages/edit.html.erb
+++ b/backend/app/views/spree/admin/cms_pages/edit.html.erb
@@ -12,65 +12,5 @@
<% end %>
<% if @cms_page.sections? %>
- <div class="row">
- <div id="pageSectionsArea" class="col-12">
-
- <hr class="mt-4 hide-on-full-screen-mode">
- <div class="row">
- <div class="col d-flex justify-content-start">
- <%= button_link_to Spree.t('admin.cms.add_new_section'), spree.new_admin_cms_page_cms_section_path(@cms_page), icon: 'add.svg', class: 'no-wrap btn btn-success align-self-center' %>
- </div>
- <div class="col d-none d-md-flex justify-content-end">
- <div id="LiveViewSwitcher" class="btn-group btn-group-toggle" data-toggle="buttons">
- <label class="btn btn-outline-primary active">
- <input type="radio" name="options" id="mobileLiveView" autocomplete="off"> Mobile
- </label>
- <label class="btn btn-outline-primary">
- <input type="radio" name="options" id="tabletLiveView" autocomplete="off"> Tablet
- </label>
- <label class="btn btn-outline-primary">
- <input type="radio" name="options" id="desktopLiveView" autocomplete="off" checked> Desktop
- </label>
- </div>
-
- <div class="ml-2">
- <button id="cmsSectionEditorFullScreen" type="button" class="btn btn-outline-primary no-wrap" data-toggle="button" autocomplete="off"><%= raw Spree.t('admin.cms.full_screen_mode') %></button>
- </div>
- </div>
- </div>
- <div class="row no-gutters">
- <div class="col-12 col-md-3 bg-light border">
- <% if @cms_page.cms_sections.any? %>
- <div id="cmsPagesectionsArea" class="card-body row m-0 p-1 no-gutters">
- <% @cms_page.cms_sections.each do |section| %>
- <%= render 'spree/admin/cms_pages/section_template', section: section %>
- <% end %>
- </div>
-
- <% else %>
- <div class="row">
- <div class="col-12">
- <div class="alert alert-info no-objects-found m-4">
- <%= raw Spree.t('admin.cms.no_sections_found_please_add_one') %>
- </div>
- </div>
- </div>
- <% end %>
- </div>
-
- <div class="d-none d-md-block col bg-secondary border border-left-0">
- <div id="liveViewCont" class="desktopLiveView">
- <div class="embed-responsive embed-responsive-4by3">
- <iframe class="embed-responsive-item"
- id="pageLivePreview"
- src="<%= preview_url(@cms_page) %>"
- sandbox="allow-same-origin allow-forms allow-popups allow-scripts allow-modals">
- </iframe>
- </div>
- </div>
- </div>
-
- </div>
- </div>
- </div>
+ <%= render partial: 'live_preview_area' %>
<% end %>