alchemy_cms 2.8.3 → 2.9.0

data/spec/helpers/base_helper_spec.rb

@@ -3,16 +3,24 @@ require 'spec_helper'
 module Alchemy
   describe BaseHelper do
 
+    describe "#render_icon" do
+      subject { render_icon(:user) }
+
+      it "renders an span with icon and the icon name as class name" do
+        should have_selector('span.icon.user')
+      end
+    end
+
     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
-          helper.render_message{ content_tag(:p, "my notice") }.should match(/<div class="info message"><span class="icon info"><\/span><p>my notice/)
+          helper.render_message { content_tag(:p, "my notice") }.should match(/<div class="info message"><span class="icon info"><\/span><p>my notice/)
         end
       end
 
       context "if an argument is passed" do
         it "should render the passed argument as the css classname for the icon container" do
-          helper.render_message(:error){ content_tag(:p, "my notice") }.should match(/<div class="error message"><span class="icon error">/)
+          helper.render_message(:error) { content_tag(:p, "my notice") }.should match(/<div class="error message"><span class="icon error">/)
         end
       end
     end
@@ -83,7 +91,6 @@ module Alchemy
           expect(helper.page_or_find(page)).to eq(page)
         end
       end
-
     end
 
   end

data/spec/helpers/pages_helper_spec.rb

@@ -21,7 +21,7 @@ module Alchemy
     let(:klingonian_public_page)    { FactoryGirl.create(:public_page, :language => klingonian, :parent_id => klingonian_language_root.id) }
 
     before do
-      Config.stub!(:get) { |arg| arg == :url_nesting ? true : Config.parameter(arg) }
+      Config.stub(:get) { |arg| arg == :url_nesting ? true : Config.parameter(arg) }
       @root_page = language_root # We need this instance variable in the helpers
     end
 
@@ -78,9 +78,11 @@ module Alchemy
         end
 
         context "as registered user" do
+          let(:user) { mock_model('User', alchemy_roles: %w(registered), role_symbols: [:registered]) }
+
           before do
             restricted_page
-            Authorization.stub!(:current_user).and_return(FactoryGirl.build(:registered_user))
+            Authorization.current_user = user
           end
 
           it "should render also restricted pages" do
@@ -88,12 +90,16 @@ module Alchemy
             helper.render_navigation.should match(/#{restricted_page.name}/)
             helper.render_navigation.should match(/#{not_restricted_page.name}/)
           end
+
+          after do
+            Authorization.current_user = nil
+          end
         end
 
         context "with enabled url nesting" do
 
           before do
-            helper.stub!(:configuration).and_return(true)
+            helper.stub(:configuration).and_return(true)
             level_3_page
           end
 
@@ -262,12 +268,18 @@ module Alchemy
       end
 
       context "with options[:restricted_only] set to true" do
-        before { Authorization.current_user = FactoryGirl.build(:registered_user) }
+        before do
+          Authorization.current_user = mock_model('User', alchemy_roles: %w(registered), role_symbols: [:registered])
+        end
 
         it "should render a breadcrumb of restricted pages only" do
           page.update_attributes!(restricted: true, urlname: 'a-restricted-public-page', name: 'A restricted Public Page', title: 'A restricted Public Page')
           helper.render_breadcrumb(page: page, restricted_only: true).strip.should match(/^(<span(.[^>]+)>)A restricted Public Page/)
         end
+
+        after do
+          Authorization.current_user = nil
+        end
       end
 
       it "should render a breadcrumb of visible pages only" do
@@ -303,35 +315,37 @@ module Alchemy
         end
       end
 
-      it "should render meta keywords of current page" do
-        @page = mock_model('Page', :language => language, :title => 'A Public Page', :meta_description => '', :meta_keywords => 'keyword1, keyword2', :robot_index? => false, :robot_follow? => false, :contains_feed? => false, :updated_at => '2011-11-29-23:00:00')
-        helper.render_meta_data.should have_selector('meta[name="keywords"][content="keyword1, keyword2"]')
-      end
+      context "@page is set" do
+        let(:page) { mock_model('Page', language: language, title: 'A Public Page', meta_description: 'blah blah', meta_keywords: 'keyword1, keyword2', robot_index?: false, robot_follow?: false, contains_feed?: false, updated_at: '2011-11-29-23:00:00') }
+        before { helper.instance_variable_set('@page', page) }
+        subject { helper.render_meta_data }
+
+        it "should render meta keywords of current page" do
+          should match /meta name="keywords" content="keyword1, keyword2"/
+        end
 
-      it "should render meta description 'blah blah' of current page" do
-        @page = mock_model('Page', :language => language, :title => 'A Public Page', :meta_description => 'blah blah', :meta_keywords => '', :robot_index? => false, :robot_follow? => false, :contains_feed? => false, :updated_at => '2011-11-29-23:00:00')
-        helper.render_meta_data.should have_selector('meta[name="description"][content="blah blah"]')
+        it "should render meta description 'blah blah' of current page" do
+          should match /meta name="description" content="blah blah"/
+        end
       end
     end
 
     describe "#render_title_tag" do
+      let(:page) { mock_model('Page', title: 'A Public Page') }
+      before { helper.instance_variable_set('@page', page) }
 
       it "should render a title tag for current page" do
-        @page = mock_model('Page', :title => 'A Public Page')
-        helper.render_title_tag.should have_selector('title[contains("A Public Page")]')
+        helper.render_title_tag.should match /<title>A Public Page<\/title>/
       end
 
       it "should render a title tag for current page with a prefix and a seperator" do
-        @page = mock_model('Page', :title => 'A Public Page')
-        helper.render_title_tag(:prefix => 'Peters Petshop', :seperator => ' ### ').should have_selector('title[contains("Peters Petshop ### A Public Page")]')
+        helper.render_title_tag(prefix: 'Peters Petshop', seperator: ' ### ').should match /<title>Peters Petshop ### A Public Page<\/title>/
       end
 
     end
 
     describe "#language_links" do
-
       context "with two public languages" do
-
         # Always create second language
         before { klingonian }
 
@@ -342,7 +356,6 @@ module Alchemy
         end
 
         context "with two language root pages" do
-
           # Always create a language root page for klingonian
           before { klingonian_language_root }
 
@@ -393,7 +406,7 @@ module Alchemy
           context "with options[:show_title]" do
             context "set to true" do
               it "should render the language links with titles" do
-                helper.stub!(:_t).and_return("my title")
+                helper.stub(:_t).and_return("my title")
                 expect(helper.language_links(show_title: true)).to have_selector('a[title="my title"]')
               end
             end
@@ -404,11 +417,8 @@ module Alchemy
               end
             end
           end
-
         end
-
       end
-
     end
 
     describe "#picture_essence_caption" do

data/spec/models/attachment_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 module Alchemy
   describe Attachment do
-    let(:file) { File.new(File.expand_path('../../support/image with spaces.png', __FILE__)) }
+    let(:file) { File.new(File.expand_path('../../fixtures/image with spaces.png', __FILE__)) }
     let(:attachment) { Attachment.new(:file => file) }
 
     describe 'after create' do

data/spec/models/element_spec.rb

@@ -34,7 +34,7 @@ module Alchemy
 
     describe '.definitions' do
       context "without existing yml files" do
-        before { File.stub!(:exists?).and_return(false) }
+        before { File.stub(:exists?).and_return(false) }
 
         it "should raise an error" do
           expect { Element.definitions }.to raise_error(LoadError)
@@ -42,7 +42,7 @@ module Alchemy
       end
 
       context "without any definitions in elements.yml" do
-        before { YAML.stub!(:load_file).and_return(false) } # Yes, YAML.load_file returns false if an empty file exists.
+        before { YAML.stub(:load_file).and_return(false) } # Yes, YAML.load_file returns false if an empty file exists.
 
         it "should return an empty array" do
           Element.definitions.should == []
@@ -66,7 +66,7 @@ module Alchemy
         FactoryGirl.create(:element, :name => 'article')
         FactoryGirl.create(:element, :name => 'article')
         excluded = FactoryGirl.create(:element, :name => 'claim')
-        Element.excluded(['claim']).all.should_not include(excluded)
+        Element.excluded(['claim']).should_not include(excluded)
       end
     end
 
@@ -74,7 +74,7 @@ module Alchemy
       it "should return all elements by name" do
         element_1 = FactoryGirl.create(:element, :name => 'article')
         element_2 = FactoryGirl.create(:element, :name => 'article')
-        elements = Element.named(['article']).all
+        elements = Element.named(['article'])
         elements.should include(element_1)
         elements.should include(element_2)
       end
@@ -100,25 +100,21 @@ module Alchemy
     end
 
     context 'trash' do
+      let(:element) { FactoryGirl.create(:element, page_id: 1) }
+
       describe '.not_trashed' do
-        let(:element) do
-          FactoryGirl.create(:element, :page_id => 1)
-        end
+        before { element }
 
         it "should return a collection of not trashed elements" do
-          Element.not_trashed.should include(element)
+          expect(Element.not_trashed.to_a).to eq([element])
         end
       end
 
       describe ".trashed" do
-        let(:element) do
-          FactoryGirl.create(:element, :page_id => 1)
-        end
+        before { element.trash! }
 
         it "should return a collection of trashed elements" do
-          not_trashed_element = FactoryGirl.create(:element)
-          element.trash
-          Element.trashed.should include(element)
+          expect(Element.trashed.to_a).to eq([element])
         end
       end
     end
@@ -178,7 +174,7 @@ module Alchemy
 
       context "with page having cells defining the correct elements" do
         before do
-          Cell.stub!(:definitions).and_return([
+          Cell.stub(:definitions).and_return([
             {'name' => 'header', 'elements' => ['article', 'headline']},
             {'name' => 'footer', 'elements' => ['article', 'text']},
             {'name' => 'sidebar', 'elements' => ['teaser']}
@@ -203,7 +199,7 @@ module Alchemy
 
       context "with page having cells defining the wrong elements" do
         before do
-          Cell.stub!(:definitions).and_return([
+          Cell.stub(:definitions).and_return([
             {'name' => 'header', 'elements' => ['download', 'headline']},
             {'name' => 'footer', 'elements' => ['contactform', 'text']},
             {'name' => 'sidebar', 'elements' => ['teaser']}
@@ -298,7 +294,7 @@ module Alchemy
 
       context "without a content marked as preview" do
         let(:contents) { [content, content_2] }
-        before { element.stub!(:contents).and_return(contents) }
+        before { element.stub(:contents).and_return(contents) }
 
         it "returns the preview text of first content found" do
           content.should_receive(:preview_text).with(30)
@@ -308,7 +304,7 @@ module Alchemy
 
       context "with a content marked as preview" do
         let(:contents) { [content, preview_content] }
-        before { element.stub!(:contents).and_return(contents) }
+        before { element.stub(:contents).and_return(contents) }
 
         it "should return the preview_text of this content" do
           preview_content.should_receive(:preview_text).with(30)
@@ -317,7 +313,7 @@ module Alchemy
       end
 
       context "without any contents present" do
-        before { element.stub!(:contents).and_return([]) }
+        before { element.stub(:contents).and_return([]) }
 
         it "should return nil" do
           element.preview_text.should be_nil
@@ -375,34 +371,6 @@ module Alchemy
       end
     end
 
-    describe '#save' do
-      let(:time) { Time.now }
-      let(:locker) { FactoryGirl.build_stubbed(:user) }
-      let(:page) { FactoryGirl.create(:page, updated_at: time) }
-      let(:element) { FactoryGirl.create(:element, page: page) }
-
-      before { User.stub(:stamper).and_return(locker.id) }
-
-      it "updates page timestamps" do
-        element.save
-        page.reload
-        page.updated_at.should_not eq(time)
-      end
-
-      it "updates page userstamps" do
-        element.save
-        page.reload
-        page.updater_id.should eq(locker.id)
-      end
-    end
-
-    describe '#save_contents' do
-      it "should return true if attributes hash is nil" do
-        element = FactoryGirl.create(:element, create_contents_after_create: true)
-        element.save_contents(nil).should be_true
-      end
-    end
-
     describe '#taggable?' do
       let(:element) { FactoryGirl.build(:element) }
 
@@ -428,20 +396,28 @@ module Alchemy
       end
     end
 
-    describe '#trash' do
-      let(:element)         { FactoryGirl.create(:element, :page_id => 1, :cell_id => 1) }
-      let(:trashed_element) { element.trash ; element }
+    describe '#trash!' do
+      let(:element)         { FactoryGirl.create(:element, page_id: 1, cell_id: 1) }
+      let(:trashed_element) { element.trash! ; element }
       subject               { trashed_element }
 
       it             { should_not be_public }
+      it             { should be_folded }
       its(:position) { should be_nil }
-      specify        { expect { element.trash }.to_not change(element, :page_id) }
-      specify        { expect { element.trash }.to_not change(element, :cell_id) }
-
-      it "it should be possible to trash more than one element from the same page" do
-        trashed_element_2 = FactoryGirl.create(:element, :page_id => 1)
-        trashed_element_2.trash
-        Element.trashed.should include(trashed_element, trashed_element_2)
+      specify        { expect { element.trash! }.to_not change(element, :page_id) }
+      specify        { expect { element.trash! }.to_not change(element, :cell_id) }
+
+      context "with already one trashed element on the same page" do
+        let(:element_2) { FactoryGirl.create(:element, page_id: 1) }
+        before {
+          trashed_element
+          element_2
+        }
+
+        it "it should be possible to trash another" do
+          element_2.trash!
+          expect(Element.trashed.to_a).to include(trashed_element, element_2)
+        end
       end
     end
 

data/spec/models/message_spec.rb

@@ -23,21 +23,5 @@ module Alchemy
         message.attributes
       end
     end
-
-    describe '#email_is_filled' do
-      context 'if email attribute is filled' do
-        it "should return true" do
-          message.stub!(:email).and_return('me@you.com')
-          expect(message.send(:email_is_filled)).to eq(true)
-        end
-      end
-
-      context 'if email attribute is not filled' do
-        it "should return false" do
-          message.stub!(:email).and_return('')
-          expect(message.send(:email_is_filled)).to eq(false)
-        end
-      end
-    end
   end
 end

data/spec/models/page_spec.rb

@@ -356,7 +356,7 @@ module Alchemy
       context "page with trashed elements" do
         before do
           page.elements << FactoryGirl.create(:element)
-          page.elements.first.trash
+          page.elements.first.trash!
         end
 
         it "the copy should not hold a copy of the trashed elements" do
@@ -421,7 +421,7 @@ module Alchemy
 
         it "should add a user stamper" do
           page = FactoryGirl.create(:page, :name => 'A', :language => language, :parent_id => language_root.id)
-          page.class.stamper_class.to_s.should == 'Alchemy::User'
+          page.class.stamper_class.to_s.should == 'User'
         end
       end
     end
@@ -609,7 +609,7 @@ module Alchemy
     describe '#destroy' do
       context "with trashed but still assigned elements" do
 
-        before { news_page.elements.map(&:trash) }
+        before { news_page.elements.map(&:trash!) }
 
         it "should not delete the trashed elements" do
           news_page.destroy
@@ -824,19 +824,25 @@ module Alchemy
       describe '#folded?' do
         let(:page) { Page.new }
 
-        context 'if page is folded' do
+        context 'with user is a active record model' do
           before do
-            page.stub_chain(:folded_pages, :find_by_user_id).and_return(mock_model('FoldedPage', folded: true))
+            Alchemy.user_class.should_receive(:'<').and_return(true)
           end
 
-          it "should return true" do
-            expect(page.folded?(user.id)).to eq(true)
+          context 'if page is folded' do
+            before do
+              page.stub_chain(:folded_pages, :where, :any?).and_return(true)
+            end
+
+            it "should return true" do
+              expect(page.folded?(user.id)).to eq(true)
+            end
           end
-        end
 
-        context 'if page is not folded' do
-          it "should return false" do
-            expect(page.folded?(101093)).to eq(false)
+          context 'if page is not folded' do
+            it "should return false" do
+              expect(page.folded?(101093)).to eq(false)
+            end
           end
         end
       end
@@ -1291,32 +1297,62 @@ module Alchemy
 
     context 'indicate page editors' do
       let(:page) { Page.new }
-      let(:user) { User.new(firstname: 'Paul', lastname: 'Page') }
 
-      describe '#creator_name' do
-        before { page.stub(:creator).and_return(user) }
+      context 'with user class having a name accessor' do
+        let(:user) { Alchemy.user_class_name = double(name: 'Paul Page') }
+
+        describe '#creator_name' do
+          before { page.stub(:creator).and_return(user) }
 
-        it "should return the name of the creator" do
-          expect(page.creator_name).to eq('Paul Page')
+          it "returns the name of the creator" do
+            expect(page.creator_name).to eq('Paul Page')
+          end
         end
-      end
 
-      describe '#updater_name' do
-        before { page.stub(:updater).and_return(user) }
+        describe '#updater_name' do
+          before { page.stub(:updater).and_return(user) }
 
-        it "should return the name of the updater" do
-          expect(page.updater_name).to eq('Paul Page')
+          it "returns the name of the updater" do
+            expect(page.updater_name).to eq('Paul Page')
+          end
         end
-      end
 
-      describe '#locker_name' do
-        before { page.stub(:locker).and_return(user) }
+        describe '#locker_name' do
+          before { page.stub(:locker).and_return(user) }
 
-        it "should return the name of the current page editor" do
-          expect(page.locker_name).to eq('Paul Page')
+          it "returns the name of the current page editor" do
+            expect(page.locker_name).to eq('Paul Page')
+          end
         end
       end
 
+      context 'with user class not having a name accessor' do
+        let(:user) { Alchemy.user_class.new }
+
+        describe '#creator_name' do
+          before { page.stub(:creator).and_return(user) }
+
+          it "returns unknown" do
+            expect(page.creator_name).to eq('unknown')
+          end
+        end
+
+        describe '#updater_name' do
+          before { page.stub(:updater).and_return(user) }
+
+          it "returns unknown" do
+            expect(page.updater_name).to eq('unknown')
+          end
+        end
+
+        describe '#locker_name' do
+          before { page.stub(:locker).and_return(user) }
+
+          it "returns unknown" do
+            expect(page.locker_name).to eq('unknown')
+          end
+        end
+      end
     end
 
     describe '#controller_and_action' do