alchemy_cms 3.0.4 → 3.1.0.beta1

data/spec/dummy/config/alchemy/page_layouts.yml

@@ -5,6 +5,10 @@
   elements: [article, header]
   autogenerate: [header, article]
 
+- name: everything
+  elements: [all_you_can_eat]
+  autogenerate: [all_you_can_eat]
+
 - name: news
   feed: true
   unique: true

data/spec/dummy/config/application.rb

@@ -18,6 +18,7 @@ module Dummy
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-    config.i18n.enforce_available_locales = false
+
+    I18n.enforce_available_locales = true
   end
 end

data/spec/dummy/config/environments/test.rb

@@ -5,7 +5,7 @@ Dummy::Application.configure do
   # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
   # and recreated between test runs. Don't rely on the data there!
-  config.cache_classes = true
+  config.cache_classes = false
 
   # Do not eager load code on boot. This avoids loading your whole application
   # just for the purpose of running a single test. If you are using a tool that
@@ -33,4 +33,6 @@ Dummy::Application.configure do
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
+
+  I18n.enforce_available_locales = false
 end

data/spec/features/admin/dashboard_spec.rb

@@ -1,15 +1,16 @@
 require 'spec_helper'
 
 describe 'Dashboard feature' do
-  let(:a_page) { FactoryGirl.create(:public_page, visible: true) }
+  let(:user) { DummyUser.new }
 
   before do
-    @user = DummyUser.new
-    @user.update_attributes(alchemy_roles: %w(admin), name: "Joe User", id: 1)
-    authorize_as_admin(@user)
+    user.update_attributes(alchemy_roles: %w(admin), name: "Joe User", id: 1)
+    authorize_as_admin(user)
   end
 
   describe 'Locked pages summary' do
+    let(:a_page) { FactoryGirl.create(:public_page, visible: true) }
+
     it "should initially show no pages are locked" do
       visit admin_dashboard_path
       locked_pages_widget = all('div[@class="widget"]').first
@@ -19,7 +20,7 @@ describe 'Dashboard feature' do
 
     context 'When locked by current user' do
       it "should show locked by me" do
-        a_page.lock_to!(@user)
+        a_page.lock_to!(user)
         visit admin_dashboard_path
         locked_pages_widget = all('div[@class="widget"]').first
         expect(locked_pages_widget).to have_content "Currently locked pages:"
@@ -33,7 +34,7 @@ describe 'Dashboard feature' do
         user = DummyUser.new
         user.update_attributes(alchemy_roles: %w(admin), name: "Sue Smith", id: 2)
         a_page.lock_to!(user)
-        DummyUser.stub(:find_by).and_return(user)
+        allow(DummyUser).to receive(:find_by).and_return(user)
         visit admin_dashboard_path
         locked_pages_widget = all('div[@class="widget"]').first
         expect(locked_pages_widget).to have_content "Currently locked pages:"
@@ -42,4 +43,38 @@ describe 'Dashboard feature' do
       end
     end
   end
+
+  describe 'Sites widget' do
+    context 'with multiple sites' do
+      let!(:site) { Alchemy::Site.create!(name: 'Site', host: 'site.com') }
+
+      it "lists all sites" do
+        visit admin_dashboard_path
+        sites_widget = all('div[@class="widget sites"]').first
+        expect(sites_widget).to have_content "Websites:"
+        expect(sites_widget).to have_content "Default Site"
+        expect(sites_widget).to have_content "Site"
+      end
+
+      context 'with alchemy url proxy object having `login_url`' do
+        before do
+          allow_any_instance_of(ActionDispatch::Routing::RoutesProxy).to receive(:login_url).and_return('http://site.com/admin/login')
+        end
+
+        it "links to login page of every site" do
+          visit admin_dashboard_path
+          sites_widget = all('div[@class="widget sites"]').first
+          expect(sites_widget).to have_selector 'a[href="http://site.com/admin/login"]'
+        end
+      end
+    end
+
+    context 'with only one site' do
+      it "does not display" do
+        visit admin_dashboard_path
+        sites_widget = all('div[@class="widget sites"]').first
+        expect(sites_widget).to be_nil
+      end
+    end
+  end
 end

data/spec/features/admin/language_tree_feature_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Language tree feature', js: true do
+describe 'Language tree feature', type: :feature, js: true do
 
   let(:klingonian) { FactoryGirl.create(:klingonian) }
   let(:german_root) { FactoryGirl.create(:language_root_page) }
@@ -17,7 +17,7 @@ describe 'Language tree feature', js: true do
     it "one should be able to switch the language tree" do
       visit('/admin/pages')
       page.select 'Klingonian', from: 'language_id'
-      page.should have_selector('#sitemap', text: 'Klingonian')
+      expect(page).to have_selector('#sitemap', text: 'Klingonian')
     end
   end
 
@@ -27,7 +27,7 @@ describe 'Language tree feature', js: true do
     it "it should display the form for creating language root" do
       visit('/admin/pages')
       page.select 'Klingonian', from: 'language_id'
-      page.should have_content('This language tree does not exist')
+      expect(page).to have_content('This language tree does not exist')
     end
   end
 

data/spec/features/admin/legacy_page_url_management_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'Legacy page url management', js: true do
+describe 'Legacy page url management', type: :feature, js: true do
   before do
     authorize_as_admin
   end

data/spec/features/admin/link_overlay_spec.rb

@@ -10,17 +10,17 @@ describe "Link overlay" do
 
     it "has a tab for linking internal pages" do
       visit link_admin_pages_path
-      within('#overlay_tabs') { page.should have_content('Internal')}
+      within('#overlay_tabs') { expect(page).to have_content('Internal')}
     end
 
     it "has a tab for linking external pages" do
       visit link_admin_pages_path
-      within('#overlay_tabs') { page.should have_content('External')}
+      within('#overlay_tabs') { expect(page).to have_content('External')}
     end
 
     it "has a tab for linking files" do
       visit link_admin_pages_path
-      within('#overlay_tabs') { page.should have_content('File')}
+      within('#overlay_tabs') { expect(page).to have_content('File')}
     end
 
   end
@@ -38,15 +38,15 @@ describe "Link overlay" do
 
     it "should have a tree of internal pages" do
       visit link_admin_pages_path
-      page.should have_selector('ul#sitemap li a')
+      expect(page).to have_selector('ul#sitemap li a')
     end
 
     it "should not have a link for pages that redirect to external" do
       redirect = FactoryGirl.create(:page, :parent_id => lang_root.id, :name => 'Google', :urlname => 'http://www.google.com')
-      Alchemy::Page.any_instance.stub(:definition).and_return({'redirects_to_external' => true})
+      allow_any_instance_of(Alchemy::Page).to receive(:definition).and_return({'redirects_to_external' => true})
       visit link_admin_pages_path
-      page.should_not have_selector('ul#sitemap li div[name="/http-www-google-com"] a')
-      Alchemy::Page.any_instance.unstub(:definition)
+      expect(page).not_to have_selector('ul#sitemap li div[name="/http-www-google-com"] a')
+      allow_any_instance_of(Alchemy::Page).to receive(:definition).and_call_original
     end
 
   end

data/spec/features/admin/locale_select_feature_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'Locale select' do
   let(:a_page) { FactoryGirl.create(:public_page) }
   before do
-    Alchemy::I18n.stub(translation_files: ['alchemy.kl.yml', 'alchemy.jp.yml', 'alchemy.cz.yml'])
+    allow(Alchemy::I18n).to receive(:translation_files).and_return ['alchemy.kl.yml', 'alchemy.jp.yml', 'alchemy.cz.yml']
     authorize_as_admin
   end
 
@@ -13,7 +13,10 @@ describe 'Locale select' do
   end
 
   context 'when having available_locales set for Alchemy::I18n' do
-    before { Alchemy::I18n.stub(available_locales: [:jp, :cz]) }
+    before do
+      allow(Alchemy::I18n).to receive(:available_locales).and_return [:jp, :cz]
+    end
+
     it "provides only that locales" do
       visit admin_dashboard_path
       expect(page).to have_select('change_locale', options: ['Jp', 'Cz'])

data/spec/features/admin/modules_integration_spec.rb

@@ -17,7 +17,7 @@ describe "Modules" do
         })
       visit '/admin'
       click_on 'Events'
-      page.should_not have_content('Upps!')
+      expect(page).not_to have_content('Upps!')
     end
 
   end

data/spec/features/admin/page_creation_feature_spec.rb

@@ -13,7 +13,9 @@ module Alchemy
       end
 
       context "when having a Page in the clipboard" do
-        before { Page.stub all_from_clipboard_for_select: [build_stubbed(:page)] }
+        before do
+          expect(Page).to receive(:all_from_clipboard_for_select).and_return [build_stubbed(:page)]
+        end
 
         it "contains tabs for creating a new page and pasting from clipboard" do
           visit new_admin_page_path
@@ -45,6 +47,5 @@ module Alchemy
         end
       end
     end
-
   end
 end

data/spec/features/admin/page_editing_feature_spec.rb

@@ -1,108 +1,95 @@
 require 'spec_helper'
 
 describe 'Page editing feature' do
-  let(:a_page) { create(:page) }
+  let(:a_page) { FactoryGirl.create(:public_page, visible: true) }
 
-  context 'as author' do
-    before { authorize_as_admin(build(:author_user)) }
+  before { authorize_as_admin }
 
-    it 'cannot publish page.' do
-      visit alchemy.edit_admin_page_path(a_page)
-      expect(page).to_not have_selector('#publish_page_form')
-    end
-  end
+  context "in configure overlay" do
 
-  context 'as editor' do
-    before { authorize_as_admin(build(:editor_user)) }
-
-    it 'can publish page.' do
-      visit alchemy.edit_admin_page_path(a_page)
-      find('#publish_page_form button').click
-      expect(page).to have_content Alchemy::I18n.t(:page_published, name: a_page.name)
-    end
-
-    context 'while editing a global page' do
-      let(:a_page) { create(:page, layoutpage: true) }
-
-      it 'cannot publish page.' do
-        visit alchemy.edit_admin_page_path(a_page)
-        expect(page).to_not have_selector('#publish_page_form')
+    context "when editing a normal page" do
+      it "should show all relevant input fields" do
+        visit alchemy.configure_admin_page_path(a_page)
+        expect(page).to have_selector('input#page_urlname')
+        expect(page).to have_selector('input#page_title')
+        expect(page).to have_selector('input#page_robot_index')
+        expect(page).to have_selector('input#page_robot_follow')
       end
-    end
-  end
-
-  context 'as admin' do
-    let(:a_page) { FactoryGirl.create(:public_page, visible: true) }
 
-    before { authorize_as_admin }
+      context "with sitemaps show_flag config option set to true" do
+        before do
+          allow(Alchemy::Config).to receive(:get) { |arg| arg == :sitemap ? {'show_flag' => true} : Alchemy::Config.show[arg.to_s] }
+        end
 
-    context "in configure overlay" do
-      context "when editing a normal page" do
-        it "should show all relevant input fields" do
+        it "should show sitemap checkbox" do
           visit alchemy.configure_admin_page_path(a_page)
-          expect(page).to have_selector('input#page_urlname')
-          expect(page).to have_selector('input#page_title')
-          expect(page).to have_selector('input#page_robot_index')
-          expect(page).to have_selector('input#page_robot_follow')
+          expect(page).to have_selector('input[type="checkbox"]#page_sitemap')
         end
+      end
 
-        context "with sitemaps show_flag config option set to true" do
-          before do
-            Alchemy::Config.stub(:get) { |arg| arg == :sitemap ? {'show_flag' => true} : Alchemy::Config.show[arg.to_s] }
-          end
-
-          it "should show sitemap checkbox" do
-            visit alchemy.configure_admin_page_path(a_page)
-            expect(page).to have_selector('input[type="checkbox"]#page_sitemap')
-          end
+      context "with sitemaps show_flag config option set to false" do
+        before do
+          allow(Alchemy::Config).to receive(:get) { |arg| arg == :sitemap ? {'show_flag' => false} : Alchemy::Config.show[arg.to_s] }
         end
 
-        context "with sitemaps show_flag config option set to false" do
-          before do
-            Alchemy::Config.stub(:get) { |arg| arg == :sitemap ? {'show_flag' => false} : Alchemy::Config.show[arg.to_s] }
-          end
-
-          it "should show sitemap checkbox" do
-            visit alchemy.configure_admin_page_path(a_page)
-            expect(page).to_not have_selector('input[type="checkbox"]#page_sitemap')
-          end
+        it "should show sitemap checkbox" do
+          visit alchemy.configure_admin_page_path(a_page)
+          expect(page).to_not have_selector('input[type="checkbox"]#page_sitemap')
         end
       end
+    end
 
-      context "when editing a global page" do
-        let(:layout_page) { FactoryGirl.create(:page, layoutpage: true) }
+    context "when editing a global page" do
+      let(:layout_page) { FactoryGirl.create(:page, layoutpage: true) }
 
-        it "should not show the input fields for normal pages" do
-          visit alchemy.edit_admin_layoutpage_path(layout_page)
-          expect(page).to_not have_selector('input#page_urlname')
-          expect(page).to_not have_selector('input#page_title')
-          expect(page).to_not have_selector('input#page_robot_index')
-          expect(page).to_not have_selector('input#page_robot_follow')
-        end
+      it "should not show the input fields for normal pages" do
+        visit alchemy.edit_admin_layoutpage_path(layout_page)
+        expect(page).to_not have_selector('input#page_urlname')
+        expect(page).to_not have_selector('input#page_title')
+        expect(page).to_not have_selector('input#page_robot_index')
+        expect(page).to_not have_selector('input#page_robot_follow')
       end
+    end
 
-      context "when page is taggable" do
-        before { Alchemy::Page.any_instance.stub(:taggable?).and_return(true) }
+    context "when page is taggable" do
+      before { expect_any_instance_of(Alchemy::Page).to receive(:taggable?).and_return(true) }
 
-        it "should show the tag_list input field" do
-          visit alchemy.configure_admin_page_path(a_page)
-          expect(page).to have_selector('input#page_tag_list')
-        end
+      it "should show the tag_list input field" do
+        visit alchemy.configure_admin_page_path(a_page)
+        expect(page).to have_selector('input#page_tag_list')
       end
     end
+  end
 
-    context "in preview frame" do
-      it "the menubar does not render on the page" do
-        visit alchemy.admin_page_path(a_page)
-        page.should_not have_selector('#alchemy_menubar')
-      end
+  context "in preview frame" do
+    it "the menubar does not render on the page" do
+      visit alchemy.admin_page_path(a_page)
+      expect(page).not_to have_selector('#alchemy_menubar')
+    end
 
-      it "navigation links are not clickable" do
-        visit alchemy.admin_page_path(a_page)
-        within('#navigation') do
-          page.should have_selector('a[href="javascript: void(0)"]')
-        end
+    it "navigation links are not clickable" do
+      visit alchemy.admin_page_path(a_page)
+      within('#navigation') do
+        expect(page).to have_selector('a[href="javascript: void(0)"]')
       end
     end
   end
+
+  context 'in element panel' do
+    let!(:everything_page) { create(:page, page_layout: 'everything', do_not_autogenerate: false) }
+
+    it "renders essence editors for all elements" do
+      visit alchemy.admin_elements_path(page_id: everything_page.id)
+
+      expect(page).to have_selector('div.content_editor.essence_boolean')
+      expect(page).to have_selector('div.content_editor.essence_date')
+      expect(page).to have_selector('div.content_editor.essence_file')
+      expect(page).to have_selector('div.content_editor.essence_html_editor')
+      expect(page).to have_selector('div.content_editor.essence_link')
+      expect(page).to have_selector('div.content_editor.essence_picture_editor')
+      expect(page).to have_selector('div.content_editor.essence_richtext')
+      expect(page).to have_selector('div.content_editor.essence_select')
+      expect(page).to have_selector('div.content_editor.essence_text')
+    end
+  end
 end

data/spec/features/admin/picture_library_integration_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Picture Library", js: true do
+describe "Picture Library", type: :feature, js: true do
 
   before do
     authorize_as_admin
@@ -16,23 +16,23 @@ describe "Picture Library", js: true do
     it "it should be possible to filter tags by clicking on its name in the tag list" do
       visit '/admin/pictures'
       click_on 'tag1 (1)'
-      page.should have_content 'TaggedWith1'
-      page.should_not have_content 'TaggedWith2'
+      expect(page).to have_content 'TaggedWith1'
+      expect(page).not_to have_content 'TaggedWith2'
     end
 
     it "it should be possible to undo tag filtering by clicking on an active tag name" do
       visit '/admin/pictures'
       click_on 'tag1 (1)'
-      page.should_not have_content 'TaggedWith2'
+      expect(page).not_to have_content 'TaggedWith2'
       click_on 'tag1 (1)'
-      page.should have_content 'TaggedWith2'
+      expect(page).to have_content 'TaggedWith2'
     end
 
     it "it should be possible to tighten the tag scope by clicking on another tag name" do
       visit '/admin/pictures'
       click_on 'tag1 (1)'
       click_on 'tag2 (1)'
-      page.should have_content "You don't have any images in your archive"
+      expect(page).to have_content "You don't have any images in your archive"
     end
 
   end
@@ -45,13 +45,13 @@ describe "Picture Library", js: true do
 
     it "should list all applied tags" do
       visit '/admin/pictures'
-      page.should have_content 'bla'
+      expect(page).to have_content 'bla'
     end
 
     it "should be possible to filter pictures by tag" do
       visit '/admin/pictures'
       click_on 'bla (1)'
-      page.should have_content 'bla'
+      expect(page).to have_content 'bla'
     end
 
   end