refinerycms-pages 2.0.5 → 2.0.6

data/app/controllers/refinery/admin/pages_dialogs_controller.rb

@@ -4,6 +4,8 @@ module Refinery
   module Admin
     class PagesDialogsController < ::Refinery::Admin::DialogsController
 
+      helper :'refinery/admin/pages'
+
       def link_to
         # Get the switch_local variable to determine the locale we're currently editing
         # Set up Globalize with our current locale
@@ -51,6 +53,7 @@ module Refinery
       end
 
       def test_url
+        result = 'failure'
         begin
           timeout(5) do
             unless params[:url].blank?
@@ -59,19 +62,16 @@ module Refinery
                 url.host = URI.parse(request.url).host
               end
 
-              result = case Net::HTTP.get_response(url)
-                when Net::HTTPSuccess, Net::HTTPRedirection
-                  'success'
-                else
-                  'failure'
-                end
-
-              render :json => {:result => result}
+              result = 'success' if [Net::HTTPSuccess, Net::HTTPRedirection].
+                                      include? Net::HTTP.get_response(url)
             end
           end
+
         rescue
-          render :json => {:result => 'failure'}
+          # the result is already set to failure.
         end
+
+        render :json => {:result => result}
       end
 
       def test_email

data/app/controllers/refinery/pages_controller.rb

@@ -1,6 +1,7 @@
 module Refinery
   class PagesController < ::ApplicationController
     before_filter :find_page, :set_canonical, :except => [:preview]
+    before_filter :find_page_for_preview, :only => [:preview]
 
     # Save whole Page after delivery
     after_filter { |c| c.write_cache? }
@@ -39,14 +40,6 @@ module Refinery
     end
 
     def preview
-      if page(fallback_to_404 = false)
-        # Preview existing pages
-        @page.attributes = params[:page]
-      elsif params[:page]
-        # Preview a non-persisted page
-        @page = Page.new(params[:page])
-      end
-
       render_with_templates?(:action => :show)
     end
 
@@ -72,6 +65,16 @@ module Refinery
       page.children.order('lft ASC').live.first
     end
 
+    def find_page_for_preview
+      if page(fallback_to_404 = false)
+        # Preview existing pages
+        @page.attributes = view_context.sanitize_hash params[:page]
+      elsif params[:page]
+        # Preview a non-persisted page
+        @page = Page.new params[:page]
+      end
+    end
+
     def find_page(fallback_to_404 = true)
       @page ||= case action_name
                 when "home"

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

@@ -22,6 +22,31 @@ module Refinery
           { :selected => Refinery::Pages.send("#{template_type}_whitelist").first }
         end
       end
+
+      # In the admin area we use a slightly different title
+      # to inform the which pages are draft or hidden pages
+      def page_meta_information(page)
+        meta_information = ActiveSupport::SafeBuffer.new
+        meta_information << content_tag(:span, :class => 'label') do
+          ::I18n.t('hidden', :scope => 'refinery.admin.pages.page')
+        end unless page.show_in_menu?
+
+        meta_information << content_tag(:span, :class => 'label notice') do
+          ::I18n.t('draft', :scope => 'refinery.admin.pages.page')
+        end if page.draft?
+
+        meta_information.html_safe
+      end
+
+      # We show the title from the next available locale
+      # if there is no title for the current locale
+      def page_title_with_translations(page)
+        if page.title.present?
+          page.title
+        else
+          page.translations.detect {|t| t.title.present?}.title
+        end
+      end
     end
   end
 end

data/app/helpers/refinery/pages_helper.rb

@@ -1,4 +1,20 @@
 module Refinery
   module PagesHelper
+
+    def sanitize_hash(input_hash)
+      sanitized_hash = HashWithIndifferentAccess.new
+      input_hash.each do |key, value|
+        # ActionPack's sanitize calls html_safe on sanitized input.
+        sanitized_hash[key] = if value.respond_to? :html_safe
+          sanitize value
+        elsif value.respond_to? :each
+          sanitize_hash value
+        else
+          value
+        end
+      end
+      sanitized_hash
+    end
+
   end
 end

data/app/models/refinery/page.rb

@@ -1,9 +1,10 @@
 # Encoding: utf-8
+require 'refinerycms-core'
 require 'acts_as_indexed'
 require 'friendly_id'
 
 module Refinery
-  class Page < Refinery::Core::BaseModel
+  class Page < Core::BaseModel
     extend FriendlyId
 
     # when collecting the pages path how is each of the pages seperated?
@@ -25,9 +26,8 @@ module Refinery
     attr_accessible :id, :deletable, :link_url, :menu_match, :meta_keywords,
                     :skip_to_first_child, :position, :show_in_menu, :draft,
                     :parts_attributes, :browser_title, :meta_description,
-                    :parent_id, :menu_title, :created_at, :updated_at,
-                    :page_id, :layout_template, :view_template, :custom_slug,
-                    :slug
+                    :parent_id, :menu_title, :page_id, :layout_template,
+                    :view_template, :custom_slug, :slug
 
     attr_accessor :locale, :page_title, :page_menu_title # to hold temporarily
     validates :title, :presence => true
@@ -95,7 +95,7 @@ module Refinery
         end
       end
 
-      # Finds a page using its title.  This method is necessary because pages
+      # Finds pages by their title.  This method is necessary because pages
       # are translated which means the title attribute does not exist on the
       # pages table thus requiring us to find the attribute on the translations table
       # and then join to the pages table again to return the associated record.
@@ -103,9 +103,9 @@ module Refinery
         with_globalize(:title => title)
       end
 
-      # Finds a page using its slug.  See by_title
+      # Finds pages by their slug.  See by_title
       def by_slug(slug, conditions={})
-        locales = Refinery.i18n_enabled? ? Refinery::I18n.frontend_locales : ::I18n.locale
+        locales = Refinery.i18n_enabled? ? Refinery::I18n.frontend_locales.map(&:to_s) : ::I18n.locale.to_s
         with_globalize({ :locale => locales, :slug => slug }.merge(conditions))
       end
 
@@ -148,7 +148,7 @@ module Refinery
 
       # Wrap up the logic of finding the pages based on the translations table.
       def with_globalize(conditions = {})
-        conditions = {:locale => ::Globalize.locale}.merge(conditions)
+        conditions = {:locale => ::Globalize.locale.to_s}.merge(conditions)
         globalized_conditions = {}
         conditions.keys.each do |key|
           if (translated_attribute_names.map(&:to_s) | %w(locale)).include?(key.to_s)
@@ -199,7 +199,13 @@ module Refinery
     # Consists of:
     #   * The default locale's translated slug
     def canonical
-      Globalize.with_locale(::Refinery::I18n.default_frontend_locale){ url }
+      Globalize.with_locale(Refinery.i18n_enabled? && Refinery::I18n.default_frontend_locale || ::I18n.locale) { url }
+    end
+
+    # The canonical slug for this particular page.
+    # This is the slug for the default frontend locale.
+    def canonical_slug
+      Globalize.with_locale(Refinery.i18n_enabled? && Refinery::I18n.default_frontend_locale || ::I18n.locale) { slug }
     end
 
     # Returns in cascading order: custom_slug or menu_title or title depending on
@@ -219,7 +225,7 @@ module Refinery
     # This ensures that they are in the correct 0,1,2,3,4... etc order.
     def reposition_parts!
       reload.parts.each_with_index do |part, index|
-        part.update_attribute(:position, index)
+        part.update_attributes :position => index
       end
     end
 
@@ -414,21 +420,6 @@ module Refinery
       end
     end
 
-    # In the admin area we use a slightly different title to inform the which pages are draft or hidden pages
-    # We show the title from the next available locale if there is no title for the current locale
-    def title_with_meta
-      if self.title.present?
-        title = [self.title]
-      else
-        title = [self.translations.detect {|t| t.title.present?}.title]
-      end
-
-      title << "<em>(#{::I18n.t('hidden', :scope => 'refinery.admin.pages.page')})</em>" unless show_in_menu?
-      title << "<em>(#{::I18n.t('draft', :scope => 'refinery.admin.pages.page')})</em>" if draft?
-
-      title.join(' ')
-    end
-
     # Used to index all the content on this page so it can be easily searched.
     def all_page_part_content
       parts.map(&:body).join(" ")

data/app/models/refinery/page_part.rb

@@ -1,8 +1,7 @@
 module Refinery
   class PagePart < Refinery::Core::BaseModel
 
-    attr_accessible :title, :content, :position, :body, :created_at,
-                    :updated_at, :refinery_page_id
+    attr_accessible :title, :content, :position, :body, :refinery_page_id
     belongs_to :page, :foreign_key => :refinery_page_id
 
     validates :title, :presence => true

data/app/views/refinery/admin/pages/_page.html.erb

@@ -7,7 +7,8 @@
     <% end %>
 
     <span class='title <%= 'toggle' if page.children.present? %>'>
-      <%= page.title_with_meta.html_safe %>
+      <%= page_title_with_translations page %>
+      <%= page_meta_information page %>
     </span>
     <% if Refinery.i18n_enabled? and Refinery::I18n.frontend_locales.many? %>
       <span class='locales'>
@@ -36,7 +37,12 @@
                   refinery.admin_page_path(page.uncached_nested_url),
                   :class => "cancel confirm-delete",
                   :title => t('delete', :scope => 'refinery.admin.pages'),
-                  :confirm => t('message', :scope => 'refinery.admin.delete', :title => page.title_with_meta.gsub(/\ ?<em>.*<\/em>/, "")),
+                  :data => {
+                    :confirm => t('message',
+                      :scope => 'refinery.admin.delete',
+                      :title => page_title_with_translations(page)
+                    )
+                  },
                   :method => :delete if page.deletable? %>
     </span>
   </div>

data/app/views/refinery/admin/pages_dialogs/_page_link.html.erb

@@ -6,11 +6,14 @@
   page_link_url = "#{[request.protocol, request.host_with_port].join}#{page_link_url}" if Refinery::Pages.absolute_page_links
 -%>
 <li class='clearfix<%= " child#{child}" if child %><%= " linked" if linked%>' id="<%= dom_id(page_link) -%>">
-  <%= link_to page_link.title_with_meta.html_safe, page_link_url, {
+  <%= link_to page_link_url, {
                 :title => t('.link_to_this_page'),
                 :rel => page_link.title,
                 :class => 'page_link'
-              }.merge(link_args) %>
+              }.merge(link_args) do %>
+    <%= page_title_with_translations page_link %>
+    <%= page_meta_information page_link %>
+  <% end %>
 </li>
 <%= render :partial => 'page_link',
            :collection => page_link.children,

data/config/locales/cs.yml

@@ -55,7 +55,7 @@ cs:
           save_as_draft: Uložit jako pracovní verzi
           skip_to_first_child: Přeskočit na první dceřinou stránku
           skip_to_first_child_label: Přesměruje návštěvníka na první dceřinou stránku.
-          skip_to_first_child_help: Tato stránka se nezobrazí, místo toho bude odkaz na ní přesměrován na její první dceřinou stránku. To se může hodit pro seskupování stránkek.
+          skip_to_first_child_help: Tato stránka se nezobrazí, místo toho bude odkaz na ní přesměrován na její první dceřinou stránku. To se může hodit pro seskupování stránek.
           link_url: Přesměrovat tuto stránku na jiný web nebo stránku.
           link_url_help: Pokud chcete aby po kliknutí na odkaz na tutu stránku byl návštěvník přesměrován na jiný web, vložte adresu (např. http://google.com), jinak nechte prázdné
           parent_page_help: Můžete umístit tuto stránku v hierarchii pod jinou stránku. Pokud nevyberete nic, bude tato stránka umístěna na první úrovni.

data/config/locales/en.yml

@@ -49,6 +49,7 @@ en:
           create_content_section: Add content section
           delete_content_section: Delete content section
           reorder_content_section: Reorder content sections
+          reorder_content_section_done: I'm done reordering the content sections
         form_advanced_options:
           toggle_advanced_options: Access meta tag settings and menu options
           page_options: Page Options

data/config/locales/fr.yml

@@ -34,10 +34,15 @@ fr:
       pages:
         delete: Supprimer définitivement cette page
         edit: Modifier cette page
+        new: Ajouter une nouvelle sous-page
+        expand_collapse: Développer ou réduire les sous-pages
         page:
           view_live_html: Voir cette page<br/><em>(Ouvre une nouvelle fenêtre)</em>
           hidden: caché
           draft: brouillon
+        form:
+          preview: Prévisualiser
+          preview_changes: Prévisualiser vos changements avant de les appliquer
         form_new_page_parts:
           title: Titre
         form_page_parts:
@@ -48,6 +53,7 @@ fr:
           page_options: Page Options
           parent_page: Page parente
           advanced_options: Options avancées
+          menu_title: Titre dans le menu
           custom_title: Titre personnalisé
           show_in_menu_title: Placer dans le menu
           show_in_menu_description: Placer cette page dans le menu du site
@@ -59,6 +65,7 @@ fr:
           link_url: Cette page redirige le visiteur vers un autre site ou une autre page
           link_url_help: "Si vous souhaitez que cette page mène à un autre site internet ou à une autre page lorsque l'on clique dessus dans le menu, entrez une URL '(par exemple http://google.com)'. Sinon laissez ce champ vide."
           parent_page_help: "Vous pouvez placer une page sous une autre page en la sélectionnant dans la liste. Si vous voulez que cette page soit une page parente, laissez ce champ vide."
+          menu_title_help: Si vous voulez que le menu affiche un titre différent que celui qui sera affiché sur la page, entrez-le ici.
           custom_title_help: "Si vous voulez que la page ait un titre différent de celui qui apparaît dans le menu, sélectionnez &apos;Text&apos; et entrez-le ici."
         actions:
           create_new_page: Créer une nouvelle page

data/config/locales/pl.yml

@@ -18,14 +18,14 @@ pl:
             location: Lokacja
             new_window: Nowe okno
             new_window_label: Zaznacz tę kratkę aby link otwierał się w nowym oknie.
-            not_sure: Nie wiesz, co wstawić w pole powyżej?
+            not_sure: 'Nie wiesz, co wstawić w pole powyżej?'
             step1: Znajdź stronę w sieci do której chcesz linkować.
             step2: Wklej adres z pola adresu Twojej przeglądarki i wklej go do pola powyżej.
           email_address:
             tab_name: Adres e-mail
             subject_line_optional: Opcjonalny temat
             body_optional: Opcjonalna treść
-            not_sure: Nie wiesz, co wstawić w pola powyżej?
+            not_sure: 'Nie wiesz, co wstawić w pola powyżej?'
             step1_html: Wpisz lub wklej (np. z książki adresowej) adres e-mail do którego ma prowadzić link w pole '<stron>Adres e-mail</strong> powyżej.
             step2_html: Użyj pola '<strong>Temat</strong> aby wiadomość miała wstępnie określony temat.
             step3_html: Użyj pola '<strong>Treść</strong> aby wiadomość miała wstępnie określoną treść.
@@ -52,15 +52,17 @@ pl:
           custom_title: Inny tytuł
           show_in_menu_title: Pokaż w menu
           show_in_menu_description: Wyświetl tę stronę w menu witryny
-          show_in_menu_help: Odznacz tę kratkę aby usunąć tę stronę z menu witryny. To może być przydatne jeżeli chcesz linkować do tej strony, ale nie chcesz aby była widoczna w menu.
+          show_in_menu_help: 'Odznacz tę kratkę aby usunąć tę stronę z menu witryny. To może być przydatne jeżeli chcesz linkować do tej strony, ale nie chcesz aby była widoczna w menu.'
           save_as_draft: Zapisz jako szkic
           skip_to_first_child: Pomiń stronę najwyższego poziomu
           skip_to_first_child_label: Przekieruj odwiedzających do pierwszej strony potomnej.
-          skip_to_first_child_help: Ta opcja sprawia, że ta strona kieruje do pierwszej strony pod nią. To może być przydatne przy grupowaniu stron razem.
+          skip_to_first_child_help: 'Ta opcja sprawia, że ta strona kieruje do pierwszej strony pod nią. To może być przydatne przy grupowaniu stron razem.'
           link_url: Przekieruj tę stronę do innej strony lub witryny
-          link_url_help: Jeżeli chcesz, aby ta strona prowadziła do innej strony lub witryny kiedy klikniesz ją w menu, wpisz tu adres URL, na przykład http://google.com.W innym wypadku pozostaw to pole pustym.
+          link_url_help: 'Jeżeli chcesz, aby ta strona prowadziła do innej strony lub witryny kiedy klikniesz ją w menu, wpisz tu adres URL, na przykład http://google.com.W innym wypadku pozostaw to pole pustym.'
           parent_page_help: Możesz umieścić tę stronę pod inną wybierając stronę nadrzędną z listy. Jeżeli ta strona ma być stroną najwyższego poziomu pozostaw to pole pustym.
-          custom_title_help: Jeżeli chcesz aby ta strona miała inny tytuł niż ten widoczny w menu wybierz &apos;Tekst&apos; i wpisz go tutaj.
+          custom_title_help: 'Jeżeli chcesz aby ta strona miała inny tytuł niż ten widoczny w menu wybierz &apos;Tekst&apos; i wpisz go tutaj.'
+          menu_title: Tytuł w menu
+          menu_title_help: 'Jeżeli chcesz aby ta strona miała inny tytuł w menu wybierz &apos;Tekst&apos; i wpisz go tutaj.'
         actions:
           create_new_page: Dodaj nową stronę
           reorder_pages: Zmień kolejność stron

data/lib/refinery/pages/instance_methods.rb

@@ -10,7 +10,11 @@ module Refinery
       def error_404(exception=nil)
         if (@page = ::Refinery::Page.where(:menu_match => "^/404$").includes(:parts).first).present?
           # render the application's custom 404 page with layout and meta.
-          render :template => '/refinery/pages/show', :formats => [:html], :status => 404
+          if self.respond_to? :render_with_templates?
+            render_with_templates? :status => 404
+          else
+            render :template => '/refinery/pages/show', :formats => [:html], :status => 404
+          end
           return false
         else
           super

data/spec/helpers/refinery/pages/admin/pages_helper_spec.rb

@@ -49,6 +49,55 @@ module Refinery
           end
         end
       end
+
+      describe "#page_meta_information" do
+        let(:page) { FactoryGirl.build(:page) }
+
+        context "when show_in_menu is false" do
+          it "adds 'hidden' label" do
+            page.show_in_menu = false
+
+            helper.page_meta_information(page).should eq("<span class=\"label\">hidden</span>")
+          end
+        end
+
+        context "when draft is true" do
+          it "adds 'draft' label" do
+            page.draft = true
+
+            helper.page_meta_information(page).should eq("<span class=\"label notice\">draft</span>")
+          end
+        end
+      end
+
+      describe "#page_title_with_translations" do
+        let(:page) { FactoryGirl.build(:page) }
+
+        before do
+          Globalize.with_locale(:en) do
+            page.title = "draft"
+            page.save!
+          end
+
+          Globalize.with_locale(:lv) do
+            page.title = "melnraksts"
+            page.save!
+          end
+        end
+
+        context "when title is present" do
+          it "returns it" do
+            helper.page_title_with_translations(page).should eq("draft")
+          end
+        end
+
+        context "when title for current locale isn't available" do
+          it "returns existing title from translations" do
+            Refinery::Page::Translation.where(:locale => :en).first.delete
+            helper.page_title_with_translations(page).should eq("melnraksts")
+          end
+        end
+      end
     end
   end
-end 
+end

data/spec/helpers/refinery/pages/pages_helper_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+module Refinery
+  describe PagesHelper do
+    describe "#sanitize_hash" do
+      context "when hash value responds to html_safe" do
+        it "returns hash with sanitized values" do
+          hash = { :key => "hack<script>" }
+          helper.sanitize_hash(hash).should eq("key" => "hack")
+        end
+      end
+
+      context "when hash value is an array" do
+        it "returns hash with sanitized values" do
+          hash = { :key => { :x => "hack<script>", :y => "malware<script>" } }
+          helper.sanitize_hash(hash).should eq("key"=>{"x"=>"hack", "y"=>"malware"})
+        end
+      end
+
+      context "when string value doesn't repsond to html_safe" do
+        it "returns hash with value untouched" do
+          String.any_instance.stub(:respond_to?).and_return(false)
+
+          hash = { :key => "hack<script>" }
+          helper.sanitize_hash(hash).should eq("key"=>"hack<script>")
+        end
+      end
+    end
+  end
+end

data/spec/lib/generators/refinery/pages/pages_generator_spec.rb

@@ -7,7 +7,7 @@ module Refinery
     include GeneratorSpec::TestCase
     destination File.expand_path("../../../../tmp", __FILE__)
 
-    before(:each) do
+    before do
       prepare_destination
       run_generator
     end

data/spec/models/refinery/page_spec.rb

@@ -104,7 +104,7 @@ module Refinery
       end
     end
 
-    describe '#canonical' do
+    context 'canonicals' do
       before do
         ::Refinery::I18n.stub(:default_frontend_locale).and_return(:en)
         ::Refinery::I18n.stub(:frontend_locales).and_return([Refinery::I18n.default_frontend_locale, :ru])
@@ -115,26 +115,53 @@ module Refinery
       let(:page_title)  { 'team' }
       let(:child_title) { 'about' }
       let(:ru_page_title) { 'Новости' }
-      let!(:default_canonical) {
-        Globalize.with_locale(::Refinery::I18n.default_frontend_locale) {
-          page.canonical
+
+      describe '#canonical' do
+        let!(:default_canonical) {
+          Globalize.with_locale(::Refinery::I18n.default_frontend_locale) {
+            page.canonical
+          }
         }
-      }
 
-      specify 'page returns itself' do
-        page.canonical.should == page.url
-      end
+        specify 'page returns itself' do
+          page.canonical.should == page.url
+        end
 
-      specify 'default canonical matches page#canonical' do
-        default_canonical.should == page.canonical
+        specify 'default canonical matches page#canonical' do
+          default_canonical.should == page.canonical
+        end
+
+        specify 'translated page returns master page' do
+          Globalize.with_locale(:ru) do
+            page.title = ru_page_title
+            page.save
+
+            page.canonical.should == default_canonical
+          end
+        end
       end
 
-      specify 'translated page returns master page' do
-        Globalize.with_locale(:ru) do
-          page.title = ru_page_title
-          page.save
+      describe '#canonical_slug' do
+        let!(:default_canonical_slug) {
+          Globalize.with_locale(::Refinery::I18n.default_frontend_locale) {
+            page.canonical_slug
+          }
+        }
+        specify 'page returns its own slug' do
+          page.canonical_slug.should == page.slug
+        end
+
+        specify 'default canonical_slug matches page#canonical' do
+          default_canonical_slug.should == page.canonical_slug
+        end
+
+        specify "translated page returns master page's slug'" do
+          Globalize.with_locale(:ru) do
+            page.title = ru_page_title
+            page.save
 
-          page.canonical.should == default_canonical
+            page.canonical_slug.should == default_canonical_slug
+          end
         end
       end
     end
@@ -221,8 +248,8 @@ module Refinery
       it 'reposition correctly' do
         page.save
 
-        page.parts.first.update_attribute(:position, 6)
-        page.parts.last.update_attribute(:position, 4)
+        page.parts.first.update_attributes :position => 6
+        page.parts.last.update_attributes :position => 4
 
         page.parts.first.position.should == 6
         page.parts.last.position.should == 4
@@ -452,7 +479,7 @@ module Refinery
       let(:child_title) { 'about' }
       let(:created_root_about) { subject.class.create!(:title => child_title, :deletable => true) }
 
-      before(:each) do
+      before do
         # Ensure pages are created.
         created_child
         created_root_about

data/spec/requests/refinery/admin/pages_spec.rb

@@ -42,7 +42,7 @@ module Refinery
         end
 
         context "when some pages exist" do
-          before(:each) { 2.times { FactoryGirl.create(:page) } }
+          before { 2.times { |i| Page.create :title => "Page #{i}" } }
 
           it "shows reorder pages link" do
             visit refinery.admin_pages_path
@@ -55,18 +55,14 @@ module Refinery
         end
 
         context "when sub pages exist" do
-          let(:company) { FactoryGirl.create(:page, :title => "Our Company") }
-          let(:team) { FactoryGirl.create(:page, :parent => company, :title => 'Our Team') }
-          let(:locations) { FactoryGirl.create(:page, :parent => company, :title => 'Our Locations')}
-          let(:location) { FactoryGirl.create(:page, :parent => locations, :title => 'New York') }
+          let!(:company) { Page.create :title => 'Our Company' }
+          let!(:team) { company.children.create :title => 'Our Team' }
+          let!(:locations) { company.children.create :title => 'Our Locations' }
+          let!(:location) { locations.children.create :title => 'New York' }
 
           context "with auto expand option turned off" do
             before do
-              Refinery::Pages.auto_expand_admin_tree = false
-
-              # Pre load pages
-              location
-              team
+              Refinery::Pages.stub(:auto_expand_admin_tree).and_return(false)
 
               visit refinery.admin_pages_path
             end
@@ -81,14 +77,14 @@ module Refinery
               page.should_not have_content(locations.title)
             end
 
-            it "expands children", :js => true do
-              find(".toggle").click
+            it "expands children", :js do
+              find("#page_#{company.id} .toggle").click
 
               page.should have_content(team.title)
               page.should have_content(locations.title)
             end
 
-            it "expands children when nested mutliple levels deep", :js => true do
+            it "expands children when nested mutliple levels deep", :js do
               find("#page_#{company.id} .toggle").click
               find("#page_#{locations.id} .toggle").click
 
@@ -98,11 +94,7 @@ module Refinery
 
           context "with auto expand option turned on" do
             before do
-              Refinery::Pages.auto_expand_admin_tree = true
-
-              # Pre load pages
-              location
-              team
+              Refinery::Pages.stub(:auto_expand_admin_tree).and_return(true)
 
               visit refinery.admin_pages_path
             end
@@ -151,7 +143,7 @@ module Refinery
       end
 
       describe "edit/update" do
-        before(:each) { FactoryGirl.create(:page, :title => "Update me") }
+        before { Page.create :title => "Update me" }
 
         it "updates page" do
           visit refinery.admin_pages_path
@@ -169,9 +161,9 @@ module Refinery
 
       describe 'Previewing' do
         context "an existing page" do
-          before(:each) { FactoryGirl.create(:page, :title => 'Preview me') }
+          before { Page.create :title => 'Preview me' }
 
-          it 'will show the preview changes in a new window', :js => true do
+          it 'will show the preview changes in a new window', :js do
             visit refinery.admin_pages_path
 
             find('a[tooltip^=Edit]').click
@@ -181,7 +173,7 @@ module Refinery
             new_window_should_have_content("Some changes I'm unsure what they will look like")
           end
 
-          it 'will not save the preview changes', :js => true do
+          it 'will not save the preview changes', :js do
             visit refinery.admin_pages_path
 
             find('a[tooltip^=Edit]').click
@@ -196,7 +188,7 @@ module Refinery
         end
 
         context 'a brand new page' do
-          it "will not save when just previewing", :js => true do
+          it "will not save when just previewing", :js do
             visit refinery.admin_pages_path
 
             click_link "Add new page"
@@ -210,10 +202,10 @@ module Refinery
         end
 
         context 'a nested page' do
-          let!(:parent_page) { FactoryGirl.create(:page, :title => "Our Parent Page") }
-          let!(:nested_page) { FactoryGirl.create(:page, :parent => @parent, :title => 'Preview Me') }
+          let!(:parent_page) { Page.create :title => "Our Parent Page" }
+          let!(:nested_page) { parent_page.children.create :title => 'Preview Me' }
 
-          it "works like an un-nested page", :js => true do
+          it "works like an un-nested page", :js do
             visit refinery.admin_pages_path
 
             within "#page_#{nested_page.id}" do
@@ -230,7 +222,7 @@ module Refinery
 
       describe "destroy" do
         context "when page can be deleted" do
-          before(:each) { FactoryGirl.create(:page, :title => "Delete me") }
+          before { Page.create :title => "Delete me" }
 
           it "will show delete button" do
             visit refinery.admin_pages_path
@@ -244,7 +236,7 @@ module Refinery
         end
 
         context "when page can't be deleted" do
-          before(:each) { FactoryGirl.create(:page, :title => "Indestructible", :deletable => false) }
+          before { Page.create :title => "Indestructible", :deletable => false }
 
           it "wont show delete button" do
             visit refinery.admin_pages_path
@@ -256,7 +248,7 @@ module Refinery
       end
 
       context "duplicate page titles" do
-        before(:each) { FactoryGirl.create(:page, :title => "I was here first") }
+        before { Page.create :title => "I was here first" }
 
         it "will append nr to url path" do
           visit refinery.new_admin_page_path
@@ -269,7 +261,7 @@ module Refinery
       end
 
       context "with translations" do
-        before(:each) do
+        before do
           Refinery::I18n.stub(:frontend_locales).and_return([:en, :ru])
 
           # Create a home page in both locales (needed to test menus)
@@ -339,7 +331,7 @@ module Refinery
             Refinery::I18n.stub(:frontend_locales).and_return([:en, :ru])
 
             _page = Globalize.with_locale(:en) {
-              FactoryGirl.create(:page, :title => en_page_title)
+              Page.create :title => en_page_title
             }
             Globalize.with_locale(:ru) do
               _page.title = ru_page_title
@@ -418,14 +410,14 @@ module Refinery
         describe "add a page with title only for secondary locale" do
           let(:ru_page) {
             Globalize.with_locale(:ru) {
-              FactoryGirl.create(:page, :title => ru_page_title)
+              Page.create :title => ru_page_title
             }
           }
           let(:ru_page_id) { ru_page.id }
           let(:ru_page_title) { 'Новости' }
           let(:ru_page_slug) { 'новости' }
 
-          before(:each) do
+          before do
             ru_page
             visit refinery.admin_pages_path
           end
@@ -487,7 +479,7 @@ module Refinery
         end
       end
 
-      describe "new page part", :js => true do
+      describe "new page part", :js do
         before do
           Refinery::Pages.stub(:new_page_parts).and_return(true)
         end
@@ -510,15 +502,16 @@ module Refinery
       describe 'advanced options' do
         describe 'view and layout templates' do
           context 'when parent page has templates set' do
-            before(:each) do
+            before do
               Refinery::Pages.stub(:use_layout_templates).and_return(true)
               Refinery::Pages.stub(:use_view_templates).and_return(true)
               Refinery::Pages.stub(:layout_template_whitelist).and_return(['abc', 'refinery'])
               Refinery::Pages.stub(:view_template_whitelist).and_return(['abc', 'refinery'])
               Refinery::Pages.stub(:valid_templates).and_return(['abc', 'refinery'])
-              parent_page = FactoryGirl.create(:page, :view_template => 'refinery',
-                                                      :layout_template => 'refinery')
-              parent_page.children.create(FactoryGirl.attributes_for(:page))
+              parent_page = Page.create :title => 'Parent Page',
+                                        :view_template => 'refinery',
+                                        :layout_template => 'refinery'
+              parent_page.children.create :title => 'Child Page'
             end
 
             specify 'sub page should inherit them' do
@@ -558,9 +551,9 @@ module Refinery
       end
 
       describe "add page to second locale" do
-        before(:each) do
+        before do
           Refinery::I18n.stub(:frontend_locales).and_return([:en, :lv])
-          FactoryGirl.create(:page)
+          Page.create :title => 'First Page'
         end
 
         it "succeeds" do
@@ -580,7 +573,7 @@ module Refinery
       end
 
       describe "delete page from main locale" do
-        before(:each) { FactoryGirl.create(:page) }
+        before { Page.create :title => 'Default Page' }
 
         it "doesn't succeed" do
           visit refinery.admin_pages_path
@@ -615,7 +608,7 @@ module Refinery
 
         describe "adding page link" do
           describe "with relative urls" do
-            before(:each) { Refinery::Pages.absolute_page_links = false }
+            before { Refinery::Pages.absolute_page_links = false }
 
             it "shows Russian pages if we're editing the Russian locale" do
               visit 'refinery/pages_dialogs/link_to?wymeditor=true&switch_locale=ru'
@@ -633,7 +626,7 @@ module Refinery
           end
 
           describe "with absolute urls" do
-            before(:each) { Refinery::Pages.absolute_page_links = true }
+            before { Refinery::Pages.absolute_page_links = true }
 
             it "shows Russian pages if we're editing the Russian locale" do
               visit 'refinery/pages_dialogs/link_to?wymeditor=true&switch_locale=ru'
@@ -652,7 +645,7 @@ module Refinery
 
           # see https://github.com/resolve/refinerycms/pull/1583
           context "when switching locales" do
-            specify "dialog has correct links", :js => true do
+            specify "dialog has correct links", :js do
               visit refinery.edit_admin_page_path(about_page)
 
               click_link "Add Link"

data/spec/requests/refinery/pages_spec.rb

@@ -3,10 +3,10 @@ require 'spec_helper'
 
 module Refinery
   describe 'page frontend' do
-    let(:home_page) { FactoryGirl.create(:page, :title => 'Home', :link_url => '/') }
-    let(:about_page) { FactoryGirl.create(:page, :title => 'About') }
-    let(:draft_page) { FactoryGirl.create(:page, :title => 'Draft', :draft => true) }
-    before(:each) do
+    let(:home_page) { Page.create :title => 'Home', :link_url => '/' }
+    let(:about_page) { Page.create :title => 'About' }
+    let(:draft_page) { Page.create :title => 'Draft', :draft => true }
+    before do
       # So that we can use Refinery.
       Refinery::PagesController.any_instance.stub(:refinery_user_required?).and_return(false)
 
@@ -65,7 +65,7 @@ module Refinery
     end
 
     describe 'title set (without menu title or browser title)' do
-      before(:each) { visit '/about' }
+      before { visit '/about' }
 
       it "shows title at the top of the page" do
         find("#body_content_title").text.should == about_page.title
@@ -81,9 +81,9 @@ module Refinery
     end
 
     describe 'when menu_title is' do
-      let(:page_mt) { FactoryGirl.create(:page, :title => 'Company News') }
+      let(:page_mt) { Page.create :title => 'Company News' }
 
-      before(:each) do
+      before do
         Refinery::Page.stub(:fast_menu).and_return([page_mt])
       end
 
@@ -125,8 +125,10 @@ module Refinery
     end
 
     describe 'when browser_title is set' do
-      let(:page_bt) { FactoryGirl.create(:page, :title => 'About Us', :browser_title => 'About Our Company') }
-      before(:each) do
+      let(:page_bt) {
+        Page.create :title => 'About Us', :browser_title => 'About Our Company'
+      }
+      before do
         Refinery::Page.stub(:fast_menu).and_return([page_bt])
       end
       it 'should have the browser_title in the title tag' do
@@ -144,8 +146,8 @@ module Refinery
     end
 
     describe 'custom_slug' do
-      let(:page_cs) { FactoryGirl.create(:page, :title => 'About Us') }
-      before(:each) do
+      let(:page_cs) { Page.create :title => 'About Us' }
+      before do
         Refinery::Page.stub(:fast_menu).and_return([page_cs])
       end
 
@@ -206,11 +208,9 @@ module Refinery
     end
 
     describe "submenu page" do
-      let(:submenu_page) {
-        FactoryGirl.create(:page, :title => 'Sample Submenu', :parent_id => about_page.id)
-      }
+      let(:submenu_page) { about_page.children.create :title => 'Sample Submenu' }
 
-      before(:each) do
+      before do
         Refinery::Page.stub(:fast_menu).and_return([home_page, submenu_page, about_page.reload].sort_by(&:lft))
       end
 
@@ -225,8 +225,8 @@ module Refinery
     end
 
     describe "special characters title" do
-      let(:special_page) { FactoryGirl.create(:page, :title => 'ä ö ü spéciål chåråctÉrs') }
-      before(:each) do
+      let(:special_page) { Page.create :title => 'ä ö ü spéciål chåråctÉrs' }
+      before do
         Refinery::Page.stub(:fast_menu).and_return([home_page, about_page, special_page])
       end
 
@@ -242,11 +242,14 @@ module Refinery
     end
 
     describe "special characters title as submenu page" do
-      let(:special_page) { FactoryGirl.create(:page, :title => 'ä ö ü spéciål chåråctÉrs',
-                                                     :parent_id => about_page.id) }
+      let(:special_page) {
+        about_page.children.create :title => 'ä ö ü spéciål chåråctÉrs'
+      }
 
-      before(:each) do
-        Refinery::Page.stub(:fast_menu).and_return([home_page, special_page, about_page.reload].sort_by(&:lft))
+      before do
+        Refinery::Page.stub(:fast_menu).and_return(
+          [home_page, special_page, about_page.reload].sort_by &:lft
+        )
       end
 
       it "succeeds" do
@@ -261,9 +264,9 @@ module Refinery
     end
 
     describe "hidden page" do
-      let(:hidden_page) { FactoryGirl.create(:page, :title => "Hidden", :show_in_menu => false) }
+      let(:hidden_page) { Page.create :title => "Hidden", :show_in_menu => false }
 
-      before(:each) do
+      before do
         Refinery::Page.stub(:fast_menu).and_return([home_page, about_page])
       end
 
@@ -280,8 +283,8 @@ module Refinery
     end
 
     describe "skip to first child" do
-      let(:child_page) { FactoryGirl.create(:page, :title => "Child Page", :parent_id => about_page.id)}
-      before(:each) do
+      let(:child_page) { about_page.children.create :title => "Child Page" }
+      before do
        child_page
        about = about_page.reload
        about.skip_to_first_child = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-pages
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -54,7 +54,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -62,7 +62,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: babosa
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +172,7 @@ files:
 - spec/factories/pages.rb
 - spec/helpers/refinery/pages/admin/pages_helper_spec.rb
 - spec/helpers/refinery/pages/content_pages_helper_spec.rb
+- spec/helpers/refinery/pages/pages_helper_spec.rb
 - spec/lib/generators/refinery/pages/pages_generator_spec.rb
 - spec/lib/pages/content_page_presenter_spec.rb
 - spec/lib/pages/content_presenter_spec.rb
@@ -197,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -121281082121598221
+      hash: -2478798985618301281
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -206,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -121281082121598221
+      hash: -2478798985618301281
 requirements: []
 rubyforge_project: refinerycms
 rubygems_version: 1.8.22
@@ -218,6 +219,7 @@ test_files:
 - spec/factories/pages.rb
 - spec/helpers/refinery/pages/admin/pages_helper_spec.rb
 - spec/helpers/refinery/pages/content_pages_helper_spec.rb
+- spec/helpers/refinery/pages/pages_helper_spec.rb
 - spec/lib/generators/refinery/pages/pages_generator_spec.rb
 - spec/lib/pages/content_page_presenter_spec.rb
 - spec/lib/pages/content_presenter_spec.rb