alchemy_cms 3.2.1 → 3.3.0.rc1

data/spec/dummy/db/migrate/20150608204610_add_parent_element_id_to_alchemy_elements.rb

@@ -0,0 +1 @@
+../../../../db/migrate/20150608204610_add_parent_element_id_to_alchemy_elements.rb

data/spec/dummy/db/migrate/20150729151825_add_link_text_to_alchemy_essence_files.rb

@@ -0,0 +1 @@
+../../../../db/migrate/20150729151825_add_link_text_to_alchemy_essence_files.rb

data/spec/dummy/db/migrate/20150906195818_add_locale_to_alchemy_languages.rb

@@ -0,0 +1 @@
+../../../../db/migrate/20150906195818_add_locale_to_alchemy_languages.rb

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150412103152) do
+ActiveRecord::Schema.define(version: 20150906195818) do
 
   create_table "alchemy_attachments", force: :cascade do |t|
     t.string   "name"
@@ -53,17 +53,19 @@ ActiveRecord::Schema.define(version: 20150412103152) do
     t.string   "name"
     t.integer  "position"
     t.integer  "page_id"
-    t.boolean  "public",          default: true
-    t.boolean  "folded",          default: false
-    t.boolean  "unique",          default: false
-    t.datetime "created_at",                      null: false
-    t.datetime "updated_at",                      null: false
+    t.boolean  "public",            default: true
+    t.boolean  "folded",            default: false
+    t.boolean  "unique",            default: false
+    t.datetime "created_at",                        null: false
+    t.datetime "updated_at",                        null: false
     t.integer  "creator_id"
     t.integer  "updater_id"
     t.integer  "cell_id"
     t.text     "cached_tag_list"
+    t.integer  "parent_element_id"
   end
 
+  add_index "alchemy_elements", ["page_id", "parent_element_id"], name: "index_alchemy_elements_on_page_id_and_parent_element_id"
   add_index "alchemy_elements", ["page_id", "position"], name: "index_elements_on_page_id_and_position"
 
   create_table "alchemy_elements_alchemy_pages", id: false, force: :cascade do |t|
@@ -97,6 +99,7 @@ ActiveRecord::Schema.define(version: 20150412103152) do
     t.integer  "updater_id"
     t.datetime "created_at",    null: false
     t.datetime "updated_at",    null: false
+    t.string   "link_text"
   end
 
   create_table "alchemy_essence_htmls", force: :cascade do |t|
@@ -189,6 +192,7 @@ ActiveRecord::Schema.define(version: 20150412103152) do
     t.boolean  "default",        default: false
     t.string   "country_code",   default: "",      null: false
     t.integer  "site_id"
+    t.string   "locale"
   end
 
   add_index "alchemy_languages", ["language_code", "country_code"], name: "index_alchemy_languages_on_language_code_and_country_code"

data/spec/factories.rb

@@ -0,0 +1,13 @@
+FactoryGirl.define do
+  factory :event do
+    name 'My Event'
+    hidden_name 'not shown'
+    starts_at DateTime.new(2012, 03, 02, 8, 15)
+    ends_at DateTime.new(2012, 03, 02, 19, 30)
+    lunch_starts_at DateTime.new(2012, 03, 02, 12, 15)
+    lunch_ends_at DateTime.new(2012, 03, 02, 13, 45)
+    description "something\nfancy"
+    published false
+    entrance_fee 12.3
+  end
+end

data/spec/features/admin/admin_layout_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+RSpec.feature 'Admin layout' do
+  let(:user) { create(:alchemy_dummy_user, :as_admin, name: "Joe User") }
+
+  before do
+    authorize_user(user)
+  end
+
+  it 'has controller and action name as body class' do
+    visit admin_path
+    expect(page).to have_selector('body.dashboard.index')
+  end
+end

data/spec/features/admin/dashboard_spec.rb

@@ -8,7 +8,7 @@ describe 'Dashboard feature' do
   end
 
   describe 'Locked pages summary' do
-    let(:a_page) { FactoryGirl.create(:public_page, visible: true) }
+    let(:a_page) { create(:alchemy_page, :public, visible: true) }
 
     it "should initially show no pages are locked" do
       visit admin_dashboard_path
@@ -45,7 +45,6 @@ describe 'Dashboard feature' do
 
   describe 'Sites widget' do
     context 'with multiple sites' do
-
       before do
         Alchemy::Site.create!(name: 'Site', host: 'site.com')
       end

data/spec/features/admin/edit_elements_feature_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+RSpec.feature "The edit elements feature" do
+  let!(:a_page) { create(:alchemy_page) }
+
+  background do
+    authorize_user(:as_editor)
+  end
+
+  context 'Visiting the new element form' do
+    context 'with a page_id passed' do
+      scenario 'a form to select a new element for the page appears.' do
+        visit alchemy.new_admin_element_path(page_id: a_page.id)
+        expect(page).to have_selector('select[name="element[name]"]')
+      end
+    end
+
+    context 'with a page_id and parent_element_id passed' do
+      let!(:element) { create(:alchemy_element, :with_nestable_elements, page: a_page) }
+
+      scenario 'a hidden field with parent element id is in the form.' do
+        visit alchemy.new_admin_element_path(page_id: a_page.id, parent_element_id: element.id)
+        expect(page).to have_selector(%(input[type="hidden"][name="element[parent_element_id]"][value="#{element.id}"]))
+      end
+    end
+  end
+
+  context 'With an element having nestable elements defined' do
+    let!(:element) { create(:alchemy_element, :with_nestable_elements, page: a_page) }
+
+    scenario 'a button to add an nestable element appears.' do
+      visit alchemy.admin_elements_path(page_id: element.page_id)
+      expect(page).to have_selector('.add-nestable-element-button')
+    end
+  end
+end

data/spec/features/admin/language_tree_feature_spec.rb

@@ -1,33 +1,32 @@
 require 'spec_helper'
 
 describe 'Language tree feature', type: :feature, js: true do
-  let(:klingonian) { FactoryGirl.create(:klingonian) }
+  let(:klingon) { create(:alchemy_language, :klingon) }
 
   before do
-    FactoryGirl.create(:language_root_page)
+    create(:alchemy_page, :language_root)
     authorize_user(:as_admin)
   end
 
   context "in a multilangual environment" do
     before do
-      FactoryGirl.create(:language_root_page, :name => 'Klingonian', :language => klingonian)
+      create(:alchemy_page, :language_root, name: 'Klingon', language: klingon)
     end
 
     it "one should be able to switch the language tree" do
       visit('/admin/pages')
-      page.select 'Klingonian', from: 'language_id'
-      expect(page).to have_selector('#sitemap', text: 'Klingonian')
+      page.select 'Klingon', from: 'language_id'
+      expect(page).to have_selector('#sitemap', text: 'Klingon')
     end
   end
 
   context "with no language root page" do
-    before { klingonian }
+    before { klingon }
 
     it "it should display the form for creating language root" do
       visit('/admin/pages')
-      page.select 'Klingonian', from: 'language_id'
+      page.select 'Klingon', from: 'language_id'
       expect(page).to have_content('This language tree does not exist')
     end
   end
-
 end

data/spec/features/admin/languages_features_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+RSpec.feature "Admin::LanguagesFeatures", type: :feature do
+  before do
+    authorize_user(:as_admin)
+  end
+
+  describe 'creating a new language' do
+    context 'when selected locale is not an available locale' do
+      before do
+        allow(::I18n).to receive(:available_locales) { [:de, :en] }
+      end
+
+      it 'shows a locale select and an error message' do
+        visit alchemy.new_admin_language_path
+
+        fill_in 'language_language_code', with: 'kl'
+        click_button 'Save'
+
+        expect(page).to have_select('language_locale', options: %w(de en))
+        expect(page).to have_selector('.language_locale.field_with_errors .error')
+      end
+    end
+  end
+
+  describe 'editing an language' do
+    let!(:language) { create(:alchemy_language) }
+
+    context 'when selected locale has multiple matching locale files' do
+      before do
+        allow(::I18n).to receive(:available_locales) { [:de, :'de-at', :en, :'en-uk'] }
+      end
+
+      it 'shows a locale select with matching locales only' do
+        visit alchemy.edit_admin_language_path(language)
+
+        expect(page).to have_select('language_locale', options: ['de', 'de-at'])
+      end
+    end
+
+    context 'when selected locale has one matching locale file' do
+      before do
+        allow(::I18n).to receive(:available_locales) { [:de, :en, :'en-uk'] }
+      end
+
+      it 'shows a locale select with matching locale only' do
+        visit alchemy.edit_admin_language_path(language)
+
+        expect(page).to have_select('language_locale', options: %w(de))
+      end
+    end
+
+    context 'when selected locale has no matching locale files' do
+      before do
+        allow(::I18n).to receive(:available_locales) { [:jp, :es] }
+      end
+
+      it 'shows a locale select with all available locales' do
+        visit alchemy.edit_admin_language_path(language)
+
+        expect(page).to have_select('language_locale', options: %w(jp es))
+      end
+    end
+  end
+end

data/spec/features/admin/legacy_page_url_management_spec.rb

@@ -6,12 +6,12 @@ describe 'Legacy page url management', type: :feature, js: true do
     authorize_user(:as_admin)
   end
 
-  let!(:a_page) { create(:page) }
+  let!(:a_page) { create(:alchemy_page) }
 
   def open_page_properties
     visit admin_pages_path
     within "#page_#{a_page.id}" do
-      click_link Alchemy::I18n.t(:edit_page_properties)
+      click_link Alchemy.t(:edit_page_properties)
     end
   end
 
@@ -52,7 +52,7 @@ describe 'Legacy page url management', type: :feature, js: true do
       click_button 'Yes'
       within '#legacy_page_urls' do
         expect(page).to_not have_content('a-page-link')
-        expect(page).to have_content(Alchemy::I18n.t('No page links for this page found'))
+        expect(page).to have_content(Alchemy.t('No page links for this page found'))
       end
       within '#legacy_urls_label' do
         expect(page).to have_content('(0) Links')

data/spec/features/admin/link_overlay_spec.rb

@@ -1,54 +1,53 @@
 require 'spec_helper'
 
 describe "Link overlay" do
-
   before do
     authorize_user(:as_admin)
   end
 
   context "GUI" do
-
     it "has a tab for linking internal pages" do
       visit link_admin_pages_path
-      within('#overlay_tabs') { expect(page).to 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') { expect(page).to 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') { expect(page).to have_content('File')}
+      within('#overlay_tabs') { expect(page).to have_content('File') }
     end
-
   end
 
-  context "linking internal pages" do
-
+  context "linking internal pages", js: true do
     let(:lang_root) do
-      FactoryGirl.create(:language_root_page)
+      create(:alchemy_page, :language_root)
     end
 
     before do
-      public_page = FactoryGirl.create(:public_page, :parent_id => lang_root.id)
-      public_page_2 = FactoryGirl.create(:public_page, :parent_id => lang_root.id)
+      create(:alchemy_page, :public, parent_id: lang_root.id)
+      create(:alchemy_page, :public, parent_id: lang_root.id)
     end
 
-    it "should have a tree of internal pages" do
+    it "should have code to load a tree of internal pages" do
       visit link_admin_pages_path
-      expect(page).to have_selector('ul#sitemap li a')
+      # Doesn't work, because the parent page sets the `dialog` variable in window:
+      # expect(page).to have_selector('ul#sitemap li a')
+      expect(page).to have_selector('div#page_selector_container div#sitemap-wrapper')
+      expect(page).to have_selector('div#page_selector_container script')
     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')
-      allow_any_instance_of(Alchemy::Page).to receive(:definition).and_return({'redirects_to_external' => true})
+      create(:alchemy_page, parent_id: lang_root.id, name: 'Google', urlname: 'http://www.google.com')
+      allow_any_instance_of(Alchemy::Page).to receive(:definition) do
+        {'redirects_to_external' => true}
+      end
       visit link_admin_pages_path
       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
-
 end

data/spec/features/admin/locale_select_feature_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'Locale select' do
-  let(:a_page) { FactoryGirl.create(:public_page) }
+  let(:a_page) { create(:alchemy_page, :public) }
   before do
     allow(Alchemy::I18n).to receive(:translation_files).and_return ['alchemy.kl.yml', 'alchemy.jp.yml', 'alchemy.cz.yml']
     authorize_user(:as_admin)

data/spec/features/admin/modules_integration_spec.rb

@@ -19,6 +19,5 @@ describe "Modules" do
       click_on 'Events'
       expect(page).not_to have_content('Upps!')
     end
-
   end
 end

data/spec/features/admin/navigation_feature_spec.rb

@@ -1,13 +1,22 @@
 require 'spec_helper'
 
 describe 'Admin navigation feature' do
-
   context 'admin users' do
     before { authorize_user(:as_admin) }
 
     it "can leave the admin area" do
-      visit ('/admin/leave')
+      visit '/admin/leave'
       expect(page).to have_content('You are about to leave Alchemy')
     end
   end
+
+  context 'editor users' do
+    before { authorize_user(:as_editor) }
+
+    it "can access the languages page" do
+      visit '/admin'
+      click_on 'Languages'
+      expect(current_path).to eq('/admin/languages')
+    end
+  end
 end

data/spec/features/admin/page_creation_feature_spec.rb

@@ -14,7 +14,7 @@ module Alchemy
 
       context "when having a Page in the clipboard" do
         before do
-          expect(Page).to receive(:all_from_clipboard_for_select).and_return [build_stubbed(:page)]
+          expect(Page).to receive(:all_from_clipboard_for_select).and_return [build_stubbed(:alchemy_page)]
         end
 
         it "contains tabs for creating a new page and pasting from clipboard" do
@@ -30,8 +30,8 @@ module Alchemy
 
           it "the create page tab is visible by default" do
             within('#overlay_tabs') do
-              expect(find '#create_page_tab').to be_visible
-              expect(find '#paste_page_tab').to_not be_visible
+              expect(page).to have_selector('#create_page_tab', visible: true)
+              expect(page).to have_selector('#paste_page_tab')
             end
           end
 
@@ -39,8 +39,8 @@ module Alchemy
             it "shows that clicked tab" do
               within('#overlay_tabs') do
                 click_link('Paste from clipboard')
-                expect(find '#create_page_tab').to_not be_visible
-                expect(find '#paste_page_tab').to be_visible
+                expect(find('#create_page_tab')).to_not be_visible
+                expect(find('#paste_page_tab')).to be_visible
               end
             end
           end

data/spec/features/admin/page_editing_feature_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'Page editing feature' do
-  let(:a_page) { create(:page) }
+  let(:a_page) { create(:alchemy_page) }
 
   context 'as author' do
     before { authorize_user(:as_author) }
@@ -18,11 +18,11 @@ describe 'Page editing feature' do
     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)
+      expect(page).to have_content Alchemy.t(:page_published, name: a_page.name)
     end
 
     context 'while editing a global page' do
-      let(:a_page) { create(:page, layoutpage: true) }
+      let(:a_page) { create(:alchemy_page, layoutpage: true) }
 
       it 'cannot publish page.' do
         visit alchemy.edit_admin_page_path(a_page)
@@ -32,7 +32,7 @@ describe 'Page editing feature' do
   end
 
   context 'as admin' do
-    let(:a_page) { create(:public_page, visible: true) }
+    let(:a_page) { create(:alchemy_page, :public, visible: true) }
 
     before { authorize_user(:as_admin) }
 
@@ -74,7 +74,7 @@ describe 'Page editing feature' do
       end
 
       context "when editing a global page" do
-        let(:layout_page) { create(:page, layoutpage: true) }
+        let(:layout_page) { create(:alchemy_page, layoutpage: true) }
 
         it "should not show the input fields for normal pages" do
           visit alchemy.edit_admin_layoutpage_path(layout_page)
@@ -114,7 +114,7 @@ describe 'Page editing feature' do
 
     context 'in element panel' do
       let!(:everything_page) do
-        create(:page, page_layout: 'everything', do_not_autogenerate: false)
+        create(:alchemy_page, page_layout: 'everything', do_not_autogenerate: false)
       end
 
       it "renders essence editors for all elements" do