alchemy_cms 2.1.12 → 2.2.rc1

data/spec/helpers/pictures_helper_spec.rb

@@ -0,0 +1,14 @@
+require "spec_helper"
+
+describe Alchemy::PicturesHelper do
+
+  describe "alchemy_picture_path" do
+
+    it "should route to show_picture_path" do
+      pic = mock_model("Picture", :urlname => 'cute-kitten', :id => 1)
+      helper.alchemy_picture_path(pic).should == '/alchemy/pictures/1/show/cute-kitten.jpg'
+    end
+
+  end
+
+end

data/spec/helpers/url_helpers_spec.rb

@@ -2,39 +2,34 @@ require 'spec_helper'
 
 describe "URL generating" do
 
-	it "should generate a url string for cropped picture" do
-		p = show_picture_path(:id => 3, :crop => "crop", :size => "100x33", :name => "kitten", :format => "jpg")
-		p.should == "/alchemy/pictures/3/show/100x33/crop/kitten.jpg"
-	end
-
-	it "should generate a url string for cropped and masked picture" do
-		p = show_picture_path(:id => 3, :crop => "crop", :crop_from => "0x0", :crop_size => "900x300", :size => "100x33", :name => "kitten", :format => :jpg)
-		p.should == "/alchemy/pictures/3/show/100x33/crop/0x0/900x300/kitten.jpg"
-	end
-
-	it "should generate a url string for picture with default format" do
-		p = show_picture_path(:id => 3, :size => "100x33", :name => 'kitten')
-		p.should == "/alchemy/pictures/3/show/100x33/kitten.#{Alchemy::Config.get(:image_output_format)}"
-	end
-
-	it "should generate a url string for cropped thumbnail" do
-		p = thumbnail_path(:id => 3, :crop => "crop", :size => "100x33", :name => "kitten", :format => :jpg)
-		p.should == "/alchemy/pictures/3/thumbnails/100x33/crop/kitten.jpg"
-	end
-
-	it "should generate a url string for thumbnail with default name and format" do
-		p = thumbnail_path(:id => 3, :size => "100x33")
-		p.should == "/alchemy/pictures/3/thumbnails/100x33/thumbnail.png"
-	end
-
-	it "should generate a url string for cropped and masked thumbnail" do
-		p = thumbnail_path(:id => 3, :crop_from => "0x0", :crop_size => "900x300", :size => "100x33", :name => "kitten", :format => :jpg)
-		p.should == "/alchemy/pictures/3/thumbnails/100x33/0x0/900x300/kitten.jpg"
-	end
-
-	it "should generate a url string for zoomed image" do
-		p = zoom_picture_path(:id => 3, :name => "kitten", :format => :jpg)
-		p.should == "/alchemy/pictures/3/zoom/kitten.jpg"
-	end
+  it "should generate a url string for cropped picture" do
+    p = show_picture_path(:id => 3, :crop => "crop", :size => "100x33", :name => "kitten", :format => "jpg")
+    p.should == "/alchemy/pictures/3/show/100x33/crop/kitten.jpg"
+  end
+
+  it "should generate a url string for cropped and masked picture" do
+    p = show_picture_path(:id => 3, :crop => "crop", :crop_from => "0x0", :crop_size => "900x300", :size => "100x33", :name => "kitten", :format => :jpg)
+    p.should == "/alchemy/pictures/3/show/100x33/crop/0x0/900x300/kitten.jpg"
+  end
+
+  it "should generate a url string for cropped thumbnail" do
+    p = thumbnail_path(:id => 3, :crop => "crop", :size => "100x33", :name => "kitten", :format => :jpg)
+    p.should == "/alchemy/pictures/3/thumbnails/100x33/crop/kitten.jpg"
+  end
+
+  it "should generate a url string for thumbnail with default name and format" do
+    p = thumbnail_path(:id => 3, :size => "100x33")
+    p.should == "/alchemy/pictures/3/thumbnails/100x33/thumbnail.png"
+  end
+
+  it "should generate a url string for cropped and masked thumbnail" do
+    p = thumbnail_path(:id => 3, :crop_from => "0x0", :crop_size => "900x300", :size => "100x33", :name => "kitten", :format => :jpg)
+    p.should == "/alchemy/pictures/3/thumbnails/100x33/0x0/900x300/kitten.jpg"
+  end
+
+  it "should generate a url string for zoomed image" do
+    p = zoom_picture_path(:id => 3, :name => "kitten", :format => :jpg)
+    p.should == "/alchemy/pictures/3/zoom/kitten.jpg"
+  end
 
 end

data/spec/integration/admin/pages_controller_spec.rb

@@ -1,73 +1,73 @@
 # Skipping on Travis-CI, because capybara-webkit does not install on travis.
 unless ENV["CI"]
 
-	require 'spec_helper'
+  require 'spec_helper'
 
-	describe Alchemy::Admin::PagesController, :js => true do
+  describe Alchemy::Admin::PagesController, :js => true do
 
-		describe "language tree switching" do
+    describe "language tree switching" do
 
-			context "in a multilangual environment" do
+      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')
-				end
+        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')
+        end
 
-				it "one should be able to switch the language tree" do
-					login_into_alchemy
-					visit('/alchemy/admin/pages')
-					page.select 'Klingonian', :from => 'language'
-					page.should have_selector('#sitemap .sitemap_pagename_link', :text => 'Klingonian')
-				end
+        it "one should be able to switch the language tree" do
+          login_into_alchemy
+          visit('/alchemy/admin/pages')
+          page.select 'Klingonian', :from => 'language'
+          page.should have_selector('#sitemap .sitemap_pagename_link', :text => 'Klingonian')
+        end
 
-				after(:all) {
-					@language.destroy
-					@klingonian_root.delete
-					@german_root.delete
-				}
+        after(:all) {
+          @language.destroy
+          @klingonian_root.delete
+          @german_root.delete
+        }
 
-			end
+      end
 
-			context "with no language root page" do
+      context "with no language root page" do
 
-				before(:all) do
-					Factory.build(:admin_user).save_without_session_maintenance
-					@language = Factory(:language)
-				end
+        before(:all) do
+          Factory.build(:admin_user).save_without_session_maintenance
+          @language = Factory(:language)
+        end
 
-				it "it should display the form for creating language root" do
-					login_into_alchemy
-					visit('/alchemy/admin/pages')
-					page.select 'Klingonian', :from => 'language'
-					page.should have_content('This language tree does not exist')
-				end
+        it "it should display the form for creating language root" do
+          login_into_alchemy
+          visit('/alchemy/admin/pages')
+          page.select 'Klingonian', :from => 'language'
+          page.should have_content('This language tree does not exist')
+        end
 
-				after(:all) {
-					@language.destroy
-				}
+        after(:all) {
+          @language.destroy
+        }
 
-			end
+      end
 
-		end
+    end
 
-		describe "flush complete page cache" do
+    describe "flush complete page cache" do
 
-			before(:all) do
-				Factory.build(:admin_user).save_without_session_maintenance
-			end
+      before(:all) do
+        Factory.build(:admin_user).save_without_session_maintenance
+      end
 
-			it "should remove the cache of all pages" do
-				login_into_alchemy
-				visit '/alchemy/admin/pages'
-				click_link 'Flush page cache'
-				page.should have_content('Page cache flushed')
-			end
+      it "should remove the cache of all pages" do
+        login_into_alchemy
+        visit '/alchemy/admin/pages'
+        click_link 'Flush page cache'
+        page.should have_content('Page cache flushed')
+      end
 
-		end
+    end
 
-	end
+  end
 
 end

data/spec/integration/admin/resources_integration_spec.rb

@@ -0,0 +1,100 @@
+require 'spec_helper'
+require 'support/integration_spec_helper'
+
+describe "Resources" do
+
+  before(:all) do
+    Event.create!(: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),
+                  :description => "something\nfancy",
+                  :published => false,
+                  :entrance_fee => 12.32)
+  end
+
+  describe "index view" do
+
+    it "should have a button for creating a new resource items" do
+      without_access_control { visit '/admin/events' }
+      page.should have_selector('#toolbar div.button_with_label a.icon_button span.icon.create')
+    end
+
+    it "should list existing items" do
+      without_access_control {
+        visit '/admin/events'
+        page.should have_content("My Event")
+        page.should have_content("something fancy")
+        page.should have_content("12.32")
+      }
+    end
+
+    it "should list existing resource-items nicely formatted"
+
+  end
+
+  describe "form for creating and updating items" do
+    it "renders an input field according to the attribute's type"
+  end
+
+  describe "create resource item" do
+
+    context "when form filled with valid data" do
+      it "lists the new item" do
+        without_access_control {
+          create_admin_user
+          login_with_admin_user
+          visit '/admin/events/new'
+          fill_in 'event_name', :with => 'My second event'
+          fill_in 'event_starts_at', :with => DateTime.new(2012, 03, 03, 20, 00)
+          click_on 'Save'
+          page.should have_content "My second event"
+          page.should have_content "2012-03-03"
+        }
+      end
+    end
+
+    context "when form filled with invalid data" do
+      it "shows the form again" do
+        without_access_control {
+          create_admin_user
+          login_with_admin_user
+          visit '/admin/events/new'
+          fill_in 'event_name', :with => '' #invalid!
+          click_on 'Save'
+          page.should have_selector "input#event_name"
+        }
+      end
+      it "lists invalid fields"
+    end
+
+  end
+
+  describe "updating an item" do
+    it "shows the updated value"
+  end
+
+  describe "destroying an item" do
+    it "should'n be on the list anymore", :js => true do
+      pending "Needs js, but doesn't work, neither with selenium nor webkit.
+               When trying to create an user inside the 'without-access-control'-block
+               it's saved but not found anymore when trying to login"
+
+      Event.create!(:name => 'My second Event',
+                    :starts_at => DateTime.new(2012, 03, 02, 8, 15),
+                    :ends_at => DateTime.new(2012, 03, 02, 19, 30),
+                    :description => "something\nfancy",
+                    :published => false,
+                    :entrance_fee => 12.32)
+
+      without_access_control {
+        create_admin_user
+        visit '/admin/events'
+        click_link 'Delete'
+        page.should have_content "My Event"
+        page.should_not have_content "My second Event"
+      }
+    end
+  end
+
+end

data/spec/integration/navigation_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "Dummy App" do
   include Capybara::DSL
-  
+
   it "should be a valid app" do
     ::Rails.application.should be_a(Dummy::Application)
   end

data/spec/integration/pages_controller_spec.rb

@@ -1,256 +1,254 @@
 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')
-	end
-
-	describe "#show" do
-
-		it "should include all its elements and contents" do
-			p = Factory(: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'
-			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)
-			]
-			visit '/alchemy/'
-			within('div#navigation ul') { page.should have_selector('li a[href="/alchemy/page-1"], li a[href="/alchemy/page-2"]') }
-		end
-
-		context "when a global page with the same urlname as the requested page exists in the language tree" do
-
-			it "should render the content page, not the global page" do
-				globalpage = Factory(:public_page, :layoutpage => true, :language => @default_language, :name => "samename", :urlname => "samename", :parent_id => @default_language_root.id)
-				contentpage = Factory(:public_page, :layoutpage => false, :language => @default_language, :name => "samename", :urlname => "samename", :parent_id => @default_language_root.id)
-				article = contentpage.elements.find_by_name('article')
-				article.content_by_name('intro').essence.update_attributes(:body => 'rendered on contentpage', :public => true)
-				visit("/alchemy/samename")
-				within('div#content div.article div.intro') { page.should have_content('rendered on contentpage') }
-			end
-
-		end
-
-	end
-
-	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)
-		end
-
-		it "should have a correct path in the form tag" do
-			visit('/alchemy/suche')
-			page.should have_selector('div#content form[action="/alchemy/suche"]')
-		end
-
-		context "performing the search" do
-
-			it "should display search results for richtext essences" do
-				@element.content_by_name('text').essence.update_attributes(:body => '<p>Welcome to Peters Petshop</p>', :public => true)
-				visit('/alchemy/suche?query=Petshop')
-				within('div#content .search_result') { page.should have_content('Petshop') }
-			end
-
-			it "should display search results for text essences" do
-				@element.content_by_name('intro').essence.update_attributes(:body => 'Welcome to Peters Petshop', :public => true)
-				visit('/alchemy/suche?query=Petshop')
-				within('div#content .search_result') { page.should have_content('Petshop') }
-			end
-
-			it "should not find contents placed on global-pages (layoutpage => true)" do
-				@page.update_attributes(:layoutpage => true)
-				@element.content_by_name('intro').essence.update_attributes(:body => 'Welcome to Peters Petshop', :public => true)
-				visit('/alchemy/suche?query=Petshop')
-				within('div#content') { page.should have_css('h2.no_search_results') }
-			end
-
-			it "should not find contents placed on unpublished pages (public => false)" do
-				@page.update_attributes(:public => false)
-				@element.content_by_name('intro').essence.update_attributes(:body => 'Welcome to Peters Petshop', :public => true)
-				visit('/alchemy/suche?query=Petshop')
-				within('div#content') { page.should have_css('h2.no_search_results') }
-			end
-
-			it "should not find contents placed on restricted pages (restricted => true)" do
-				@page.update_attributes(:restricted => true)
-				@element.content_by_name('intro').essence.update_attributes(:body => 'Welcome to Peters Petshop', :public => true)
-				visit('/alchemy/suche?query=Petshop')
-				within('div#content') { page.should have_css('h2.no_search_results') }
-			end
-
-		end
-
-	end
-
-	describe "redirecting" do
 
-		context "in multi language mode" do
+  before(:each) do
+    @default_language = Alchemy::Language.get_default
+    @default_language_root = Factory(: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)
+      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'
+      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)
+      ]
+      visit '/alchemy/'
+      within('div#navigation ul') { page.should have_selector('li a[href="/alchemy/page-1"], li a[href="/alchemy/page-2"]') }
+    end
+
+  end
+
+  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)
+    end
+
+    it "should have a correct path in the form tag" do
+      visit('/alchemy/suche')
+      page.should have_selector('div#content form[action="/alchemy/suche"]')
+    end
+
+    context "performing the search" do
+
+      it "should display search results for richtext essences" do
+        @element.content_by_name('text').essence.update_attributes(:body => '<p>Welcome to Peters Petshop</p>', :public => true)
+        visit('/alchemy/suche?query=Petshop')
+        within('div#content .search_result') { page.should have_content('Petshop') }
+      end
+
+      it "should display search results for text essences" do
+        @element.content_by_name('intro').essence.update_attributes(:body => 'Welcome to Peters Petshop', :public => true)
+        visit('/alchemy/suche?query=Petshop')
+        within('div#content .search_result') { page.should have_content('Petshop') }
+      end
+
+      it "should not find contents placed on global-pages (layoutpage => true)" do
+        @page.update_attributes(:layoutpage => true)
+        @element.content_by_name('intro').essence.update_attributes(:body => 'Welcome to Peters Petshop', :public => true)
+        visit('/alchemy/suche?query=Petshop')
+        within('div#content') { page.should have_css('h2.no_search_results') }
+      end
+
+      it "should not find contents placed on unpublished pages (public => false)" do
+        @page.update_attributes(:public => false)
+        @element.content_by_name('intro').essence.update_attributes(:body => 'Welcome to Peters Petshop', :public => true)
+        visit('/alchemy/suche?query=Petshop')
+        within('div#content') { page.should have_css('h2.no_search_results') }
+      end
+
+      it "should not find contents placed on restricted pages (restricted => true)" do
+        @page.update_attributes(:restricted => true)
+        @element.content_by_name('intro').essence.update_attributes(:body => 'Welcome to Peters Petshop', :public => true)
+        visit('/alchemy/suche?query=Petshop')
+        within('div#content') { page.should have_css('h2.no_search_results') }
+      end
 
-			before(:each) do
-				@page = Factory(:public_page)
-				Alchemy::Config.stub!(:get) { |arg| arg == :url_nesting ? true : Alchemy::Config.parameter(arg) }
-			end
+    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'
-			end
+  end
 
-			context "should redirect to public child" do
+  describe "redirecting" do
 
-				before(:each) do
-					@page.update_attributes(:public => false, :name => 'Not Public', :urlname => '')
-					@child = Factory(:public_page, :name => 'Public Child', :parent_id => @page.id)
-					Alchemy::Config.stub!(:get) { |arg| arg == :url_nesting ? false : Alchemy::Config.parameter(arg) }
-				end
+    context "in multi language mode" do
 
-				it "if requested page is unpublished" do
-					visit '/alchemy/kl/not-public'
-					page.current_path.should == '/alchemy/kl/public-child'
-				end
+      before(:each) do
+        @page = Factory(:public_page)
+        Alchemy::Config.stub!(:get) { |arg| arg == :url_nesting ? true : Alchemy::Config.parameter(arg) }
+      end
 
-				it "with nested language code, if requested page is unpublished and url has no language code" do
-					visit '/alchemy/not-public'
-					page.current_path.should == '/alchemy/kl/public-child'
-				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'
+      end
 
-			end
+      context "should redirect to public child" do
 
-			it "should redirect to pages url, if requested url is index url" do
-				visit '/alchemy/'
-				page.current_path.should == '/alchemy/de/home'
-			end
+        before(:each) do
+          @page.update_attributes(:public => false, :name => 'Not Public', :urlname => '')
+          @child = Factory(:public_page, :name => 'Public Child', :parent_id => @page.id)
+          Alchemy::Config.stub!(:get) { |arg| arg == :url_nesting ? false : Alchemy::Config.parameter(arg) }
+        end
 
-			it "should redirect to pages url, if requested url is only the language code" do
-				visit '/alchemy/de'
-				page.current_path.should == '/alchemy/de/home'
-			end
+        it "if requested page is unpublished" do
+          visit '/alchemy/kl/not-public'
+          page.current_path.should == '/alchemy/kl/public-child'
+        end
 
-			it "should keep additional params" do
-				visit '/alchemy/a-public-page?query=Peter'
-				page.current_url.should match(/\?query=Peter/)
-			end
+        it "with nested language code, if requested page is unpublished and url has no language code" do
+          visit '/alchemy/not-public'
+          page.current_path.should == '/alchemy/kl/public-child'
+        end
 
-			context "url nesting" do
+      end
 
-				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)
-				end
+      it "should redirect to pages url, if requested url is index url" do
+        visit '/alchemy/'
+        page.current_path.should == '/alchemy/de/home'
+      end
 
-				context "enabled" do
+      it "should redirect to pages url, if requested url is only the language code" do
+        visit '/alchemy/de'
+        page.current_path.should == '/alchemy/de/home'
+      end
 
-					before(:each) do
-						Alchemy::Config.stub!(:get) { |arg| arg == :url_nesting ? true : Alchemy::Config.parameter(arg) }
-					end
+      it "should keep additional params" do
+        visit '/alchemy/a-public-page?query=Peter'
+        page.current_url.should match(/\?query=Peter/)
+      end
 
-					context "requesting a non nested url" do
+      context "with url nesting" do
 
-						it "should redirect to nested url" do
-							visit "/alchemy/de/screwdriver"
-							page.current_path.should == '/alchemy/de/catalog/products/screwdriver'
-						end
+        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)
+        end
 
-						it "should only redirect to nested url if page is nested" do
-							visit "/alchemy/de/catalog"
-							page.status_code.should == 200
-							page.current_path.should == "/alchemy/de/catalog"
-						end
+        context "enabled" do
 
-					end
+          before(:each) do
+            Alchemy::Config.stub!(:get) { |arg| arg == :url_nesting ? true : Alchemy::Config.parameter(arg) }
+          end
 
-				end
+          context "requesting a non nested url" do
 
-				context "disabled" do
+            it "should redirect to nested url" do
+              visit "/alchemy/de/screwdriver"
+              page.current_path.should == '/alchemy/de/catalog/products/screwdriver'
+            end
 
-					before(:each) do
-						Alchemy::Config.stub!(:get) { |arg| arg == :url_nesting ? false : Alchemy::Config.parameter(arg) }
-					end
+            it "should only redirect to nested url if page is nested" do
+              visit "/alchemy/de/catalog"
+              page.status_code.should == 200
+              page.current_path.should == "/alchemy/de/catalog"
+            end
 
-					context "requesting a nested url" do
+          end
 
-						it "should redirect to not nested url" do
-							visit "/alchemy/de/catalog/products/screwdriver"
-							page.current_path.should == "/alchemy/de/screwdriver"
-						end
+        end
 
-					end
+        context "disabled" do
 
-				end
+          before(:each) do
+            Alchemy::Config.stub!(:get) { |arg| arg == :url_nesting ? false : Alchemy::Config.parameter(arg) }
+          end
 
-			end
+          context "requesting a nested url" do
 
-		end
+            it "should redirect to not nested url" do
+              visit "/alchemy/de/catalog/products/screwdriver"
+              page.current_path.should == "/alchemy/de/screwdriver"
+            end
 
-		context "not in multi language mode" do
+          end
 
-			before(:each) do
-				@page = Factory(: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
+        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'
-			end
+      end
 
-			context "with no lang parameter" do
+    end
 
-				it "should have defaults language language_id in the session" do
-					get show_page_path(:urlname => 'a-public-page')
-					controller.session[:language_id].should == Alchemy::Language.get_default.id
-				end
+    context "not in multi language mode" do
 
-				it "should have defaults language language_code in the session" do
-					get show_page_path(:urlname => 'a-public-page')
-					controller.session[:language_code].should == Alchemy::Language.get_default.code
-				end
+      before(:each) do
+        @page = Factory(: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
 
-			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'
+      end
 
-			context "should redirect to public child" do
+      context "with no lang parameter" 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)
-				end
+        it "should have defaults language language_id in the session" do
+          get show_page_path(:urlname => 'a-public-page')
+          controller.session[:language_id].should == Alchemy::Language.get_default.id
+        end
 
-				it "if requested page is unpublished" do
-					visit '/alchemy/not-public'
-					page.current_path.should == '/alchemy/public-child'
-				end
+        it "should have defaults language language_code in the session" do
+          get show_page_path(:urlname => 'a-public-page')
+          controller.session[:language_code].should == Alchemy::Language.get_default.code
+        end
 
-				it "with normal url, if requested url has nested language code and is not public" do
-					visit '/alchemy/de/not-public'
-					page.current_path.should == '/alchemy/public-child'
-				end
+      end
 
-			end
+      context "should redirect to public child" do
 
-			it "should redirect to pages url, if requested url is index url" do
-				visit '/alchemy/'
-				page.current_path.should == '/alchemy/home'
-			end
+        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)
+        end
 
-			it "should keep additional params" do
-				visit '/alchemy/de/a-public-page?query=Peter'
-				page.current_url.should match(/\?query=Peter/)
-			end
+        it "if requested page is unpublished" do
+          visit '/alchemy/not-public'
+          page.current_path.should == '/alchemy/public-child'
+        end
 
-		end
+        it "with normal url, if requested url has nested language code and is not public" do
+          visit '/alchemy/de/not-public'
+          page.current_path.should == '/alchemy/public-child'
+        end
 
-	end
+      end
 
+      it "should redirect to pages url, if requested url is index url" do
+        visit '/alchemy/'
+        page.current_path.should == '/alchemy/home'
+      end
+
+      it "should keep additional params" do
+        visit '/alchemy/de/a-public-page?query=Peter'
+        page.current_url.should match(/\?query=Peter/)
+      end
+
+    end
+
+  end
+
+  describe "Handling of non-existing pages" do
+
+    context "404-Errors are handled by Rails now, so no need to test anymore.
+             However, it still serves as documentation how they can be handled, so we leave it here" do
+
+      it "should render public/404.html when it exists"
+      it "can be handled by matching /404 and routing it to a controller of choice when no public/404.html exists"
+
+    end
+
+  end
 end