alchemy_cms 3.2.1 → 3.3.0.rc1

data/spec/features/picture_security_spec.rb

@@ -1,23 +1,19 @@
 require 'spec_helper'
 
 describe 'Picture renderung security' do
-
-  let(:picture) { Alchemy::Picture.create(:image_file => File.new(File.expand_path('../../fixtures/image.png', __FILE__))) }
+  let(:picture) { Alchemy::Picture.create(image_file: File.new(File.expand_path('../../fixtures/image.png', __FILE__))) }
 
   # Prevent the signup view from being rendered.
   before { allow(Alchemy.user_class).to receive(:count).and_return 1 }
 
   context "passing no security token" do
-
     it 'should return a bad request (400)' do
       visit "/pictures/#{picture.id}/show/image.png"
       expect(page.status_code).to eq(400)
     end
-
   end
 
   context "passing correct security token" do
-
     before do
       visit "/pictures/#{picture.id}/show/image.png?sh=#{picture.security_token}"
     end
@@ -29,7 +25,5 @@ describe 'Picture renderung security' do
     it 'should return status ok (200)' do
       expect(page.status_code).to eq(200)
     end
-
   end
-
 end

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

@@ -9,42 +9,46 @@ module Alchemy
 
       context "with max_images option set to emtpy string" do
         let(:options) { {max_images: ""} }
+
         it { is_expected.to eq(nil) }
       end
 
       context "with max_images option set to '1'" do
         let(:options) { {max_images: "1"} }
+
         it { is_expected.to eq(1) }
       end
 
       context "with maximum_amount_of_images option set to emtpy string" do
         let(:options) { {maximum_amount_of_images: ""} }
+
         it { is_expected.to eq(nil) }
       end
 
       context "with maximum_amount_of_images option set to '1'" do
         let(:options) { {maximum_amount_of_images: "1"} }
+
         it { is_expected.to eq(1) }
       end
     end
 
     describe "#merge_params" do
       before do
-        allow(controller).to receive(:params).and_return({:first => '1', :second => '2'})
+        allow(controller).to receive(:params).and_return({first: '1', second: '2'})
       end
 
       it "returns a hash that contains the current params and additional params given as attributes" do
-        expect(helper.merge_params(:third => '3', :fourth => '4')).to eq({:first => '1', :second => '2', :third => '3', :fourth => '4'})
+        expect(helper.merge_params(third: '3', fourth: '4')).to eq({first: '1', second: '2', third: '3', fourth: '4'})
       end
     end
 
     describe "#merge_params_without" do
       before do
-        allow(controller).to receive(:params).and_return({:first => '1', :second => '2'})
+        allow(controller).to receive(:params).and_return({first: '1', second: '2'})
       end
 
       it "can delete a single param" do
-        expect(helper.merge_params_without(:second)).to eq({:first => '1'})
+        expect(helper.merge_params_without(:second)).to eq({first: '1'})
       end
 
       it "can delete several params" do
@@ -52,35 +56,35 @@ module Alchemy
       end
 
       it "can delete a param and add new params at the same time" do
-        expect(helper.merge_params_without([:first], {:third => '3'})).to eq({:second => '2', :third => '3'})
+        expect(helper.merge_params_without([:first], {third: '3'})).to eq({second: '2', third: '3'})
       end
 
       it "should not change params" do
         helper.merge_params_without([:first])
-        expect(controller.params).to eq({:first => '1', :second => '2'})
+        expect(controller.params).to eq({first: '1', second: '2'})
       end
     end
 
     describe "#merge_params_only" do
       before do
-        allow(controller).to receive(:params).and_return({:first => '1', :second => '2', :third => '3'})
+        allow(controller).to receive(:params).and_return({first: '1', second: '2', third: '3'})
       end
 
       it "can keep a single param" do
-        expect(helper.merge_params_only(:second)).to eq({:second => '2'})
+        expect(helper.merge_params_only(:second)).to eq({second: '2'})
       end
 
       it "can keep several params" do
-        expect(helper.merge_params_only([:first, :second])).to eq({:first => '1', :second => '2'})
+        expect(helper.merge_params_only([:first, :second])).to eq({first: '1', second: '2'})
       end
 
       it "can keep a param and add new params at the same time" do
-        expect(helper.merge_params_only([:first], {:third => '3'})).to eq({:first => '1', :third => '3'})
+        expect(helper.merge_params_only([:first], {third: '3'})).to eq({first: '1', third: '3'})
       end
 
       it "should not change params" do
         helper.merge_params_only([:first])
-        expect(controller.params).to eq({:first => '1', :second => '2', :third => '3'})
+        expect(controller.params).to eq({first: '1', second: '2', third: '3'})
       end
     end
 
@@ -90,7 +94,7 @@ module Alchemy
 
         it "renders a toolbar button" do
           expect(helper.toolbar_button(
-            url: admin_dashboard_path
+                   url: admin_dashboard_path
           )).to match /<div.+class="button_with_label/
         end
       end
@@ -99,9 +103,9 @@ module Alchemy
         before { allow(helper).to receive(:can?).and_return(false) }
 
         it "returns empty string" do
-          expect(helper.toolbar_button(
-            url: admin_dashboard_path
-          )).to be_empty
+          expect(
+            helper.toolbar_button(url: admin_dashboard_path)
+          ).to be_empty
         end
       end
 
@@ -109,10 +113,12 @@ module Alchemy
         before { allow(helper).to receive(:can?).and_return(false) }
 
         it "returns the button" do
-          expect(helper.toolbar_button(
-            url: admin_dashboard_path,
-            skip_permission_check: true
-          )).to match /<div.+class="button_with_label/
+          expect(
+            helper.toolbar_button(
+              url: admin_dashboard_path,
+              skip_permission_check: true
+            )
+          ).to match /<div.+class="button_with_label/
         end
       end
 
@@ -121,10 +127,12 @@ module Alchemy
 
         it "returns reads the permission from url" do
           expect(helper).to receive(:permission_array_from_url)
-          expect(helper.toolbar_button(
-            url: admin_dashboard_path,
-            if_permitted_to: ''
-          )).not_to be_empty
+          expect(
+            helper.toolbar_button(
+              url: admin_dashboard_path,
+              if_permitted_to: ''
+            )
+          ).not_to be_empty
         end
       end
 
@@ -153,11 +161,12 @@ module Alchemy
     end
 
     describe '#clipboard_select_tag_options' do
-      let(:page) { build_stubbed(:page) }
+      let(:page) { build_stubbed(:alchemy_page) }
+
       before { helper.instance_variable_set('@page', page) }
 
       context 'with element items' do
-        let(:element) { build_stubbed(:element) }
+        let(:element) { build_stubbed(:alchemy_element) }
         let(:clipboard_items) { [element] }
 
         it "should include select options with the display name and preview text" do
@@ -167,6 +176,7 @@ module Alchemy
 
         context "when @page can have cells" do
           before { allow(page).to receive(:can_have_cells?).and_return(true) }
+
           it "should group the elements in the clipboard by cell" do
             expect(helper).to receive(:grouped_elements_for_select).and_return({})
             helper.clipboard_select_tag_options(clipboard_items)
@@ -175,7 +185,7 @@ module Alchemy
       end
 
       context 'with page items' do
-        let(:page_in_clipboard) { build_stubbed(:page, name: 'Page name') }
+        let(:page_in_clipboard) { build_stubbed(:alchemy_page, name: 'Page name') }
         let(:clipboard_items) { [page_in_clipboard] }
 
         it "should include select options with page names" do
@@ -207,8 +217,8 @@ module Alchemy
     describe '#alchemy_datepicker' do
       subject { alchemy_datepicker(essence, :date, {value: now}) }
 
-      let(:essence) { EssenceDate.new() }
-      let(:now)     { Time.now }
+      let(:essence) { EssenceDate.new }
+      let(:now)     { Time.current }
 
       it "renders a date field" do
         is_expected.to have_selector("input[type='date']")
@@ -237,7 +247,7 @@ module Alchemy
         let(:user) { double('User', alchemy_display_name: 'Peter Schroeder') }
 
         it "Returns a span showing the name of the currently logged in user." do
-          is_expected.to have_content("#{Alchemy::I18n.t('Logged in as')} Peter Schroeder")
+          is_expected.to have_content("#{Alchemy.t('Logged in as')} Peter Schroeder")
           is_expected.to have_selector("span.current-user-name")
         end
       end

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

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
 describe Alchemy::Admin::ContentsHelper do
-  let(:element) { build_stubbed(:element, name: 'article') }
+  let(:element) { build_stubbed(:alchemy_element, name: 'article') }
   let(:content) { mock_model('Content', essence_partial_name: 'essence_text') }
 
   describe 'render_content_name' do
     let(:content) do
       mock_model 'Content',
         name: 'intro',
-        description: {name: 'intro', type: 'EssenceText'},
+        definition: {name: 'intro', type: 'EssenceText'},
         name_for_label: 'Intro',
         has_validations?: false
     end
@@ -26,8 +26,8 @@ describe Alchemy::Admin::ContentsHelper do
       end
     end
 
-    context 'with missing description' do
-      before { expect(content).to receive(:description).and_return({}) }
+    context 'with missing definition' do
+      before { expect(content).to receive(:definition).and_return({}) }
 
       it "renders a warning" do
         is_expected.to have_selector('span.warning')
@@ -43,23 +43,4 @@ describe Alchemy::Admin::ContentsHelper do
       end
     end
   end
-
-  describe 'render_new_content_link' do
-    subject { helper.render_new_content_link(element) }
-
-    it "renders a link to add new content to element" do
-      allow(helper).to receive(:render_icon).and_return('')
-      is_expected.to match(/a.+href.*admin\/elements\/#{element.id}\/contents\/new/m)
-    end
-  end
-
-  describe 'render_create_content_link' do
-    subject { helper.render_create_content_link(element, 'headline') }
-
-    it "should render a link to create a content in element" do
-      allow(helper).to receive(:render_icon).and_return('')
-      is_expected.to have_selector('a.new_content_link[data-method="post"]')
-    end
-  end
-
 end

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

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 module Alchemy
   describe Admin::ElementsHelper do
-    let(:page)    { build_stubbed(:public_page) }
-    let(:element) { build_stubbed(:element, page: page) }
+    let(:page)    { build_stubbed(:alchemy_page, :public) }
+    let(:element) { build_stubbed(:alchemy_element, page: page) }
 
     context "partial rendering" do
       it "should render an element editor partial" do
@@ -154,15 +154,15 @@ module Alchemy
         end
       end
 
-      context "passing a hash with element descriptions" do
-        let(:element_descriptions) do
+      context "passing a hash with element definitions" do
+        let(:element_definitions) do
           [{
             'name' => 'headline',
             'contents' => []
           }]
         end
 
-        subject { helper.elements_for_select(element_descriptions) }
+        subject { helper.elements_for_select(element_definitions) }
 
         it "should return a array for option tags" do
           expect(subject).to include(['Headline', 'headline'])
@@ -174,5 +174,141 @@ module Alchemy
         end
       end
     end
+
+    describe '#element_editor_classes' do
+      subject { element_editor_classes(element, locals) }
+
+      let(:element) { build_stubbed(:alchemy_element) }
+      let(:locals) { Hash.new }
+
+      it "returns css classes for element editor partial" do
+        is_expected.to include('element-editor')
+      end
+
+      context 'with draggable in locals set to true' do
+        let(:locals) { {draggable: true} }
+        it { is_expected.to include('draggable') }
+      end
+
+      context 'with draggable in locals set to false' do
+        let(:locals) { {draggable: false} }
+        it { is_expected.to include('not-draggable') }
+      end
+
+      context 'with draggable in locals set to nil' do
+        let(:locals) { {draggable: nil} }
+        it { is_expected.to include('draggable') }
+      end
+
+      context 'with element is folded' do
+        let(:element) { build_stubbed(:alchemy_element, folded: true) }
+        it { is_expected.to include('folded') }
+      end
+
+      context 'with element is expanded' do
+        let(:element) { build_stubbed(:alchemy_element, folded: false) }
+        it { is_expected.to include('expanded') }
+      end
+
+      context 'with element is taggable' do
+        before do
+          allow(element).to receive(:taggable?) { true }
+        end
+
+        it { is_expected.to include('taggable') }
+      end
+
+      context 'with element is not taggable' do
+        before do
+          allow(element).to receive(:taggable?) { false }
+        end
+
+        it { is_expected.to include('not-taggable') }
+      end
+
+      context 'with element having content_definitions' do
+        before do
+          allow(element).to receive(:content_definitions) { [1] }
+        end
+
+        it { is_expected.to include('with-contents') }
+      end
+
+      context 'with element not having content_definitions' do
+        before do
+          allow(element).to receive(:content_definitions) { [] }
+        end
+
+        it { is_expected.to include('without-contents') }
+      end
+
+      context 'with element having nestable_elements' do
+        before do
+          allow(element).to receive(:nestable_elements) { [1] }
+        end
+
+        it { is_expected.to include('nestable') }
+      end
+
+      context 'with element not having nestable_elements' do
+        before do
+          allow(element).to receive(:nestable_elements) { [] }
+        end
+
+        it { is_expected.to include('not-nestable') }
+      end
+    end
+
+    describe "#show_element_footer?" do
+      subject { show_element_footer?(element, nestable_elements) }
+      let(:element) { build_stubbed(:alchemy_element) }
+      let(:nestable_elements) { nil }
+
+      context "for folded element" do
+        before { allow(element).to receive(:folded?) { true } }
+        it { is_expected.to eq(false) }
+      end
+
+      context "for expanded element" do
+        before { allow(element).to receive(:folded?) { false } }
+
+        context "with nestable_elements argument" do
+          let(:nestable_elements) { true }
+
+          context "and element having contents defined" do
+            before { allow(element).to receive(:content_definitions) { [1] } }
+            it { is_expected.to eq(true) }
+          end
+
+          context "and element having no contents defined" do
+            before { allow(element).to receive(:content_definitions) { [] } }
+
+            context "and element beeing taggable" do
+              before { allow(element).to receive(:taggable?) { true } }
+              it { is_expected.to eq(true) }
+            end
+
+            context "and element not beeing taggable" do
+              before { allow(element).to receive(:taggable?) { false } }
+              it { is_expected.to eq(false) }
+            end
+          end
+        end
+
+        context "without nestable_elements argument" do
+          let(:nestable_elements) { nil }
+
+          context "and element having no nestable elements defined" do
+            before { allow(element).to receive(:nestable_elements) { [] } }
+            it { is_expected.to eq(true) }
+          end
+
+          context "and element having nestable elements defined" do
+            before { allow(element).to receive(:nestable_elements) { [1] } }
+            it { is_expected.to eq(false) }
+          end
+        end
+      end
+    end
   end
 end