alchemy_cms 3.2.1 → 3.3.0.rc1

data/spec/helpers/{admin → alchemy/admin}/essences_helper_spec.rb

@@ -3,7 +3,9 @@ require 'spec_helper'
 describe Alchemy::Admin::EssencesHelper do
   include Alchemy::Admin::ElementsHelper
 
-  let(:element) { FactoryGirl.create(:element, :name => 'article', :create_contents_after_create => true) }
+  let(:element) do
+    create(:alchemy_element, name: 'article', create_contents_after_create: true)
+  end
 
   describe 'essence rendering' do
     before do
@@ -15,7 +17,8 @@ describe Alchemy::Admin::EssencesHelper do
     describe '#render_essence_editor' do
       it "should render an essence editor" do
         content = element.content_by_name('intro')
-        expect(helper.render_essence_editor(content)).to match(/input.+type="text".+value="hello!/)
+        expect(helper.render_essence_editor(content)).
+          to match(/input.+type="text".+value="hello!/)
       end
     end
 
@@ -48,10 +51,13 @@ describe Alchemy::Admin::EssencesHelper do
   end
 
   describe '#pages_for_select' do
-    let(:contact_form) { FactoryGirl.create(:element, :name => 'contactform', :create_contents_after_create => true) }
-    let(:page_a) { FactoryGirl.create(:public_page, :name => 'Page A') }
-    let(:page_b) { FactoryGirl.create(:public_page, :name => 'Page B') }
-    let(:page_c) { FactoryGirl.create(:public_page, :name => 'Page C', :parent_id => page_b.id) }
+    let(:contact_form) do
+      create(:alchemy_element, name: 'contactform', create_contents_after_create: true)
+    end
+
+    let(:page_a) { create(:alchemy_page, :public, name: 'Page A') }
+    let(:page_b) { create(:alchemy_page, :public, name: 'Page B') }
+    let(:page_c) { create(:alchemy_page, :public, name: 'Page C', parent_id: page_b.id) }
 
     before do
       # to be shure the ordering is alphabetic
@@ -75,7 +81,7 @@ describe Alchemy::Admin::EssencesHelper do
     context "with pages passed in" do
       before do
         @pages = []
-        3.times { @pages << FactoryGirl.create(:public_page) }
+        3.times { @pages << create(:alchemy_page, :public) }
       end
 
       it "should return options for select with only these pages" do
@@ -92,7 +98,7 @@ describe Alchemy::Admin::EssencesHelper do
   end
 
   describe '#essence_picture_thumbnail' do
-    let(:content) { build_stubbed(:content, essence: build_stubbed(:essence_picture)) }
+    let(:content) { build_stubbed(:alchemy_content, essence: build_stubbed(:alchemy_essence_picture)) }
 
     it "should return an image tag" do
       expect(helper.essence_picture_thumbnail(content, {})).to have_selector('img[src]')
@@ -137,4 +143,59 @@ describe Alchemy::Admin::EssencesHelper do
     end
   end
 
+  describe "#edit_picture_dialog_size" do
+    let(:content) { build_stubbed(:alchemy_content) }
+
+    subject { edit_picture_dialog_size(content) }
+
+    context "with content having setting caption_as_textarea being true and sizes set" do
+      before do
+        allow(content).to receive(:settings) do
+          {
+            caption_as_textarea: true,
+            sizes: ['100x100', '200x200']
+          }
+        end
+
+        it { is_expected.to eq("380x320") }
+      end
+    end
+
+    context "with content having setting caption_as_textarea being true and no sizes set" do
+      before do
+        allow(content).to receive(:settings) do
+          {
+            caption_as_textarea: true
+          }
+        end
+
+        it { is_expected.to eq("380x300") }
+      end
+    end
+
+    context "with content having setting caption_as_textarea being false and sizes set" do
+      before do
+        allow(content).to receive(:settings) do
+          {
+            caption_as_textarea: false,
+            sizes: ['100x100', '200x200']
+          }
+        end
+
+        it { is_expected.to eq("380x290") }
+      end
+    end
+
+    context "with content having setting caption_as_textarea being false and no sizes set" do
+      before do
+        allow(content).to receive(:settings) do
+          {
+            caption_as_textarea: false
+          }
+        end
+
+        it { is_expected.to eq("380x255") }
+      end
+    end
+  end
 end

data/spec/helpers/{admin → alchemy/admin}/navigation_helper_spec.rb

@@ -1,56 +1,62 @@
 require 'spec_helper'
 
 describe Alchemy::Admin::NavigationHelper do
-  let(:alchemy_module) { {
-    'name' => 'dashboard',
-    'engine_name' => 'alchemy',
-    'navigation' => {
-      'name' => 'modules.dashboard',
-      'controller' => 'alchemy/admin/dashboard',
-      'action' => 'index',
-      'icon' => 'dashboard',
-      'sub_navigation' => [{
-        'controller' => 'alchemy/admin/layoutpages',
-        'action' => 'index'
-      }]
+  let(:alchemy_module) do
+    {
+      'name' => 'dashboard',
+      'engine_name' => 'alchemy',
+      'navigation' => {
+        'name' => 'modules.dashboard',
+        'controller' => 'alchemy/admin/dashboard',
+        'action' => 'index',
+        'icon' => 'dashboard',
+        'sub_navigation' => [{
+          'controller' => 'alchemy/admin/layoutpages',
+          'action' => 'index'
+        }]
+      }
     }
-  } }
+  end
 
-  let(:event_module) { {
-    'navigation' => {
-      'controller' => '/admin/events',
-      'action' => 'index',
-      'sub_navigation' => [{
+  let(:event_module) do
+    {
+      'navigation' => {
         'controller' => '/admin/events',
-        'action' => 'index'
-      }]
+        'action' => 'index',
+        'sub_navigation' => [{
+          'controller' => '/admin/events',
+          'action' => 'index'
+        }]
+      }
     }
-  } }
-
-  let(:event_module_with_params) { {
-    'navigation' => {
-      'controller' => '/admin/events',
-      'action' => 'index',
-      'params' => {
-          'key' => 'value'
-      },
-      'sub_navigation' => [{
+  end
+
+  let(:event_module_with_params) do
+    {
+      'navigation' => {
         'controller' => '/admin/events',
         'action' => 'index',
         'params' => {
-           'key' => 'value',
-           'key2' => 'value2'
-        }
-     }]
+            'key' => 'value'
+        },
+        'sub_navigation' => [{
+          'controller' => '/admin/events',
+          'action' => 'index',
+          'params' => {
+             'key' => 'value',
+             'key2' => 'value2'
+          }
+       }]
       }
-  } }
+    }
+  end
 
   let(:navigation) { alchemy_module['navigation'] }
 
   describe '#alchemy_main_navigation_entry' do
     before do
       allow(helper).to receive(:url_for_module).and_return('')
-      allow(helper).to receive(:_t).and_return(alchemy_module['name'])
+      allow(Alchemy).to receive(:t).and_return(alchemy_module['name'])
     end
 
     context "with permission" do
@@ -78,7 +84,7 @@ describe Alchemy::Admin::NavigationHelper do
     before do
       allow(helper).to receive(:current_alchemy_module).and_return(alchemy_module)
       allow(helper).to receive(:url_for_module_sub_navigation).and_return('')
-      allow(helper).to receive(:_t).and_return(alchemy_module['name'])
+      allow(Alchemy).to receive(:t).and_return(alchemy_module['name'])
     end
 
     context "with permission" do

data/spec/helpers/{admin → alchemy/admin}/pages_helper_spec.rb

@@ -2,38 +2,6 @@ require 'spec_helper'
 
 describe Alchemy::Admin::PagesHelper do
 
-  describe '#sitemap_folder_link' do
-    let(:user) { build(:alchemy_dummy_user, :as_admin) }
-
-    before { allow(helper).to receive(:current_alchemy_user).and_return(user) }
-
-    subject { helper.sitemap_folder_link(page) }
-
-    context "with folded page" do
-      let(:page) { mock_model(Alchemy::Page, folded?: true) }
-
-      it "renders a link with folded class" do
-        is_expected.to match /class="page_folder folded spinner"/
-      end
-
-      it "renders a link with hide title" do
-        is_expected.to match /title="Show childpages"/
-      end
-    end
-
-    context "with collapsed page" do
-      let(:page) { mock_model(Alchemy::Page, folded?: false) }
-
-      it "renders a link with collapsed class" do
-        is_expected.to match /class="page_folder collapsed spinner"/
-      end
-
-      it "renders a link with hide title" do
-        is_expected.to match /title="Hide childpages"/
-      end
-    end
-  end
-
   describe '#preview_sizes_for_select' do
     it "returns a options string of preview screen sizes for select tag" do
       expect(helper.preview_sizes_for_select).to include('option', 'auto', '240', '320', '480', '768', '1024', '1280')
@@ -41,7 +9,7 @@ describe Alchemy::Admin::PagesHelper do
   end
 
   describe '#combined_page_status' do
-    let(:page) { FactoryGirl.build_stubbed(:page, restricted: true, visible: true, public: true, locked: true) }
+    let(:page) { build_stubbed(:alchemy_page, restricted: true, visible: true, public: true, locked: true) }
     subject { helper.combined_page_status(page) }
 
     context 'when page is locked' do
@@ -62,13 +30,13 @@ describe Alchemy::Admin::PagesHelper do
   end
 
   describe '#page_layout_label' do
-    let(:page) { build(:page) }
+    let(:page) { build(:alchemy_page) }
 
     subject { helper.page_layout_label(page) }
 
     context 'when page is not yet persisted' do
       it 'displays text only' do
-        is_expected.to eq(Alchemy::I18n.t(:page_type))
+        is_expected.to eq(Alchemy.t(:page_type))
       end
     end
 
@@ -77,13 +45,13 @@ describe Alchemy::Admin::PagesHelper do
 
       context 'with page layout existing' do
         it 'displays text only' do
-          is_expected.to eq(Alchemy::I18n.t(:page_type))
+          is_expected.to eq(Alchemy.t(:page_type))
         end
       end
 
-      context 'with page layout description missing' do
+      context 'with page layout definition missing' do
         before do
-          expect(page).to receive(:layout_description).and_return([])
+          expect(page).to receive(:definition).and_return([])
         end
 
         it 'displays icon with warning' do

data/spec/helpers/{admin → alchemy/admin}/pictures_helper_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe Alchemy::Admin::PicturesHelper do
   describe "#create_or_assign_url" do
-
     let(:picture) { mock_model('Picture') }
     let(:options) { Hash.new }
 

data/spec/helpers/{admin → alchemy/admin}/tags_helper_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 module Alchemy
   describe Admin::TagsHelper do
-
     let(:tag)    { mock_model(ActsAsTaggableOn::Tag, name: 'foo', count: 1) }
     let(:tag2)   { mock_model(ActsAsTaggableOn::Tag, name: 'abc', count: 1) }
     let(:params) { {controller: 'admin/attachments', action: 'index', use_route: 'alchemy', tagged_with: 'foo'} }
@@ -108,6 +107,5 @@ module Alchemy
         end
       end
     end
-
   end
-end
+end

data/spec/helpers/{base_helper_spec.rb → alchemy/base_helper_spec.rb}

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 module Alchemy
   describe BaseHelper do
-
     describe "#render_message" do
       context "if no argument is passed" do
         it "should render a div with an info icon and the given content" do
@@ -18,7 +17,7 @@ module Alchemy
     end
 
     describe '#page_or_find' do
-      let(:page) { FactoryGirl.create(:public_page) }
+      let(:page) { create(:alchemy_page, :public) }
 
       context "passing a page_layout string" do
         context "of a not existing page" do

data/spec/helpers/{elements_block_helper_spec.rb → alchemy/elements_block_helper_spec.rb}

@@ -4,8 +4,8 @@ include Alchemy::ElementsHelper
 
 module Alchemy
   describe 'ElementsBlockHelper' do
-    let(:page)    { FactoryGirl.create(:public_page) }
-    let(:element) { FactoryGirl.create(:element, page: page, tag_list: 'foo, bar') }
+    let(:page)    { create(:alchemy_page, :public) }
+    let(:element) { create(:alchemy_element, page: page, tag_list: 'foo, bar') }
     let(:expected_wrapper_tag) { "div.#{element.name}##{element_dom_id(element)}" }
 
     describe '#element_view_for' do
@@ -109,7 +109,7 @@ module Alchemy
       describe '#essence' do
         it "should provide the specified content essence" do
           expect(subject).to receive(:content).with(:title).
-            and_return(mock_model('Content', :essence => mock_model('EssenceText')))
+            and_return(mock_model('Content', essence: mock_model('EssenceText')))
 
           subject.essence :title
         end

data/spec/helpers/{elements_helper_spec.rb → alchemy/elements_helper_spec.rb}

@@ -3,8 +3,8 @@ include Alchemy::BaseHelper
 
 module Alchemy
   describe ElementsHelper do
-    let(:page)    { build_stubbed(:public_page) }
-    let(:element) { build_stubbed(:element, name: 'headline', page: page) }
+    let(:page)    { build_stubbed(:alchemy_page, :public) }
+    let(:element) { build_stubbed(:alchemy_element, name: 'headline', page: page) }
 
     before do
       assign(:page, page)
@@ -21,14 +21,14 @@ module Alchemy
       end
 
       context 'with view as part given' do
-        let(:part) {:view}
+        let(:part) { :view }
 
         it "renders the element's view partial" do
           is_expected.to have_selector("##{element.name}_#{element.id}")
         end
 
         context 'with element view partial not found' do
-          let(:element) { build_stubbed(:element, name: 'not_present')}
+          let(:element) { build_stubbed(:alchemy_element, name: 'not_present') }
 
           it "renders the view not found partial" do
             is_expected.to match(/Missing view for not_present element/)
@@ -37,7 +37,7 @@ module Alchemy
       end
 
       context 'with editor as part given' do
-        let(:part) {:editor}
+        let(:part) { :editor }
 
         it "renders the element's editor partial" do
           expect(helper).to receive(:render_essence_editor_by_name)
@@ -45,7 +45,7 @@ module Alchemy
         end
 
         context 'with element editor partial not found' do
-          let(:element) { build_stubbed(:element, name: 'not_present')}
+          let(:element) { build_stubbed(:alchemy_element, name: 'not_present') }
 
           it "renders the editor not found partial" do
             is_expected.to have_selector('div.error')
@@ -66,7 +66,7 @@ module Alchemy
     describe "#render_elements" do
       subject { helper.render_elements(options) }
 
-      let(:another_element) { build_stubbed(:element, page: page) }
+      let(:another_element) { build_stubbed(:alchemy_element, page: page) }
       let(:elements)        { [element, another_element] }
 
       context 'without any options' do
@@ -84,7 +84,7 @@ module Alchemy
 
       context "with from_page option" do
         context 'is a page object' do
-          let(:another_page) { build_stubbed(:public_page) }
+          let(:another_page) { build_stubbed(:alchemy_page, :public) }
           let(:options)      { {from_page: another_page} }
 
           before do
@@ -98,8 +98,8 @@ module Alchemy
         end
 
         context 'is a string' do
-          let(:another_page)    { build_stubbed(:public_page) }
-          let(:another_element) { build_stubbed(:element, page: another_page) }
+          let(:another_page)    { build_stubbed(:alchemy_page, :public) }
+          let(:another_element) { build_stubbed(:alchemy_element, page: another_page) }
           let(:other_elements)  { [another_element] }
           let(:options)         { {from_page: 'news'} }
 
@@ -167,8 +167,8 @@ module Alchemy
       end
 
       context "with option fallback" do
-        let(:another_page)    { build_stubbed(:public_page, name: 'Another Page', page_layout: 'news') }
-        let(:another_element) { build_stubbed(:element, page: another_page, name: 'news') }
+        let(:another_page)    { build_stubbed(:alchemy_page, :public, name: 'Another Page', page_layout: 'news') }
+        let(:another_element) { build_stubbed(:alchemy_element, page: another_page, name: 'news') }
         let(:elements)        { [another_element] }
 
         context 'with string given as :fallback_from' do
@@ -249,7 +249,7 @@ module Alchemy
     describe '#element_tags' do
       subject { element_tags(element, options) }
 
-      let(:element) { build_stubbed(:element) }
+      let(:element) { build_stubbed(:alchemy_element) }
       let(:options) { {} }
 
       context "element having tags" do
@@ -278,9 +278,9 @@ module Alchemy
     describe '#sort_elements_by_content' do
       subject { sort_elements_by_content(elements, 'headline') }
 
-      let(:element_1)    { build_stubbed(:element) }
-      let(:element_2)    { build_stubbed(:element) }
-      let(:element_3)    { build_stubbed(:element) }
+      let(:element_1)    { build_stubbed(:alchemy_element) }
+      let(:element_2)    { build_stubbed(:alchemy_element) }
+      let(:element_3)    { build_stubbed(:alchemy_element) }
       let(:ingredient_a) { double(ingredient: 'a') }
       let(:ingredient_b) { double(ingredient: 'b') }
       let(:ingredient_c) { double(ingredient: 'c') }
@@ -297,7 +297,7 @@ module Alchemy
       end
 
       context 'with element not having this content' do
-        let(:element_4) { build_stubbed(:element) }
+        let(:element_4) { build_stubbed(:alchemy_element) }
         let(:elements)  { [element_1, element_2, element_3, element_4] }
 
         before do
@@ -310,7 +310,7 @@ module Alchemy
       end
 
       context 'with element having content with nil as ingredient' do
-        let(:element_4) { build_stubbed(:element) }
+        let(:element_4) { build_stubbed(:alchemy_element) }
         let(:elements)  { [element_1, element_2, element_3, element_4] }
 
         before do
@@ -322,6 +322,5 @@ module Alchemy
         end
       end
     end
-
   end
 end