Try some dubious fixes

Author: parndt

core/app/assets/stylesheets/refinery/sections/_layout.scss

@@ -895,7 +895,7 @@ label.stripped {
   padding-top: 4px;
 }
 
-#records.tree li span.item {
+#records.tree li span.icon {
   display: block;
   float: left;
   width: 16px;

pages/app/controllers/refinery/admin/page_parts_controller.rb

@@ -1,6 +1,7 @@
 module Refinery
   module Admin
     class PagePartsController < ::Refinery::AdminController
+      skip_after_action :store_location?, raise: false
 
       def new
         render :partial => '/refinery/admin/pages/page_part_field', :locals => {

pages/app/helpers/refinery/admin/pages_helper.rb

@@ -60,14 +60,14 @@ def page_icon(number_of_children)
         # 2. no_children 'page'
 
         # .toggle scss handles adding icons to pages with children
-        classes = []
+        classes = ['icon']
         case
         when number_of_children.zero?
           classes.push icon_class('page')
           title = ::I18n.t('edit', scope: 'refinery.admin.pages')
         else
           expanded_class = Refinery::Pages.auto_expand_admin_tree ? 'expanded' : ''
-          classes.push ['toggle', expanded_class]
+          classes.push 'toggle', expanded_class
           title =  ::I18n.t('expand_collapse', scope: 'refinery.admin.pages')
         end
 

pages/app/views/refinery/admin/pages/_form.html.erb

@@ -12,7 +12,7 @@
 
   <%= render 'form_fields_after_title', f: f %>
 
-  <div class='field'>
+  <div class="field">
     <%= render 'form_page_parts', f: f %>
   </div>
 
@@ -64,7 +64,7 @@
             action: prev_url,
             target: prev_target
           });
-        }, 100);
+        }, 500);
       });
     });
   </script>

pages/spec/system/refinery/admin/pages_spec.rb

@@ -19,7 +19,7 @@ def switch_page_form_locale(locale)
   end
 
   # make sure that the locale change has taken effect
-  expect(page).to have_selector("#switch_locale_picker li.selected a##{locale.downcase}")
+  expect(page).to have_selector("#switch_locale_picker a.selected##{locale.downcase}")
 end
 
 module Refinery
@@ -93,9 +93,14 @@ module Admin
           let!(:location) { locations.children.create title: 'New York' }
 
           context "with auto expand option turned off" do
-            before do
-              allow(Refinery::Pages).to receive(:auto_expand_admin_tree).and_return(false)
+            around do |example|
+              old_value = Refinery::Pages.auto_expand_admin_tree
+              Refinery::Pages.auto_expand_admin_tree = false
+              example.run
+              Refinery::Pages.auto_expand_admin_tree = old_value
+            end
 
+            before do
               visit refinery.admin_pages_path
             end
 
@@ -110,25 +115,30 @@ module Admin
             end
 
             it "expands children", js: true do
-              find("#page_#{company.id} .item .toggle").click
+              find("#page_#{company.id} .icon.toggle").click
 
               expect(page).to have_content(team.title)
               expect(page).to have_content(locations.title)
             end
 
             it "expands children when nested multiple levels deep", js: true do
-              find("#page_#{company.id} .item .toggle").click
-              find("#page_#{locations.id} .item .toggle").click
+              find("#page_#{company.id} .icon.toggle").click
+              find("#page_#{locations.id} .icon.toggle").click
 
               expect(page).to have_content("New York")
             end
           end
 
           context "with auto expand option turned on" do
-            before do
-              allow(Refinery::Pages).to receive(:auto_expand_admin_tree).and_return(true)
+            around do |example|
+              old_value = Refinery::Pages.auto_expand_admin_tree
+              Refinery::Pages.auto_expand_admin_tree = true
               Rails.cache.clear
+              example.run
+              Refinery::Pages.auto_expand_admin_tree = old_value
+            end
 
+            before do
               visit refinery.admin_pages_path
             end
 
@@ -359,6 +369,9 @@ module Admin
 
             window.close
 
+            # Wait for setTimeout to restore form action/target after preview
+            sleep 0.6
+
             click_button "Save & continue editing"
             expect(page).to have_content("'Save this' was successfully updated")
           end
@@ -459,9 +472,14 @@ module Admin
       end
 
       context "with translations" do
-        before do
-          allow(Refinery::I18n).to receive(:frontend_locales).and_return([:en, :ru])
+        around do |example|
+          old_locales = Refinery::I18n.config.frontend_locales
+          Refinery::I18n.config.frontend_locales = [:en, :ru]
+          example.run
+          Refinery::I18n.config.frontend_locales = old_locales
+        end
 
+        before do
           # Create a home page in both locales (needed to test menus)
           home_page = Mobility.with_locale(:en) do
             Page.create title: 'Home',
@@ -529,8 +547,6 @@ module Admin
           let(:ru_page_title) { 'Новости' }
           let(:ru_page_slug_encoded) { '%D0%BD%D0%BE%D0%B2%D0%BE%D1%81%D1%82%D0%B8' }
           let!(:news_page) do
-            allow(Refinery::I18n).to receive(:frontend_locales).and_return([:en, :ru])
-
             _page = Mobility.with_locale(:en) {
               Page.create title: en_page_title
             }
@@ -698,8 +714,11 @@ module Admin
       end
 
       describe "new page part" do
-        before do
-          allow(Refinery::Pages).to receive(:new_page_parts).and_return(true)
+        around do |example|
+          old_value = Refinery::Pages.new_page_parts
+          Refinery::Pages.new_page_parts = true
+          example.run
+          Refinery::Pages.new_page_parts = old_value
         end
 
         it "adds new page part", js: true do