alchemy_cms 2.2.rc6 → 2.2.rc7

data/spec/integration/admin/modules_integration_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'support/integration_spec_helper'
+
+describe "Modules" do
+
+  before(:all) do
+    FactoryGirl.build(:admin_user).save_without_session_maintenance
+  end
+  describe "a custom module with a main-apps controller" do
+    it "should have a button in main_navigation, pointing to the configured controller" do
+      Alchemy::Modules.register_module(
+        {
+          :name => 'events',
+          :navigation => {
+            :icon => 'icon events',
+            :name => 'Events',
+            :controller => '/admin/events',
+            :action => 'index'
+          }
+        })
+      login_into_alchemy
+      without_access_control do
+        visit '/alchemy/admin'
+        click_on 'Events'
+        page.should_not have_content('Upps!')
+      end
+    end
+  end
+
+end

data/spec/integration/admin/pages_controller_spec.rb

@@ -10,10 +10,10 @@ unless ENV["CI"]
       context "in a multilangual environment" do
 
         before(:all) do
-          Factory.build(:admin_user).save_without_session_maintenance
-          @language = Factory(:language)
-          @german_root = Factory(:language_root_page, :language => Alchemy::Language.get_default, :name => 'Deutsch')
-          @klingonian_root = Factory(:language_root_page, :name => 'Klingonian')
+          FactoryGirl.build(:admin_user).save_without_session_maintenance
+          @language = FactoryGirl.create(:language)
+          @german_root = FactoryGirl.create(:language_root_page, :language => Alchemy::Language.get_default, :name => 'Deutsch')
+          @klingonian_root = FactoryGirl.create(:language_root_page, :name => 'Klingonian')
         end
 
         it "one should be able to switch the language tree" do
@@ -34,8 +34,8 @@ unless ENV["CI"]
       context "with no language root page" do
 
         before(:all) do
-          Factory.build(:admin_user).save_without_session_maintenance
-          @language = Factory(:language)
+          FactoryGirl.build(:admin_user).save_without_session_maintenance
+          @language = FactoryGirl.create(:language)
         end
 
         it "it should display the form for creating language root" do
@@ -56,7 +56,7 @@ unless ENV["CI"]
     describe "flush complete page cache" do
 
       before(:all) do
-        Factory.build(:admin_user).save_without_session_maintenance
+        FactoryGirl.build(:admin_user).save_without_session_maintenance
       end
 
       it "should remove the cache of all pages" do

data/spec/integration/pages_controller_spec.rb

@@ -1,26 +1,27 @@
+require 'ostruct'
 require 'spec_helper'
 
 describe Alchemy::PagesController do
 
   before(:each) do
     @default_language = Alchemy::Language.get_default
-    @default_language_root = Factory(:language_root_page, :language => @default_language, :name => 'Home')
+    @default_language_root = FactoryGirl.create(:language_root_page, :language => @default_language, :name => 'Home')
   end
 
   describe "#show" do
 
     it "should include all its elements and contents" do
-      p = Factory(:public_page, :language => @default_language)
+      p = FactoryGirl.create(:public_page, :language => @default_language)
       article = p.elements.find_by_name('article')
       article.content_by_name('intro').essence.update_attributes(:body => 'Welcome to Peters Petshop', :public => true)
-      visit '/alchemy/a-public-page'
+      visit "/alchemy/#{p.urlname}"
       within('div#content div.article div.intro') { page.should have_content('Welcome to Peters Petshop') }
     end
 
     it "should show the navigation with all visible pages" do
       pages = [
-        Factory(:public_page, :language => @default_language, :visible => true, :name => 'Page 1', :parent_id => @default_language_root.id),
-        Factory(:public_page, :language => @default_language, :visible => true, :name => 'Page 2', :parent_id => @default_language_root.id)
+        FactoryGirl.create(:public_page, :language => @default_language, :visible => true, :name => 'Page 1', :parent_id => @default_language_root.id),
+        FactoryGirl.create(:public_page, :language => @default_language, :visible => true, :name => 'Page 2', :parent_id => @default_language_root.id)
       ]
       visit '/alchemy/'
       within('div#navigation ul') { page.should have_selector('li a[href="/alchemy/page-1"], li a[href="/alchemy/page-2"]') }
@@ -31,9 +32,9 @@ describe Alchemy::PagesController do
   describe "fulltext search" do
 
     before(:each) do
-      @page = Factory(:public_page, :language => @default_language, :visible => true, :name => 'Page 1', :parent_id => @default_language_root.id)
-      @element = Factory(:element, :name => 'article', :page => @page)
-      Factory(:public_page, :language => @default_language, :name => 'Suche', :page_layout => 'search', :parent_id => @default_language_root.id)
+      @page = FactoryGirl.create(:public_page, :language => @default_language, :visible => true, :name => 'Page 1', :parent_id => @default_language_root.id)
+      @element = FactoryGirl.create(:element, :name => 'article', :page => @page)
+      FactoryGirl.create(:public_page, :language => @default_language, :name => 'Suche', :page_layout => 'search', :parent_id => @default_language_root.id)
     end
 
     it "should have a correct path in the form tag" do
@@ -85,20 +86,20 @@ describe Alchemy::PagesController do
     context "in multi language mode" do
 
       before(:each) do
-        @page = Factory(:public_page)
+        @page = FactoryGirl.create(:public_page)
         Alchemy::Config.stub!(:get) { |arg| arg == :url_nesting ? true : Alchemy::Config.parameter(arg) }
       end
 
-      it "should redirect to url with nested language code" do
-        visit '/alchemy/a-public-page'
-        page.current_path.should == '/alchemy/de/a-public-page'
+      it "should redirect to url with nested language code if no language params are given" do
+        visit "/alchemy/#{@page.urlname}"
+        page.current_path.should == "/alchemy/#{@page.language_code}/#{@page.urlname}"
       end
 
       context "should redirect to public child" do
 
         before(:each) do
           @page.update_attributes(:public => false, :name => 'Not Public', :urlname => '')
-          @child = Factory(:public_page, :name => 'Public Child', :parent_id => @page.id)
+          @child = FactoryGirl.create(:public_page, :name => 'Public Child', :parent_id => @page.id)
           Alchemy::Config.stub!(:get) { |arg| arg == :url_nesting ? false : Alchemy::Config.parameter(arg) }
         end
 
@@ -114,27 +115,40 @@ describe Alchemy::PagesController do
 
       end
 
-      it "should redirect to pages url, if requested url is index url" do
+      it "should redirect to pages url with default language, if requested url is index url" do
         visit '/alchemy/'
         page.current_path.should == '/alchemy/de/home'
       end
 
-      it "should redirect to pages url, if requested url is only the language code" do
+      it "should redirect to pages url with default language, if requested url is only the language code" do
         visit '/alchemy/de'
         page.current_path.should == '/alchemy/de/home'
       end
 
+      context "requested url is only the urlname" do
+        it "then it should redirect to pages url with nested language." do
+          visit '/alchemy/home'
+          page.current_path.should == '/alchemy/de/home'
+        end
+      end
+
       it "should keep additional params" do
-        visit '/alchemy/a-public-page?query=Peter'
+        visit "/alchemy/#{@page.urlname}?query=Peter"
         page.current_url.should match(/\?query=Peter/)
       end
 
+      it "should render 404 if urlname and lang parameter do not belong to same page" do
+        Alchemy::User.stub!(:admins).and_return(OpenStruct.new(:count => 2))
+        visit "/alchemy/en/#{@page.urlname}"
+        page.status_code.should == 404
+      end
+
       context "with url nesting" do
 
         before(:each) do
-          @level1 = Factory(:public_page, :parent_id => @default_language_root.id, :name => 'catalog', :language => @default_language)
-          @level2 = Factory(:public_page, :parent_id => @level1.id, :name => 'products', :language => @default_language)
-          @level3 = Factory(:public_page, :parent_id => @level2.id, :name => 'screwdriver', :language => @default_language)
+          @level1 = FactoryGirl.create(:public_page, :parent_id => @default_language_root.id, :name => 'catalog', :language => @default_language)
+          @level2 = FactoryGirl.create(:public_page, :parent_id => @level1.id, :name => 'products', :language => @default_language)
+          @level3 = FactoryGirl.create(:public_page, :parent_id => @level2.id, :name => 'screwdriver', :language => @default_language)
         end
 
         context "enabled" do
@@ -184,13 +198,13 @@ describe Alchemy::PagesController do
     context "not in multi language mode" do
 
       before(:each) do
-        @page = Factory(:public_page, :language => @default_language, :parent_id => @default_language_root.id)
+        @page = FactoryGirl.create(:public_page, :language => @default_language, :parent_id => @default_language_root.id)
         Alchemy::Config.stub!(:get) { |arg| arg == :url_nesting ? false : Alchemy::Config.parameter(arg) }
       end
 
       it "should redirect from nested language code url to normal url" do
-        visit '/alchemy/de/a-public-page'
-        page.current_path.should == '/alchemy/a-public-page'
+        visit "/alchemy/de/#{@page.urlname}"
+        page.current_path.should == "/alchemy/#{@page.urlname}"
       end
 
       context "with no lang parameter" do
@@ -211,7 +225,7 @@ describe Alchemy::PagesController do
 
         before(:each) do
           @page.update_attributes(:public => false, :name => 'Not Public', :urlname => '')
-          @child = Factory(:public_page, :name => 'Public Child', :parent_id => @page.id, :language => @default_language)
+          @child = FactoryGirl.create(:public_page, :name => 'Public Child', :parent_id => @page.id, :language => @default_language)
         end
 
         it "if requested page is unpublished" do
@@ -232,7 +246,7 @@ describe Alchemy::PagesController do
       end
 
       it "should keep additional params" do
-        visit '/alchemy/de/a-public-page?query=Peter'
+        visit "/alchemy/de/#{@page.urlname}?query=Peter"
         page.current_url.should match(/\?query=Peter/)
       end
 

data/spec/integration/security_spec.rb

@@ -19,7 +19,7 @@ describe "Security: " do
   context "If user is present" do
 
     before(:all) do
-      Factory.build(:admin_user).save_without_session_maintenance
+      FactoryGirl.build(:admin_user).save_without_session_maintenance
     end
 
     it "a visitor should not be able to signup" do

data/spec/models/content_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Alchemy::Content do
 
   it "should return the ingredient from its essence" do
-    @element = Factory(:element, :name => 'headline')
+    @element = FactoryGirl.create(:element, :name => 'headline')
     @content = @element.contents.find_by_essence_type('Alchemy::EssenceText')
     @content.essence.update_attributes(:body => "Hello")
     @content.ingredient.should == "Hello"
@@ -52,21 +52,21 @@ describe Alchemy::Content do
   describe '#update_essence' do
 
     it "should update the attributes of related essence and return true" do
-      @element = Factory(:element, :name => 'text')
+      @element = FactoryGirl.create(:element, :name => 'text')
       @content = @element.contents.first
       @content.update_essence(:body => 'Mikes Petshop')
       @content.ingredient.should == "Mikes Petshop"
     end
 
     it "should add error messages if save fails and return false" do
-      @element = Factory(:element, :name => 'contactform')
+      @element = FactoryGirl.create(:element, :name => 'contactform')
       @content = @element.contents.first
       @content.update_essence
       @content.errors[:essence].should have(1).item
     end
 
     it "should raise error if essence is missing" do
-      @element = Factory(:element, :name => 'text')
+      @element = FactoryGirl.create(:element, :name => 'text')
       @content = @element.contents.first
       @content.update_essence
     end
@@ -76,7 +76,7 @@ describe Alchemy::Content do
   describe '#copy' do
 
     before(:each) do
-      @element = Factory(:element, :name => 'text')
+      @element = FactoryGirl.create(:element, :name => 'text')
       @content = @element.contents.first
     end
 

data/spec/models/element_spec.rb

@@ -9,26 +9,26 @@ describe Alchemy::Element do
     end
 
     it "should return all public elements" do
-      elements = [Factory(:element, :public => true), Factory(:element, :public => true)]
+      elements = [FactoryGirl.create(:element, :public => true), FactoryGirl.create(:element, :public => true)]
       Alchemy::Element.published.all.should == elements
     end
 
     it "should return all elements by name" do
-      elements = [Factory(:element, :name => 'article'), Factory(:element, :name => 'article')]
+      elements = [FactoryGirl.create(:element, :name => 'article'), FactoryGirl.create(:element, :name => 'article')]
       Alchemy::Element.named(['article']).all.should == elements
     end
 
     it "should return all elements but excluded ones" do
-      Factory(:element, :name => 'article')
-      Factory(:element, :name => 'article')
-      excluded = [Factory(:element, :name => 'claim')]
+      FactoryGirl.create(:element, :name => 'article')
+      FactoryGirl.create(:element, :name => 'article')
+      excluded = [FactoryGirl.create(:element, :name => 'claim')]
       Alchemy::Element.excluded(['article']).all.should == excluded
     end
 
     context "not_in_cell" do
       it "should return all elements that are not in a cell" do
-        Factory(:element, :cell_id => 6)
-        Factory(:element, :cell_id => nil)
+        FactoryGirl.create(:element, :cell_id => 6)
+        FactoryGirl.create(:element, :cell_id => nil)
         Alchemy::Element.not_in_cell.should have(1).element
       end
     end
@@ -55,7 +55,7 @@ describe Alchemy::Element do
   context "retrieving contents, essences and ingredients" do
 
     before(:each) do
-      @element = Factory(:element, :name => 'news')
+      @element = FactoryGirl.create(:element, :name => 'news')
     end
 
     it "should return an ingredient by name" do
@@ -73,11 +73,16 @@ describe Alchemy::Element do
   end
 
   it "should return a collection of trashed elements" do
-    @element = Factory(:element)
+    @element = FactoryGirl.create(:element)
     @element.trash
     Alchemy::Element.trashed.should include(@element)
   end
 
+  it "should return a collection of not trashed elements" do
+    @element = FactoryGirl.create(:element, :page_id => 1)
+    Alchemy::Element.not_trashed.should include(@element)
+  end
+
   context "limited amount" do
     before(:each) do
       descriptions = Alchemy::Element.descriptions
@@ -98,7 +103,7 @@ describe Alchemy::Element do
         'elements' => ['column_headline', 'unique_headline'],
         'autogenerate' => ['unique_headline', 'column_headline', 'column_headline', 'column_headline']
       )
-      @page = Factory(:page, :page_layout => 'columns')
+      @page = FactoryGirl.create(:page, :page_layout => 'columns')
     end
 
     it "should be readable" do
@@ -119,7 +124,7 @@ describe Alchemy::Element do
   context "trashed" do
 
     before(:each) do
-      @element = Factory(:element)
+      @element = FactoryGirl.create(:element)
       @element.trash
     end
 
@@ -144,7 +149,7 @@ describe Alchemy::Element do
   describe "#content_by_type" do
 
     before(:each) do
-      @element = Factory(:element, :name => 'headline')
+      @element = FactoryGirl.create(:element, :name => 'headline')
       @content = @element.contents.first
     end
 
@@ -169,7 +174,7 @@ describe Alchemy::Element do
   describe "#all_contents_by_type" do
 
     before(:each) do
-      @element = Factory(:element)
+      @element = FactoryGirl.create(:element)
       @contents = @element.contents.select { |c| c.essence_type == 'Alchemy::EssenceText' }
     end
 
@@ -194,7 +199,7 @@ describe Alchemy::Element do
   describe '#copy' do
 
     before(:each) do
-      @element = Factory(:element)
+      @element = FactoryGirl.create(:element)
     end
 
     it "should not create contents from scratch" do
@@ -214,4 +219,44 @@ describe Alchemy::Element do
 
   end
 
+  describe "Finding previous or next element." do
+     
+    before(:each) do
+      @page = FactoryGirl.create(:language_root_page)
+      @page.elements.delete_all
+      @element1 = FactoryGirl.create(:element, :page => @page, :name => 'headline')
+      @element2 = FactoryGirl.create(:element, :page => @page)
+      @element3 = FactoryGirl.create(:element, :page => @page, :name => 'text')
+    end
+
+    describe '#prev' do
+
+      it "should return previous element on same page" do
+        @element2.prev.should == @element1
+      end
+
+      context "with name as parameter" do
+        it "should return previous of this kind" do
+          @element3.prev('headline').should == @element1
+        end
+      end
+
+    end    
+
+    describe '#next' do
+
+      it "should return next element on same page" do
+        @element1.next.should == @element2
+      end
+
+      context "with name as parameter" do
+        it "should return next of this kind" do
+          @element1.next('text').should == @element3
+        end
+      end
+
+    end
+
+  end
+
 end

data/spec/models/language_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 describe Alchemy::Language do
 
   before(:each) do
-    @language = Factory(:language)
+    @language = FactoryGirl.create(:language)
   end
 
   it "should return a label for code" do
@@ -30,7 +30,7 @@ describe Alchemy::Language do
       end
 
       it "should update all associated Pages with self.code as value for Page#language_code" do
-        @page = Factory(:page, :language => @language)
+        @page = FactoryGirl.create(:page, :language => @language)
         @language.country_code = 'cr'
         @language.save
         @page.reload; @page.language_code.should == 'kl-cr'
@@ -43,8 +43,8 @@ describe Alchemy::Language do
 
     context "removing the country_code" do
       it "should update all associated Pages´s language_code with Language#code" do
-        language = Factory(:language_with_country_code)
-        @page = Factory(:page, :language => language)
+        language = FactoryGirl.create(:language_with_country_code)
+        @page = FactoryGirl.create(:page, :language => language)
         language.country_code = ''
         language.save
         @page.reload; @page.language_code.should == "kl"
@@ -56,7 +56,7 @@ describe Alchemy::Language do
   it "should not be deletable if it is the default language" do
     @default_language = Alchemy::Language.find_by_default(true)
     if !@default_language
-      @default_language = Factory(:language, :name => "default", :code => "aa", :frontpage_name => "intro", :default => true)
+      @default_language = FactoryGirl.create(:language, :name => "default", :code => "aa", :frontpage_name => "intro", :default => true)
     end
     expect { @default_language.destroy }.should raise_error
   end
@@ -75,8 +75,8 @@ describe Alchemy::Language do
   context "after_update" do
     describe "#set_pages_language if language´s code has changed" do
       it "should update all its pages with the new code" do
-        @page = Factory(:page, :language => @language)
-        @other_page = Factory(:page, :language => @language, :name => 'Another page')
+        @page = FactoryGirl.create(:page, :language => @language)
+        @other_page = FactoryGirl.create(:page, :language => @language)
         @language.update_attributes(:code => "fo")
         @language.reload; @page.reload; @other_page.reload
         [@page.language_code, @other_page.language_code].should == [@language.code, @language.code]
@@ -84,8 +84,8 @@ describe Alchemy::Language do
     end
     describe "#unpublish_pages" do
       it "should set all pages to unpublic if it gets set to unpublic" do
-        @page = Factory(:page, :language => @language)
-        @other_page = Factory(:page, :language => @language, :name => 'Another page')
+        @page = FactoryGirl.create(:page, :language => @language)
+        @other_page = FactoryGirl.create(:page, :language => @language)
         @language.update_attributes(:public => false)
         @language.reload; @page.reload; @other_page.reload
         [@page.public?, @other_page.public?].should == [false, false]