refinerycms-pages 2.1.5 → 3.0.0

data/lib/refinery/pages/finder.rb

@@ -0,0 +1,179 @@
+module Refinery
+  module Pages
+    class Finder
+      def self.by_path(path)
+        FinderByPath.new(path).find
+      end
+
+      def self.by_path_or_id(path, id)
+        FinderByPathOrId.new(path, id).find
+      end
+
+      def self.by_title(title)
+        FinderByTitle.new(title).find
+      end
+
+      def self.by_slug(slug, conditions = {})
+        FinderBySlug.new(slug, conditions).find
+      end
+
+      def self.with_globalize(conditions = {})
+        Finder.new(conditions).find
+      end
+
+      def initialize(conditions)
+        @conditions = conditions
+      end
+
+      def find
+        with_globalize
+      end
+
+      def with_globalize
+        globalized_conditions = {:locale => ::Globalize.locale.to_s}.merge(conditions)
+        translations_conditions = translations_conditions(globalized_conditions)
+
+        # A join implies readonly which we don't really want.
+        Page.where(globalized_conditions).
+             joins(:translations).
+             where(translations_conditions).
+             readonly(false)
+      end
+
+      private
+      attr_accessor :conditions
+
+      def translated_attributes
+        Page.translated_attribute_names.map(&:to_s) | %w(locale)
+      end
+
+      def translations_conditions(original_conditions)
+        translations_conditions = {}
+        original_conditions.keys.each do |key|
+          if translated_attributes.include? key.to_s
+            translations_conditions["#{Page.translation_class.table_name}.#{key}"] = original_conditions.delete(key)
+          end
+        end
+        translations_conditions
+      end
+
+    end
+
+    class FinderByTitle < Finder
+      def initialize(title)
+        @title = title
+        @conditions = default_conditions
+      end
+
+      def default_conditions
+        { :title => title }
+      end
+
+      private
+      attr_accessor :title
+    end
+
+    class FinderBySlug < Finder
+      def initialize(slug, conditions)
+        @slug = slug
+        @conditions = default_conditions.merge(conditions)
+      end
+
+      def default_conditions
+        {
+          :locale => Refinery::I18n.frontend_locales.map(&:to_s),
+          :slug => slug
+        }
+      end
+
+      private
+      attr_accessor :slug
+    end
+
+    class FinderByPath
+      def initialize(path)
+        @path = path
+      end
+
+      def find
+        if slugs_scoped_by_parent?
+          FinderByScopedPath.new(path).find
+        else
+          FinderByUnscopedPath.new(path).find
+        end
+      end
+
+      private
+      attr_accessor :path
+
+      def slugs_scoped_by_parent?
+        ::Refinery::Pages.scope_slug_by_parent
+      end
+
+      def by_slug(slug_path, conditions = {})
+        Finder.by_slug(slug_path, conditions)
+      end
+    end
+
+    class FinderByScopedPath < FinderByPath
+      def find
+        # With slugs scoped to the parent page we need to find a page by its full path.
+        # For example with about/example we would need to find 'about' and then its child
+        # called 'example' otherwise it may clash with another page called /example.
+        page = parent_page
+        while page && path_segments.any? do
+          page = next_page(page)
+        end
+        page
+      end
+
+      private
+
+      def path_segments
+        @path_segments ||= path.split('/').select(&:present?)
+      end
+
+      def parent_page
+        parent_page_segment = path_segments.shift
+        if parent_page_segment.friendly_id?
+          by_slug(parent_page_segment, :parent_id => nil).first
+        else
+          Page.find(parent_page_segment)
+        end
+      end
+
+      def next_page(page)
+        slug_or_id = path_segments.shift
+        page.children.by_slug(slug_or_id).first || page.children.find(slug_or_id)
+      end
+    end
+
+    class FinderByUnscopedPath < FinderByPath
+      def find
+        by_slug(path).first
+      end
+    end
+
+    class FinderByPathOrId
+      def initialize(path, id)
+        @path = path
+        @id = id
+      end
+
+      def find
+        if path.present?
+          if path.friendly_id?
+            FinderByPath.new(path).find
+          else
+            Page.friendly.find(path)
+          end
+        elsif id.present?
+          Page.friendly.find(id)
+        end
+      end
+
+      private
+      attr_accessor :id, :path
+    end
+  end
+end

data/lib/refinery/pages/instance_methods.rb

@@ -2,12 +2,7 @@ module Refinery
   module Pages
     module InstanceMethods
 
-      def self.included(base)
-        base.send :helper_method, :refinery_menu_pages
-        base.send :alias_method_chain, :render, :presenters
-      end
-
-      def error_404(exception=nil)
+      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.
           if self.respond_to? :render_with_templates?, true
@@ -21,15 +16,9 @@ module Refinery
         end
       end
 
-      # Compiles the default menu.
-      def refinery_menu_pages
-        Menu.new Page.fast_menu
-      end
-
-    protected
-      def render_with_presenters(*args)
+      def render(*args)
         present @page unless admin? || @meta
-        render_without_presenters(*args)
+        super
       end
 
     end

data/lib/refinery/pages/tab.rb

@@ -21,8 +21,8 @@ module Refinery
 
         yield tab
 
-        raise "A tab MUST have a name!: #{tab.inspect}" if tab.name.blank?
-        raise "A tab MUST have a partial!: #{tab.inspect}" if tab.partial.blank?
+        raise ArgumentError, "A tab MUST have a name!: #{tab.inspect}" if tab.name.blank?
+        raise ArgumentError, "A tab MUST have a partial!: #{tab.inspect}" if tab.partial.blank?
 
         tab.templates = %w[all] if tab.templates.blank?
         tab.templates = Array(tab.templates)

data/lib/refinery/pages/types.rb

@@ -7,7 +7,7 @@ module Refinery
       end
 
       def find_by_name(name)
-        detect {|type| type.name.to_s.downcase == name.to_s.downcase}
+        detect { |type| type.name.to_s.downcase == name.to_s.downcase}
       end
 
       class << self

data/lib/refinery/pages/url.rb

@@ -9,13 +9,25 @@ module Refinery
 
         def url
           current_url = page.link_url
-
-          if current_url =~ %r{^/} &&
+          # Don't mess around with absolute URLs, just accept them.  Examples:
+          #
+          # * https://github.com/parndt
+          # * http://github.com/parndt
+          # * //github.com/parndt
+          return current_url if current_url =~ %r{\A(https?:)?//}
+
+          if Refinery::I18n.url_filter_enabled? && current_url =~ %r{^/} &&
             Refinery::I18n.current_frontend_locale != Refinery::I18n.default_frontend_locale
             current_url = "/#{Refinery::I18n.current_frontend_locale}#{current_url}"
           end
 
-          current_url
+          # See https://github.com/refinery/refinerycms/issues/2740
+          if current_url == '/'
+            Refinery::Core.mounted_path
+          else
+            [Refinery::Core.mounted_path, current_url.sub(%r{\A/}, '')].
+              join("/").sub("//", "/").sub(%r{/\z}, '')
+          end
         end
       end
 

data/license.md

@@ -1,6 +1,6 @@
 # MIT License
  
-Copyright (c) 2005-2013 [Resolve Digital](http://www.resolvedigital.com)
+Copyright (c) 2005-2015 [Resolve Digital](http://resolve.digital)
  
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/refinerycms-pages.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.version           = version
   s.summary           = %q{Pages extension for Refinery CMS}
   s.description       = %q{The default content extension of Refinery CMS. This extension handles the administration and display of user-editable pages.}
-  s.email             = %q{info@refinerycms.com}
+  s.email             = %q{refinerycms@p.arndt.io}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
   s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski']
@@ -19,10 +19,13 @@ Gem::Specification.new do |s|
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
-  s.add_dependency 'friendly_id',                 '~> 4.0.9'
-  s.add_dependency 'globalize',                   '~> 3.1.0'
-  s.add_dependency 'awesome_nested_set',          '~> 2.1.3'
-  s.add_dependency 'seo_meta',                    '~> 1.4.0'
+  s.add_dependency 'friendly_id',                 '~> 5.1.0'
+  s.add_dependency 'globalize',                   ['>= 4.0.0', '< 5.2']
+  s.add_dependency 'awesome_nested_set',          '~> 3.0.0'
+  s.add_dependency 'seo_meta',                    '~> 2.0.0.rc.1'
   s.add_dependency 'refinerycms-core',            version
   s.add_dependency 'babosa',                      '!= 0.3.6'
+  s.add_dependency 'speakingurl-rails',           '~> 1.1.2'
+
+  s.required_ruby_version = Refinery::Version.required_ruby_version
 end

data/spec/controllers/refinery/admin/pages_controller_spec.rb

@@ -0,0 +1,53 @@
+require "spec_helper"
+
+module Refinery
+  module Admin
+    describe PagesController, type: :controller do
+
+      describe "valid templates" do
+        before do
+          File.write(Rails.root.join('tmp', 'abc.html.erb'), '')
+          File.write(Rails.root.join('tmp', 'def.rb'), '')
+          File.write(Rails.root.join('tmp', 'xyz.html.erb'), '')
+          File.write(Rails.root.join('tmp', 'odd.file.name'), '')
+
+          allow(Refinery::Pages).to receive(:use_layout_templates).and_return(true)
+          allow(Refinery::Pages).to receive(:layout_template_whitelist).and_return(['abc', 'def'])
+          allow(Refinery::Pages).to receive(:layout_templates_pattern).and_return(['tmp', '*html*'])
+          allow(Refinery::Pages).to receive(:view_templates_pattern).and_return(['tmp', '*.{rb,erb}'])
+        end
+
+        after do
+          File.delete(Rails.root.join('tmp', 'abc.html.erb'))
+          File.delete(Rails.root.join('tmp', 'def.rb'))
+          File.delete(Rails.root.join('tmp', 'xyz.html.erb'))
+          File.delete(Rails.root.join('tmp', 'odd.file.name'))
+        end
+
+        describe 'layout templates' do
+          it 'returns the names of all files which fit the pattern and are in the whitelist' do
+            expect(subject.send(:valid_layout_templates)).to include('abc')
+          end
+
+          it 'does not return files whose names are not in the whitelist' do
+             expect(subject.send(:valid_layout_templates)).not_to include('xyz')
+          end
+
+          it 'does not return files that do not fit the pattern' do
+            expect(subject.send(:valid_layout_templates)).not_to include('def')
+          end
+        end
+
+        describe "valid view templates" do
+          it 'returns the names of all files which fit the pattern' do
+            expect(subject.send(:valid_view_templates)).to include('xyz','def', 'abc')
+          end
+
+          it "does not return names which don't fit the pattern" do
+            expect(subject.send(:valid_view_templates)).not_to include('odd')
+           end
+         end
+       end
+    end
+  end
+end

data/spec/controllers/refinery/pages_controller_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 module Refinery
-  describe PagesController do
+  describe PagesController, :type => :controller do
     before do
       FactoryGirl.create(:page, :link_url => "/")
       FactoryGirl.create(:page, :title => "test")

data/spec/factories/pages.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
   factory :page, :class => Refinery::Page do
-    sequence(:title, "a") {|n| "Test title #{n}" }
+    sequence(:title, "a") { |n| "Test title #{n}" }
   end
 end

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

@@ -1,29 +1,27 @@
 # encoding: utf-8
 require "spec_helper"
 
-def new_window_should_have_content(content)
-  new_window = page.driver.browser.window_handles.last
-  page.within_window new_window do
-    page.should have_content(content)
+def expect_window_with_content(content, window: windows.last)
+  page.within_window window do
+    expect(page).to have_content(content)
   end
 end
 
-def new_window_should_not_have_content(content)
-  new_window = page.driver.browser.window_handles.last
-  page.within_window new_window do
-    page.should_not have_content(content)
+def expect_window_without_content(content, window: windows.last)
+  page.within_window window do
+    expect(page).not_to have_content(content)
   end
 end
 
 module Refinery
   module Admin
-    describe "Pages" do
-      refinery_login_with :refinery_user
+    describe "Pages", :type => :feature do
+      refinery_login
 
       context "when no pages" do
         it "invites to create one" do
           visit refinery.admin_pages_path
-          page.should have_content(%q{There are no pages yet. Click "Add new page" to add your first page.})
+          expect(page).to have_content(%q{There are no pages yet. Click "Add new page" to add your first page.})
         end
       end
 
@@ -32,8 +30,8 @@ module Refinery
           visit refinery.admin_pages_path
 
           within "#actions" do
-            page.should have_content("Add new page")
-            page.should have_selector("a[href='/refinery/pages/new']")
+            expect(page).to have_content("Add new page")
+            expect(page).to have_selector("a[href='/#{Refinery::Core.backend_route}/pages/new']")
           end
         end
 
@@ -42,21 +40,38 @@ module Refinery
             visit refinery.admin_pages_path
 
             within "#actions" do
-              page.should have_no_content("Reorder pages")
-              page.should have_no_selector("a[href='/refinery/pages']")
+              expect(page).to have_no_content("Reorder pages")
+              expect(page).to have_no_selector("a[href='/#{Refinery::Core.backend_route}/pages']")
             end
           end
         end
 
         context "when some pages exist" do
-          before { 2.times { |i| Page.create :title => "Page #{i}" } }
+          let!(:page_0) { Page.create! title: 'Page 0' }
+          let!(:page_1) { Page.create! title: 'Page 1' }
 
           it "shows reorder pages link" do
             visit refinery.admin_pages_path
 
             within "#actions" do
-              page.should have_content("Reorder pages")
-              page.should have_selector("a[href='/refinery/pages']")
+              expect(page).to have_content("Reorder pages")
+              expect(page).to have_selector("a[href='/#{Refinery::Core.backend_route}/pages']")
+            end
+          end
+
+          context "when reordering pages" do
+            let(:reorder_url) { "/#{Refinery::Core.backend_route}/pages/update_positions" }
+            before do
+              visit refinery.admin_pages_path
+              page.driver.post(reorder_url, {
+                'ul[0][0][id]' => "page_#{page_1.id}",
+                'ul[0][1][id]' => "page_#{page_0.id}",
+              })
+            end
+
+            it "shows pages in the new order" do
+              visit refinery.admin_pages_path
+              expect(page.body).to match(/Page 1.*Page 0/m)
             end
           end
         end
@@ -69,71 +84,69 @@ module Refinery
 
           context "with auto expand option turned off" do
             before do
-              Refinery::Pages.stub(:auto_expand_admin_tree).and_return(false)
+              allow(Refinery::Pages).to receive(:auto_expand_admin_tree).and_return(false)
 
               visit refinery.admin_pages_path
             end
 
             it "show parent page" do
 
-              page.should have_content(company.title)
+              expect(page).to have_content(company.title)
             end
 
             it "doesn't show children" do
-              page.should_not have_content(team.title)
-              page.should_not have_content(locations.title)
+              expect(page).not_to have_content(team.title)
+              expect(page).not_to have_content(locations.title)
             end
 
             it "expands children", :js do
               find("#page_#{company.id} .title.toggle").click
 
-              page.should have_content(team.title)
-              page.should have_content(locations.title)
+              expect(page).to have_content(team.title)
+              expect(page).to have_content(locations.title)
             end
 
-            it "expands children when nested mutliple levels deep", :js do
+            it "expands children when nested multiple levels deep", :js do
               find("#page_#{company.id} .title.toggle").click
               find("#page_#{locations.id} .title.toggle").click
 
-              page.should have_content("New York")
+              expect(page).to have_content("New York")
             end
           end
 
           context "with auto expand option turned on" do
             before do
-              Refinery::Pages.stub(:auto_expand_admin_tree).and_return(true)
+              allow(Refinery::Pages).to receive(:auto_expand_admin_tree).and_return(true)
 
               visit refinery.admin_pages_path
             end
 
             it "shows children" do
-              page.should have_content(team.title)
-              page.should have_content(locations.title)
+              expect(page).to have_content(team.title)
+              expect(page).to have_content(locations.title)
             end
           end
         end
       end
 
       describe "new/create" do
-        it "allows to create page" do
+        it "Creates a page", js:true do
           visit refinery.admin_pages_path
 
-          click_link "Add new page"
+          find('a', text: 'Add new page').trigger(:click)
 
           fill_in "Title", :with => "My first page"
-          click_button "Save"
-
-          page.should have_content("'My first page' was successfully added.")
+          expect { click_button "Save" }.to change(Refinery::Page, :count).from(0).to(1)
 
-          page.body.should =~ /Remove this page forever/
-          page.body.should =~ /Edit this page/
-          page.body.should =~ %r{/refinery/pages/my-first-page/edit}
-          page.body.should =~ /Add a new child page/
-          page.body.should =~ %r{/refinery/pages/new\?parent_id=}
-          page.body.should =~ /View this page live/
-          page.body.should =~ %r{href="/my-first-page"}
+          expect(page).to have_content("'My first page' was successfully added.")
 
-          Refinery::Page.count.should == 1
+          expect(page.body).to match(/Remove this page forever/)
+          expect(page.body).to match(/Edit this page/)
+          expect(page.body).to match(%r{/#{Refinery::Core.backend_route}/pages/my-first-page/edit})
+          expect(page.body).to match(/Add a new child page/)
+          expect(page.body).to match(%r{/#{Refinery::Core.backend_route}/pages/new\?parent_id=})
+          expect(page.body).to match(/View this page live/)
+          expect(page.body).to match(%r{href="/my-first-page"})
         end
 
         it "includes menu title field", :js => true do
@@ -141,24 +154,32 @@ module Refinery
 
           fill_in "Title", :with => "My first page"
 
-          click_link "toggle_advanced_options"
+          find('#toggle_advanced_options').trigger(:click)
 
           fill_in "Menu title", :with => "The first page"
 
-          click_button "Save"
+          # For some reason the first click doesn't always work?
+          begin
+            click_button "Save"
+            sleep 0.1
+            redo unless Refinery::Page.any?
+          end
 
-          page.should have_content("'My first page' was successfully added.")
-          page.body.should =~ %r{/pages/the-first-page}
+          expect(page).to have_content("'My first page' was successfully added.")
+          expect(page.body).to match(%r{/pages/the-first-page})
         end
 
-        it "shows error if title is blank" do
+        it "allows to easily create nested page" do
+          parent_page = Page.create! :title => "Rails 4"
+
           visit refinery.admin_pages_path
 
-          click_link "Add new page"
+          find("a[href='#{refinery.new_admin_page_path(:parent_id => parent_page.id)}']").click
 
+          fill_in "Title", :with => "Parent page"
           click_button "Save"
 
-          page.should have_content("Title can't be blank")
+          expect(page).to have_content("'Parent page' was successfully added.")
         end
       end
 
@@ -167,17 +188,17 @@ module Refinery
           Page.create :title => "Update me"
 
           visit refinery.admin_pages_path
-          page.should have_content("Update me")
+          expect(page).to have_content("Update me")
         end
 
         context 'when saving and returning to index' do
-          it "updates page" do
-            click_link "Edit this page"
+          it "updates page", js:true do
+            find('a[tooltip="Edit this page"]').trigger(:click)
 
             fill_in "Title", :with => "Updated"
             find("#submit_button").click
 
-            page.should have_content("'Updated' was successfully updated.")
+            expect(page).to have_content("'Updated' was successfully updated.")
           end
         end
 
@@ -192,101 +213,129 @@ module Refinery
           end
 
           it "updates page", :js do
-            page.should have_content("'Updated' was successfully updated.")
+            expect(page).to have_content("'Updated' was successfully updated.")
           end
 
           # Regression test for https://github.com/refinery/refinerycms/issues/1892
           context 'when saving to exit (a second time)' do
             it 'updates page', :js do
               find("#submit_button").click
-              page.should have_content("'Updated' was successfully updated.")
+              expect(page).to have_content("'Updated' was successfully updated.")
             end
           end
         end
       end
 
-      describe 'Previewing' do
+      describe 'Previewing', :js do
+        let(:preview_content) { "Some changes I'm unsure what they will look like".freeze }
         context "an existing page" do
           before { Page.create :title => 'Preview me' }
 
-          it 'will show the preview changes in a new window', :js do
+          it 'will show the preview changes in a new window' do
             visit refinery.admin_pages_path
 
             find('a[tooltip^=Edit]').click
-            fill_in "Title", :with => "Some changes I'm unsure what they will look like"
-            click_button "Preview"
+            fill_in "Title", with: preview_content
+            window = window_opened_by do
+              click_button "Preview"
+            end
 
-            new_window_should_have_content("Some changes I'm unsure what they will look like")
+            expect_window_with_content(preview_content, window: window)
+
+            window.close
           end
 
-          it 'will not show the site bar', :js do
+          it 'will not show the site bar' do
             visit refinery.admin_pages_path
 
             find('a[tooltip^=Edit]').click
-            fill_in "Title", :with => "Some changes I'm unsure what they will look like"
-            click_button "Preview"
+            fill_in "Title", with: preview_content
+            window = window_opened_by do
+              click_button "Preview"
+            end
 
-            new_window_should_not_have_content(
-              ::I18n.t('switch_to_website', :scope => 'refinery.site_bar')
-            )
-            new_window_should_not_have_content(
-              ::I18n.t('switch_to_website_editor', :scope => 'refinery.site_bar')
-            )
+            expect_window_without_content(
+              ::I18n.t('switch_to_website', scope: 'refinery.site_bar'),
+              window: window
+              )
+            expect_window_without_content(
+              ::I18n.t('switch_to_website_editor', scope: 'refinery.site_bar'),
+              window: window
+              )
+
+            window.close
           end
 
-          it 'will not save the preview changes', :js do
+          it 'will not save the preview changes' do
             visit refinery.admin_pages_path
 
             find('a[tooltip^=Edit]').click
-            fill_in "Title", :with => "Some changes I'm unsure what they will look like"
-            click_button "Preview"
+            fill_in "Title", with: preview_content
+            window = window_opened_by do
+              click_button "Preview"
+            end
+
+            expect_window_with_content(
+              preview_content,
+              window: window
+              )
 
-            new_window_should_have_content("Some changes I'm unsure what they will look like")
+            window.close
 
-            Page.by_title("Some changes I'm unsure what they will look like").should be_empty
+            expect(Page.by_title(preview_content)).to be_empty
           end
 
           # Regression test for previewing after save-and_continue
-          it 'will show the preview in a new window after save-and-continue', :js do
+          it 'will show the preview in a new window after save-and-continue' do
             visit refinery.admin_pages_path
 
             find('a[tooltip^=Edit]').click
             fill_in "Title", :with => "Save this"
             click_button "Save & continue editing"
-            page.should have_content("'Save this' was successfully updated")
+            expect(page).to have_content("'Save this' was successfully updated")
 
-            click_button "Preview"
+            window = window_opened_by do
+              click_button "Preview"
+            end
 
-            new_window_should_have_content("Save this")
-            new_window_should_not_have_content(
-              ::I18n.t('switch_to_website', :scope => 'refinery.site_bar')
-            )
+            expect_window_with_content("Save this", window: window)
+            expect_window_without_content(
+              ::I18n.t('switch_to_website', :scope => 'refinery.site_bar'),
+              window: window
+              )
+
+            window.close
           end
 
-          it 'will show pages with inherited templates', :js do
+          it 'will show pages with inherited templates', js:true do
             visit refinery.admin_pages_path
 
             find('a[tooltip^=Edit]').click
             fill_in 'Title', :with => 'Searchable'
-            click_link 'Advanced options'
+            find('#toggle_advanced_options').trigger(:click)
             select 'Searchable', :from => 'View template'
-            click_button 'Preview'
-
-            new_window_should_have_content('Form application/search_form')
+            Timeout::timeout(5) do
+              click_button 'Preview'
+              sleep 0.1 and redo unless windows.many?
+              expect_window_with_content('Form application/search_form')
+            end
           end
         end
 
         context 'a brand new page' do
-          it "will not save when just previewing", :js do
+          it "will not save when just previewing", js:true do
             visit refinery.admin_pages_path
 
-            click_link "Add new page"
+            find('a', text: 'Add new page').trigger(:click)
             fill_in "Title", :with => "My first page"
-            click_button "Preview"
+            window = window_opened_by do
+              click_button "Preview"
+            end
 
-            new_window_should_have_content("My first page")
+            expect_window_with_content("My first page", window: window)
 
-            Page.count.should == 0
+            expect(Page.count).to eq(0)
+            window.close
           end
         end
 
@@ -294,33 +343,35 @@ module Refinery
           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 do
+          it "works like an un-nested page" do
             visit refinery.admin_pages_path
 
             within "#page_#{nested_page.id}" do
               find('a[tooltip^=Edit]').click
             end
 
-            fill_in "Title", :with => "Some changes I'm unsure what they will look like"
-            click_button "Preview"
+            fill_in "Title", with: preview_content
+            window = window_opened_by do
+              click_button "Preview"
+            end
 
-            new_window_should_have_content("Some changes I'm unsure what they will look like")
+            expect_window_with_content(preview_content)
           end
         end
       end
 
       describe "destroy" do
-        context "when page can be deleted" do
+        context "when page can be deleted", js:true do
           before { Page.create :title => "Delete me" }
 
           it "will show delete button" do
             visit refinery.admin_pages_path
 
-            click_link "Remove this page forever"
+            find('a[tooltip="Remove this page forever"]').trigger(:click)
 
-            page.should have_content("'Delete me' was successfully removed.")
+            expect(page).to have_content("'Delete me' was successfully removed.")
 
-            Refinery::Page.count.should == 0
+            expect(Refinery::Page.count).to eq(0)
           end
         end
 
@@ -330,8 +381,8 @@ module Refinery
           it "wont show delete button" do
             visit refinery.admin_pages_path
 
-            page.should have_no_content("Remove this page forever")
-            page.should have_no_selector("a[href='/refinery/pages/indestructible']")
+            expect(page).to have_no_content("Remove this page forever")
+            expect(page).to have_no_selector("a[href='/#{Refinery::Core.backend_route}/pages/indestructible']")
           end
         end
       end
@@ -345,19 +396,19 @@ module Refinery
           fill_in "Title", :with => "I was here first"
           click_button "Save"
 
-          Refinery::Page.last.url[:path].should == ["i-was-here-first--2"]
+          expect(Refinery::Page.last.url[:path].first).to match(%r{\Ai-was-here-first-.+?})
         end
       end
 
       context "with translations" do
         before do
-          Refinery::I18n.stub(:frontend_locales).and_return([:en, :ru])
+          allow(Refinery::I18n).to receive(:frontend_locales).and_return([:en, :ru])
 
           # Create a home page in both locales (needed to test menus)
           home_page = Globalize.with_locale(:en) do
             Page.create :title => 'Home',
-                        :link_url => '/',
-                        :menu_match => "^/$"
+            :link_url => '/',
+            :menu_match => "^/$"
           end
 
           Globalize.with_locale(:ru) do
@@ -366,40 +417,42 @@ module Refinery
           end
         end
 
-        describe "add a page with title for default locale" do
+        describe "add a page with title for default locale", js:true do
           before do
             visit refinery.admin_pages_path
-            click_link "Add new page"
+            find('a', text: "Add new page").trigger(:click)
             fill_in "Title", :with => "News"
             click_button "Save"
           end
 
-          it "succeeds" do
-            page.should have_content("'News' was successfully added.")
-            Refinery::Page.count.should == 2
+          it "creates a page" do
+            expect(page).to have_content("'News' was successfully added.")
+            expect(Refinery::Page.count).to eq(2)
           end
 
           it "shows locale flag for page" do
             p = ::Refinery::Page.by_slug('news').first
-            within "#page_#{p.id}" do
-              page.should have_css("img[src='/assets/refinery/icons/flags/en.png']")
+            within "#page_#{p.id} .locales" do
+              expect(page).to have_css('.locale_marker')
+              expect(page).to have_content('EN')
             end
           end
 
           it "shows title in the admin menu" do
             p = ::Refinery::Page.by_slug('news').first
             within "#page_#{p.id}" do
-              page.should have_content('News')
-              page.find_link('Edit this page')[:href].should include('news')
+              expect(page).to have_content('News')
+              expect(page.find('a[tooltip="Edit this page"]')[:href]).to include('news')
             end
           end
 
           it "shows in frontend menu for 'en' locale" do
+            # page.driver.debug
             visit "/"
 
             within "#menu" do
-              page.should have_content('News')
-              page.should have_selector("a[href='/news']")
+              expect(page).to have_content('News')
+              expect(page).to have_selector("a[href='/news']")
             end
           end
 
@@ -408,18 +461,18 @@ module Refinery
 
             within "#menu" do
               # we should only have the home page in the menu
-              page.should have_css('li', :count => 1)
+              expect(page).to have_css('li', :count => 1)
             end
           end
         end
 
-        describe "add a page with title for both locales" do
+        describe "a page with two locales", js:true do
           let(:en_page_title) { 'News' }
           let(:en_page_slug) { 'news' }
           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
-            Refinery::I18n.stub(:frontend_locales).and_return([:en, :ru])
+            allow(Refinery::I18n).to receive(:frontend_locales).and_return([:en, :ru])
 
             _page = Globalize.with_locale(:en) {
               Page.create :title => en_page_title
@@ -432,44 +485,45 @@ module Refinery
             _page
           end
 
-          it "succeeds" do
+          it "can have a title for each locale" do
             news_page.destroy!
             visit refinery.admin_pages_path
 
-            click_link "Add new page"
+            find('a', text:"Add new page").trigger(:click)
             within "#switch_locale_picker" do
-              click_link "Ru"
+              find('a', text: "RU").trigger(:click)
             end
             fill_in "Title", :with => ru_page_title
             click_button "Save"
 
-            within "#page_#{Page.last.id}" do
-              click_link "Application_edit"
+            within "#page_#{Page.last.id} .actions" do
+              find("a[href^='/#{Refinery::Core.backend_route}/pages/#{ru_page_slug_encoded}/edit']").click
             end
             within "#switch_locale_picker" do
-              click_link "En"
+              find('a', text: "EN").trigger(:click)
             end
             fill_in "Title", :with => en_page_title
             find("#submit_button").click
 
-            page.should have_content("'#{en_page_title}' was successfully updated.")
-            Refinery::Page.count.should == 2
+            expect(page).to have_content("'#{en_page_title}' was successfully updated.")
+            expect(Refinery::Page.count).to eq(2)
           end
 
-          it "shows both locale flags for page" do
+          it "is shown with both locales in the index" do
             visit refinery.admin_pages_path
 
-            within "#page_#{news_page.id}" do
-              page.should have_css("img[src='/assets/refinery/icons/flags/en.png']")
-              page.should have_css("img[src='/assets/refinery/icons/flags/ru.png']")
+            within "#page_#{news_page.id} .locales" do
+              expect(page).to have_css('.locale_marker', count: 2)
+              expect(page).to have_content('EN')
+              expect(page).to have_content('RU')
             end
           end
 
-          it "shows title in admin menu in current admin locale" do
+          it "shows title in current admin locale in the index" do
             visit refinery.admin_pages_path
 
             within "#page_#{news_page.id}" do
-              page.should have_content(en_page_title)
+              expect(page).to have_content(en_page_title)
             end
           end
 
@@ -477,7 +531,7 @@ module Refinery
             visit refinery.admin_pages_path
 
             within "#page_#{news_page.id}" do
-              page.find_link('Edit this page')[:href].should include(en_page_slug)
+              expect(page.find('a[tooltip="Edit this page"]')[:href]).to include(en_page_slug)
             end
           end
 
@@ -485,7 +539,7 @@ module Refinery
             visit "/"
 
             within "#menu" do
-              page.find_link(news_page.title)[:href].should include(en_page_slug)
+              expect(page.find_link(news_page.title)[:href]).to include(en_page_slug)
             end
           end
 
@@ -493,12 +547,12 @@ module Refinery
             visit "/ru"
 
             within "#menu" do
-              page.find_link(ru_page_title)[:href].should include(ru_page_slug_encoded)
+              expect(page.find_link(ru_page_title)[:href]).to include(ru_page_slug_encoded)
             end
           end
         end
 
-        describe "add a page with title only for secondary locale" do
+        describe "add a page with title only for secondary locale", js:true do
           let(:ru_page) {
             Globalize.with_locale(:ru) {
               Page.create :title => ru_page_title
@@ -513,40 +567,40 @@ module Refinery
             visit refinery.admin_pages_path
           end
 
-          it "succeeds" do
+          it "lets you add a Russian title without an English title" do
             ru_page.destroy!
-            click_link "Add new page"
+            find('a', text: 'Add new page').trigger(:click)
             within "#switch_locale_picker" do
-              click_link "Ru"
+              find('a', text: "RU").trigger(:click)
             end
             fill_in "Title", :with => ru_page_title
             click_button "Save"
 
-            page.should have_content("'#{ru_page_title}' was successfully added.")
-            Refinery::Page.count.should == 2
+            expect(page).to have_content("'#{ru_page_title}' was successfully added.")
+            expect(Refinery::Page.count).to eq(2)
           end
 
-          it "shows locale flag for page" do
+          it "shows locale indicator for page" do
             within "#page_#{ru_page_id}" do
-              page.should have_css("img[src='/assets/refinery/icons/flags/ru.png']")
+              expect(page).to have_selector('.locale_marker', text: 'RU')
             end
           end
 
-          it "doesn't show locale flag for primary locale" do
+          it "doesn't show locale indicator for primary locale" do
             within "#page_#{ru_page_id}" do
-              page.should_not have_css("img[src='/assets/refinery/icons/flags/en.png']")
+              expect(page).to_not have_selector('.locale_marker', text: 'EN')
             end
           end
 
           it "shows title in the admin menu" do
             within "#page_#{ru_page_id}" do
-              page.should have_content(ru_page_title)
+              expect(page).to have_content(ru_page_title)
             end
           end
 
           it "uses slug in admin" do
             within "#page_#{ru_page_id}" do
-              page.find_link('Edit this page')[:href].should include(ru_page_slug_encoded)
+              expect(page.find('a[tooltip="Edit this page"]')[:href]).to include(ru_page_slug_encoded)
             end
           end
 
@@ -554,8 +608,8 @@ module Refinery
             visit "/ru"
 
             within "#menu" do
-              page.should have_content(ru_page_title)
-              page.should have_selector("a[href*='/#{ru_page_slug_encoded}']")
+              expect(page).to have_content(ru_page_title)
+              expect(page).to have_selector("a[href*='/#{ru_page_slug_encoded}']")
             end
           end
 
@@ -564,26 +618,25 @@ module Refinery
 
             within "#menu" do
               # we should only have the home page in the menu
-              page.should have_css('li', :count => 1)
+              expect(page).to have_css('li', :count => 1)
             end
           end
 
-          context "when page is a child page" do
+          context "when page is a child page", js: true do
             it 'succeeds' do
               ru_page.destroy!
               parent_page = Page.create(:title => "Parent page")
               sub_page = Globalize.with_locale(:ru) {
-                Page.create :title => ru_page_title
                 Page.create :title => ru_page_title, :parent_id => parent_page.id
               }
-              sub_page.parent.should == parent_page
+              expect(sub_page.parent).to eq(parent_page)
               visit refinery.admin_pages_path
               within "#page_#{sub_page.id}" do
-                click_link "Application_edit"
+                find("a.edit_icon").trigger(:click)
               end
               fill_in "Title", :with => ru_page_title
               click_button "Save"
-              page.should have_content("'#{ru_page_title}' was successfully updated")
+              expect(page).to have_content("'#{ru_page_title}' was successfully updated")
             end
           end
         end
@@ -591,12 +644,12 @@ module Refinery
 
       describe "new page part", :js do
         before do
-          Refinery::Pages.stub(:new_page_parts).and_return(true)
+          allow(Refinery::Pages).to receive(:new_page_parts).and_return(true)
         end
 
         it "adds new page part" do
           visit refinery.new_admin_page_path
-          click_link "add_page_part"
+          find("#add_page_part").trigger(:click)
 
           within "#new_page_part_dialog" do
             fill_in "new_page_part_title", :with => "testy"
@@ -604,7 +657,7 @@ module Refinery
           end
 
           within "#page_parts" do
-            page.should have_content("testy")
+            expect(page).to have_content("testy")
           end
         end
       end
@@ -613,31 +666,34 @@ module Refinery
         let!(:some_page) { Page.create! :title => "Some Page" }
 
         before do
-          some_page.parts.create! :title => "First Part", :position => 1
-          some_page.parts.create! :title => "Second Part", :position => 2
-          some_page.parts.create! :title => "Third Part", :position => 3
+          some_page.parts.create! :title => "First Part",  :slug => "first_part",  :position => 1
+          some_page.parts.create! :title => "Second Part", :slug => "second_part", :position => 2
+          some_page.parts.create! :title => "Third Part",  :slug => "third_part",  :position => 3
 
-          Refinery::Pages.stub(:new_page_parts).and_return(true)
+          allow(Refinery::Pages).to receive(:new_page_parts).and_return(true)
         end
 
         it "deletes page parts" do
           visit refinery.edit_admin_page_path(some_page.id)
 
           within "#page_parts" do
-            page.should have_content("First Part")
-            page.should have_content("Second Part")
-            page.should have_content("Third Part")
+            expect(page).to have_content("First Part")
+            expect(page).to have_content("Second Part")
+            expect(page).to have_content("Third Part")
           end
 
           2.times do
-            click_link "delete_page_part"
-            page.driver.browser.switch_to.alert.accept
+            find("#delete_page_part").trigger(:click)
+            # Poltergeist automatically accepts dialogues.
+            if Capybara.javascript_driver != :poltergeist
+              page.driver.browser.switch_to.alert.accept
+            end
           end
 
           within "#page_parts" do
-            page.should have_no_content("First Part")
-            page.should have_no_content("Second Part")
-            page.should have_content("Third Part")
+            expect(page).to have_no_content("First Part")
+            expect(page).to have_no_content("Second Part")
+            expect(page).to have_content("Third Part")
           end
 
           click_button "submit_button"
@@ -645,9 +701,9 @@ module Refinery
           visit refinery.edit_admin_page_path(some_page.id)
 
           within "#page_parts" do
-            page.should have_no_content("First Part")
-            page.should have_no_content("Second Part")
-            page.should have_content("Third Part")
+            expect(page).to have_no_content("First Part")
+            expect(page).to have_no_content("Second Part")
+            expect(page).to have_content("Third Part")
           end
         end
       end
@@ -656,26 +712,26 @@ module Refinery
         describe 'view and layout templates' do
           context 'when parent page has templates set' do
             before do
-              Refinery::Pages.stub(:use_layout_templates).and_return(true)
-              Refinery::Pages.stub(:layout_template_whitelist).and_return(['abc', 'refinery'])
-              Refinery::Pages.stub(:valid_templates).and_return(['abc', 'refinery'])
+              allow(Refinery::Pages).to receive(:use_layout_templates).and_return(true)
+              allow(Refinery::Pages).to receive(:layout_template_whitelist).and_return(['abc', 'refinery'])
+              allow(Refinery::Pages).to receive(:valid_templates).and_return(['abc', 'refinery'])
               parent_page = Page.create :title => 'Parent Page',
-                                        :view_template => 'refinery',
-                                        :layout_template => 'refinery'
+              :view_template => 'refinery',
+              :layout_template => 'refinery'
               @page = parent_page.children.create :title => 'Child Page'
             end
 
             specify 'sub page should inherit them', :js => true do
               visit refinery.edit_admin_page_path(@page.id)
 
-              click_link 'toggle_advanced_options'
+              find('#toggle_advanced_options').trigger(:click)
 
               within '#page_layout_template' do
-                page.find('option[value=refinery]').should be_selected
+                expect(page.find('option[value=refinery]')).to be_selected
               end
 
               within '#page_view_template' do
-                page.find('option[value=refinery]').should be_selected
+                expect(page.find('option[value=refinery]')).to be_selected
               end
             end
           end
@@ -683,98 +739,58 @@ module Refinery
       end
 
       # regression spec for https://github.com/refinery/refinerycms/issues/1891
-      describe "page part body" do
+      describe "a page part with HTML", js:true do
         before do
           page = Refinery::Page.create! :title => "test"
           Refinery::Pages.default_parts.each_with_index do |default_page_part, index|
-            page.parts.create(:title => default_page_part,
-                              :body => "<header class='regression'>test</header>",
-                              :position => index)
+            page.parts.create(
+              title: default_page_part,
+              slug: default_page_part,
+              body: "<header class='regression'>test</header>",
+              position: index
+            )
           end
         end
 
-        specify "html shouldn't be stripped" do
+        specify "should retain the html" do
           visit refinery.admin_pages_path
-          click_link "Edit this page"
-          page.should have_content("header class='regression'")
-        end
-      end
-
-      describe "with full page caching", :caching do
-        include CachingHelpers
-        let(:cached_page) { Page.create :title => 'Cached page' }
-
-        before do
-          cache_page(cached_page)
-        end
-
-        describe "creating updating or destroying a page" do
-          it "should clear the page cache" do
-            cached_page.should be_cached
-
-            visit refinery.admin_pages_path
-            click_link "Remove this page forever"
-
-            cached_page.should_not be_cached
-          end
+          find('a[tooltip="Edit this page"]').trigger(:click)
+          Capybara.ignore_hidden_elements = false
+          expect(page).to have_content("header class='regression'")
+          Capybara.ignore_hidden_elements = true
         end
       end
     end
 
-    describe "TranslatePages" do
-      refinery_login_with :refinery_translator
-
-      describe "add page to main locale" do
-        it "doesn't succeed" do
-          visit refinery.admin_pages_path
-
-          click_link "Add new page"
+    describe "TranslatePages", :type => :feature do
+      before { Globalize.locale = :en }
+      refinery_login
 
-          fill_in "Title", :with => "Huh?"
-          click_button "Save"
-
-          page.should have_content("You do not have the required permission to modify pages in this language")
-        end
-      end
-
-      describe "add page to second locale" do
+      describe "a page with a single locale", js: true do
         before do
-          Refinery::I18n.stub(:frontend_locales).and_return([:en, :lv])
+          allow(Refinery::I18n).to receive(:frontend_locales).and_return([:en, :lv])
           Page.create :title => 'First Page'
         end
 
-        it "succeeds" do
+        it "can have a second locale added to it" do
           visit refinery.admin_pages_path
 
-          click_link "Add new page"
+          find('a', text: 'Add new page').trigger(:click)
 
           within "#switch_locale_picker" do
-            click_link "Lv"
+            find('a', text: "LV").trigger(:click)
           end
           fill_in "Title", :with => "Brīva vieta reklāmai"
           click_button "Save"
 
-          page.should have_content("'Brīva vieta reklāmai' was successfully added.")
-          Refinery::Page.count.should == 2
-        end
-      end
-
-      describe "delete page from main locale" do
-        before { Page.create :title => 'Default Page' }
-
-        it "doesn't succeed" do
-          visit refinery.admin_pages_path
-
-          click_link "Remove this page forever"
-
-          page.should have_content("You do not have the required permission to modify pages in this language.")
-          Refinery::Page.count.should == 1
+          expect(page).to have_content("'Brīva vieta reklāmai' was successfully added.")
+          expect(Refinery::Page.count).to eq(2)
         end
       end
 
       describe "Pages Link-to Dialog" do
         before do
-          Refinery::I18n.frontend_locales = [:en, :ru]
+          allow(Refinery::I18n).to receive(:frontend_locales).and_return [:en, :ru]
 
           # Create a page in both locales
           about_page = Globalize.with_locale(:en) do
@@ -789,7 +805,7 @@ module Refinery
 
         let(:about_page) do
           page = Refinery::Page.last
-          # we need page parts so that there's wymeditor
+          # we need page parts so that there's a visual editor
           Refinery::Pages.default_parts.each_with_index do |default_page_part, index|
             page.parts.create(:title => default_page_part, :body => nil, :position => index)
           end
@@ -801,17 +817,17 @@ module Refinery
             before { Refinery::Pages.absolute_page_links = false }
 
             it "shows Russian pages if we're editing the Russian locale" do
-              visit refinery.link_to_admin_pages_dialogs_path(:wymeditor => true, :switch_locale => :ru)
+              visit refinery.link_to_admin_pages_dialogs_path(:visual_editor => true, :switch_locale => :ru)
 
-              page.should have_content("About Ru")
-              page.should have_selector("a[href='/ru/about-ru']")
+              expect(page).to have_content("About Ru")
+              expect(page).to have_selector("a[href='/ru/about-ru']")
             end
 
             it "shows default to the default locale if no query string is added" do
-              visit refinery.link_to_admin_pages_dialogs_path(:wymeditor => true)
+              visit refinery.link_to_admin_pages_dialogs_path(:visual_editor => true)
 
-              page.should have_content("About")
-              page.should have_selector("a[href='/about']")
+              expect(page).to have_content("About")
+              expect(page).to have_selector("a[href='/about']")
             end
           end
 
@@ -819,49 +835,17 @@ module Refinery
             before { Refinery::Pages.absolute_page_links = true }
 
             it "shows Russian pages if we're editing the Russian locale" do
-              visit refinery.link_to_admin_pages_dialogs_path(:wymeditor => true, :switch_locale => :ru)
+              visit refinery.link_to_admin_pages_dialogs_path(:visual_editor => true, :switch_locale => :ru)
 
-              page.should have_content("About Ru")
-              page.should have_selector("a[href='http://www.example.com/ru/about-ru']")
+              expect(page).to have_content("About Ru")
+              expect(page).to have_selector("a[href='http://www.example.com/ru/about-ru']")
             end
 
             it "shows default to the default locale if no query string is added" do
-              visit refinery.link_to_admin_pages_dialogs_path(:wymeditor => true)
-
-              page.should have_content("About")
-              page.should have_selector("a[href='http://www.example.com/about']")
-            end
-          end
-
-          # see https://github.com/refinery/refinerycms/pull/1583
-          context "when switching locales" do
-            specify "dialog has correct links", :js do
-              visit refinery.edit_admin_page_path(about_page)
-
-
-              find("#page_part_body .wym_tools_link a").click
+              visit refinery.link_to_admin_pages_dialogs_path(:visual_editor => true)
 
-              page.should have_selector("iframe#dialog_frame")
-
-              page.within_frame("dialog_frame") do
-                page.should have_content("About")
-                page.should have_css("a[href$='/about']")
-
-                click_link "cancel_button"
-              end
-
-              within "#switch_locale_picker" do
-                click_link "Ru"
-              end
-
-              find("#page_part_body .wym_tools_link a").click
-
-              page.should have_selector("iframe#dialog_frame")
-
-              page.within_frame("dialog_frame") do
-                page.should have_content("About Ru")
-                page.should have_css("a[href$='/ru/about-ru']")
-              end
+              expect(page).to have_content("About")
+              expect(page).to have_selector("a[href='http://www.example.com/about']")
             end
           end
         end