alchemy_cms 2.2.2 → 2.2.3.1

data/Gemfile

@@ -25,7 +25,7 @@ end
 group :development do
   unless ENV['CI']
     gem 'guard-spork'
-    gem 'ruby-debug19', :require => 'ruby-debug', :platform => :ruby_19
+    gem 'debugger', :platform => :ruby_19
     gem 'ruby-debug', :platform => :ruby_18
   end
 end

data/alchemy_cms.gemspec

@@ -37,7 +37,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency(%q<bumpy>)
   s.add_development_dependency(%q<capybara>)
-  s.add_development_dependency(%q<database_cleaner>)
   s.add_development_dependency(%q<factory_girl_rails>, ['~> 1.7.0'])
   s.add_development_dependency(%q<rspec-rails>)
   s.add_development_dependency(%q<sqlite3>)

data/app/helpers/alchemy/admin/base_helper.rb

@@ -334,7 +334,7 @@ module Alchemy
       #   :overlay_options        [Hash]                # Overlay options. See link_to_overlay_window helper.
       #   :if_permitted_to        [Array]               # Check permission for button. [:action, :controller]. Exactly how you defined the permission in your +authorization_rules.rb+. Defaults to controller and action from button url.
       #   :skip_permission_check  [Boolean]             # Skip the permission check. Default false. NOT RECOMMENDED!
-      #   :loading_indicator      [Boolean]             # Shows the please wait overlay while loading. Default false.
+      #   :loading_indicator      [Boolean]             # Shows the please wait overlay while loading. Only for buttons not opening an overlay window. Default true.
       #
       def toolbar_button(options = {})
         options.symbolize_keys!
@@ -344,7 +344,7 @@ module Alchemy
           :active => false,
           :link_options => {},
           :overlay_options => {},
-          :loading_indicator => false
+          :loading_indicator => true
         }
         options = defaults.merge(options)
         button = content_tag('div', :class => 'button_with_label' + (options[:active] ? ' active' : '')) do
@@ -359,7 +359,7 @@ module Alchemy
                      }
                    )
                  else
-                   link_to options[:url], {:class => "icon_button#{options[:loading_indicator] ? nil : ' please_wait'}", :title => options[:title]}.merge(options[:link_options]) do
+                   link_to options[:url], {:class => "icon_button#{options[:loading_indicator] ? ' please_wait' : nil}", :title => options[:title]}.merge(options[:link_options]) do
                      render_icon(options[:icon])
                    end
                  end

data/app/models/alchemy/content.rb

@@ -1,7 +1,14 @@
 module Alchemy
   class Content < ActiveRecord::Base
 
-    attr_accessible :name, :element_id, :do_not_index, :essence_type, :essence_id
+    attr_accessible(
+      :do_not_index,
+      :element_id,
+      :essence_id,
+      :essence_type,
+      :name,
+      :position
+    )
 
     belongs_to :essence, :polymorphic => true, :dependent => :destroy
     belongs_to :element

data/app/models/alchemy/element.rb

@@ -2,13 +2,14 @@ module Alchemy
   class Element < ActiveRecord::Base
 
     attr_accessible(
+      :cell_id,
+      :create_contents_after_create,
+      :folded,
       :name,
-      :unique,
       :page_id,
+      :position,
       :public,
-      :cell_id,
-      :folded,
-      :create_contents_after_create
+      :unique
     )
 
     # All Elements inside a cell are a list. All Elements not in cell are in the cell_id.nil list.
@@ -20,16 +21,15 @@ module Alchemy
     belongs_to :page
     has_and_belongs_to_many :to_be_sweeped_pages, :class_name => 'Alchemy::Page', :uniq => true, :join_table => 'alchemy_elements_alchemy_pages'
 
-    validates_uniqueness_of :position, :scope => [:page_id, :cell_id]
+    validates_uniqueness_of :position, :scope => [:page_id, :cell_id], :if => lambda { |e| e.position != nil }
     validates_presence_of :name, :on => :create
 
     attr_accessor :create_contents_after_create
 
     after_create :create_contents, :unless => Proc.new { |m| m.create_contents_after_create == false }
 
-    # TODO: add a trashed column to elements table
-    scope :trashed, where(:page_id => nil).order('updated_at DESC')
-    scope :not_trashed, where(Element.arel_table[:page_id].not_eq(nil))
+    scope :trashed, where(:position => nil).order('updated_at DESC')
+    scope :not_trashed, where(Element.arel_table[:position].not_eq(nil))
     scope :published, where(:public => true)
     scope :available, published.not_trashed
     scope :named, lambda { |names| where(:name => names) }
@@ -61,19 +61,18 @@ module Alchemy
       end
     end
 
-    # Nullifies the page_id and cell_id, fold the element, set it to unpublic and removes its position.
+    # Trashing an element means nullifying its position and unpublishing it.
     def trash
-      self.attributes = {
-        :page_id => nil,
-        :cell_id => nil,
-        :folded => true,
-        :public => false
-      }
+      self.update_column(:public, false)
       self.remove_from_list
     end
 
     def trashed?
-      page_id.nil?
+      self.position.nil?
+    end
+
+    def folded?
+      self.trashed? || self.read_attribute(:folded)
     end
 
     def content_by_name(name)

data/app/models/alchemy/page.rb

@@ -17,6 +17,7 @@ module Alchemy
       :name,
       :page_layout,
       :parent_id,
+      :position,
       :public,
       :restricted,
       :robot_index,

data/lib/alchemy/essence.rb

@@ -44,10 +44,6 @@ module Alchemy #:nodoc:
             '#{ingredient_column}'
           end
 
-          def ingredient
-            send('#{ingredient_column}')
-          end
-
           def preview_text_column
             '#{preview_text_column}'
           end
@@ -129,6 +125,13 @@ module Alchemy #:nodoc:
         end
       end
 
+      # Returns the value stored from the database column that is configured as ingredient column.
+      def ingredient
+        if self.respond_to?(ingredient_column)
+          self.send(ingredient_column)
+        end
+      end
+
       # Essence description from config/elements.yml
       def description
         return {} if element.nil? or element.content_descriptions.nil?

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
 
-  VERSION = "2.2.2"
+  VERSION = "2.2.3.1"
 
 end

data/spec/controllers/admin/elements_controller_spec.rb

@@ -24,6 +24,34 @@ module Alchemy
 
     end
 
+    describe "untrashing" do
+
+      before(:each) do
+        @element = FactoryGirl.create(:element, :public => false, :position => nil, :page_id => 58, :cell_id => 32)
+        # Because of a before_create filter it can not be created with a nil position and needs to be trashed here
+        @element.trash
+      end
+
+      it "should set a new position to the element" do
+        post :order, {:element_ids => ["#{@element.id}"]}
+        @element.reload
+        @element.position.should_not == nil
+      end
+
+      it "should assign the (new) page_id to the element" do
+        post :order, {:element_ids => ["#{@element.id}"], :page_id => 1, :cell_id => nil}
+        @element.reload
+        @element.page_id.should == 1
+      end
+
+      it "should assign the (new) cell_id to the element" do
+        post :order, {:element_ids => ["#{@element.id}"], :page_id => 1, :cell_id => 5}
+        @element.reload
+        @element.cell_id.should == 5
+      end
+
+    end
+
     describe '#new' do
 
       context "elements in clipboard" do

data/spec/controllers/admin/trash_controller_spec.rb

@@ -1,19 +1,52 @@
 require 'spec_helper'
 
-describe Alchemy::Admin::TrashController do
 
-  render_views
 
-  before(:each) do
-    activate_authlogic
-    Alchemy::UserSession.create FactoryGirl.create(:admin_user)
-  end
+module Alchemy
+  module Admin
 
-  it "should hold trashed elements" do
-    @page = FactoryGirl.create(:page, :parent_id => Alchemy::Page.rootpage.id)
-    @element = FactoryGirl.create(:element, :page => nil, :public => false, :position => 0, :folded => true)
-    get :index, :page_id => @page.id
-    response.body.should have_selector("#trash_items #element_#{@element.id}.element_editor")
-  end
+    describe TrashController do
+
+      render_views
+
+      before(:each) do
+        activate_authlogic
+        UserSession.create FactoryGirl.create(:admin_user)
+      end
+
+      let(:page) do
+        FactoryGirl.create(:page, :parent_id => Page.rootpage.id)
+      end
+
+      let(:element) do
+        FactoryGirl.create(:element, :public => false)
+      end
+
+      it "should hold trashed elements" do
+        # Because of a before_create filter it can not be created with a nil position and needs to be trashed here
+        element.trash
+        get :index, :page_id => page.id
+        response.body.should have_selector("#trash_items #element_#{element.id}.element_editor")
+      end
 
+      it "should not hold elements that are not trashed" do
+        element = FactoryGirl.create(:element, :page_id => 5, :public => false)
+        get :index, :page_id => page.id
+        response.body.should_not have_selector("#trash_items #element_#{element.id}.element_editor")
+      end
+
+      context "#clear" do
+
+        it "should destroy all containing elements" do
+          # Because of a before_create filter it can not be created with a nil position and needs to be trashed here
+          element.trash
+          post :clear, {:page_id => 1}
+          Element.trashed.should be_empty
+        end
+
+      end
+
+    end
+
+  end
 end

data/spec/dummy/config/locales/fo.yml

@@ -0,0 +1,5 @@
+fo:
+  activerecord:
+    errors:
+      messages:
+        record_invalid: "Validation failed: %{errors}"

data/spec/integration/admin/pages_controller_spec.rb

@@ -3,12 +3,9 @@ require 'spec_helper'
 module Alchemy
   describe Admin::PagesController, :js => true do
 
-    before(:all) do
+    before(:each) do
       create_admin_user
       @german_root = FactoryGirl.create(:language_root_page, :language => Language.get_default, :name => 'Deutsch')
-    end
-
-    before(:each) do
       login_into_alchemy
     end
 
@@ -62,9 +59,5 @@ module Alchemy
 
     end
 
-    after(:all) {
-      @german_root.delete
-    }
-
   end
 end

data/spec/integration/admin/resources_integration_spec.rb

@@ -5,8 +5,6 @@ unless ENV["CI"]
   describe "Resources" do
 
     before(:all) do
-      create_admin_user
-      load_authorization_rules
       Event.create!(:name => 'My Event',
                     :hidden_name => 'not shown',
                     :starts_at => DateTime.new(2012, 03, 02, 8, 15),
@@ -23,6 +21,8 @@ unless ENV["CI"]
     end
 
     before(:each) {
+      load_authorization_rules
+      create_admin_user
       login_into_alchemy
     }
 

data/spec/integration/pages_controller_spec.rb

@@ -1,190 +1,193 @@
 require 'ostruct'
 require 'spec_helper'
 
-describe Alchemy::PagesController do
+module Alchemy
+  describe PagesController do
 
-  before(:all) do
-    @default_language = Alchemy::Language.get_default
-    @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 = 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/#{p.urlname}"
-      within('div#content div.article div.intro') { page.should have_content('Welcome to Peters Petshop') }
+    before(:all) do
+      @default_language = Language.get_default
+      @default_language_root = FactoryGirl.create(:language_root_page, :language => @default_language, :name => 'Home')
     end
 
-    it "should show the navigation with all visible pages" do
-      pages = [
-        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"]') }
-    end
+    describe "#show" do
 
-  end
-
-  describe "fulltext search" do
+      it "should include all its elements and contents" do
+        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/#{p.urlname}"
+        within('div#content div.article div.intro') { page.should have_content('Welcome to Peters Petshop') }
+      end
 
-    before(:all) do
-      @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 show the navigation with all visible pages" do
+        pages = [
+          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"]') }
+      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
+    describe "fulltext search" do
 
-      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') }
+      before(:all) do
+        @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 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') }
+      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
 
-      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
+      context "performing the search" do
 
-      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
+        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
 
-    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
 
-  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
 
-  describe "redirecting" do
+        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
 
-    context "in multi language mode" do
+        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 = 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 if no language params are given" do
-        visit "/alchemy/#{@page.urlname}"
-        page.current_path.should == "/alchemy/#{@page.language_code}/#{@page.urlname}"
-      end
+    end
+
+    describe "redirecting" do
 
-      context "should redirect to public child" do
+      context "in multi language mode" do
 
         before(:each) do
-          @page.update_attributes(:public => false, :name => 'Not Public', :urlname => '')
-          @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) }
+          @page = FactoryGirl.create(:public_page)
+          Config.stub!(:get) { |arg| arg == :url_nesting ? true : Config.parameter(arg) }
         end
 
-        it "if requested page is unpublished" do
-          visit '/alchemy/kl/not-public'
-          page.current_path.should == '/alchemy/kl/public-child'
+        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
 
-        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 "should redirect to public child" do
 
-      end
+          before(:each) do
+            @page.update_attributes(:public => false, :name => 'Not Public', :urlname => '')
+            @child = FactoryGirl.create(:public_page, :name => 'Public Child', :parent_id => @page.id)
+            Config.stub!(:get) { |arg| arg == :url_nesting ? false : Config.parameter(arg) }
+          end
 
-      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 "if requested page is unpublished" do
+            visit '/alchemy/kl/not-public'
+            page.current_path.should == '/alchemy/kl/public-child'
+          end
 
-      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
+          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 "requested url is only the urlname" do
-        it "then it should redirect to pages url with nested language." do
-          visit '/alchemy/home'
+        end
+
+        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
-      end
 
-      it "should keep additional params" do
-        visit "/alchemy/#{@page.urlname}?query=Peter"
-        page.current_url.should match(/\?query=Peter/)
-      end
+        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
 
-      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 "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
 
-      context "with url nesting" do
+        it "should keep additional params" do
+          visit "/alchemy/#{@page.urlname}?query=Peter"
+          page.current_url.should match(/\?query=Peter/)
+        end
 
-        before(:all) do
-          @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)
+        it "should render 404 if urlname and lang parameter do not belong to same page" do
+          User.stub!(:admins).and_return(OpenStruct.new(:count => 2))
+          visit "/alchemy/en/#{@page.urlname}"
+          page.status_code.should == 404
         end
 
-        context "enabled" do
+        context "with url nesting" do
 
-          before(:each) do
-            Alchemy::Config.stub!(:get) { |arg| arg == :url_nesting ? true : Alchemy::Config.parameter(arg) }
+          before(:all) do
+            @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 "requesting a non nested url" do
+          context "enabled" do
 
-            it "should redirect to nested url" do
-              visit "/alchemy/de/screwdriver"
-              page.current_path.should == '/alchemy/de/catalog/products/screwdriver'
+            before(:each) do
+              Config.stub!(:get) { |arg| arg == :url_nesting ? true : 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"
+            context "requesting a non nested url" do
+
+              it "should redirect to nested url" do
+                visit "/alchemy/de/screwdriver"
+                page.current_path.should == '/alchemy/de/catalog/products/screwdriver'
+              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
+
             end
 
           end
 
-        end
+          context "disabled" do
 
-        context "disabled" do
+            before(:each) do
+              Config.stub!(:get) { |arg| arg == :url_nesting ? false : Config.parameter(arg) }
+            end
 
-          before(:each) do
-            Alchemy::Config.stub!(:get) { |arg| arg == :url_nesting ? false : Alchemy::Config.parameter(arg) }
-          end
+            context "requesting a nested url" do
 
-          context "requesting a nested url" do
+              it "should redirect to not nested url" do
+                visit "/alchemy/de/catalog/products/screwdriver"
+                page.current_path.should == "/alchemy/de/screwdriver"
+              end
 
-            it "should redirect to not nested url" do
-              visit "/alchemy/de/catalog/products/screwdriver"
-              page.current_path.should == "/alchemy/de/screwdriver"
             end
 
           end
@@ -193,97 +196,92 @@ describe Alchemy::PagesController do
 
       end
 
-    end
+      context "not in multi language mode" do
 
-    context "not in multi language mode" do
+        before(:each) do
+          @page = FactoryGirl.create(:public_page, :language => @default_language, :parent_id => @default_language_root.id)
+          Config.stub!(:get) { |arg| arg == :url_nesting ? false : Config.parameter(arg) }
+        end
 
-      before(:each) do
-        @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/#{@page.urlname}"
+          page.current_path.should == "/alchemy/#{@page.urlname}"
+        end
 
-      it "should redirect from nested language code url to normal url" do
-        visit "/alchemy/de/#{@page.urlname}"
-        page.current_path.should == "/alchemy/#{@page.urlname}"
-      end
+        context "with no lang parameter" do
 
-      context "with no lang parameter" do
+          it "should have defaults language language_id in the session" do
+            get show_page_path(:urlname => 'a-public-page')
+            controller.session[:language_id].should == Language.get_default.id
+          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 "should have defaults language language_code in the session" do
+            get show_page_path(:urlname => 'a-public-page')
+            controller.session[:language_code].should == Language.get_default.code
+          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
 
-      end
+        context "should redirect to public child" do
+
+          before(:each) do
+            @page.update_attributes(:public => false, :name => 'Not Public', :urlname => '')
+            @child = FactoryGirl.create(:public_page, :name => 'Public Child', :parent_id => @page.id, :language => @default_language)
+          end
 
-      context "should redirect to public child" do
+          it "if requested page is unpublished" do
+            visit '/alchemy/not-public'
+            page.current_path.should == '/alchemy/public-child'
+          end
 
-        before(:each) do
-          @page.update_attributes(:public => false, :name => 'Not Public', :urlname => '')
-          @child = FactoryGirl.create(:public_page, :name => 'Public Child', :parent_id => @page.id, :language => @default_language)
-        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
 
-        it "if requested page is unpublished" do
-          visit '/alchemy/not-public'
-          page.current_path.should == '/alchemy/public-child'
         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'
+        it "should redirect to pages url, if requested url is index url" do
+          visit '/alchemy/'
+          page.current_path.should == '/alchemy/home'
         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/#{@page.urlname}?query=Peter"
+          page.current_url.should match(/\?query=Peter/)
+        end
 
-      it "should keep additional params" do
-        visit "/alchemy/de/#{@page.urlname}?query=Peter"
-        page.current_url.should match(/\?query=Peter/)
       end
 
     end
 
-  end
-
-  describe "Handling of non-existing pages" do
+    describe "Handling of non-existing pages" do
 
-    context "when a language root page exists" do
+      context "when a language root page exists" do
 
-      before(:all) do
-        # We need an admin user, because otherwise we will be redirected to UserSessions controller to create a new user
-        FactoryGirl.create(:admin_user, :login => 'foo-boo', :email => 'foo@boo.org')
-      end
+        before do
+          User.stub!(:admins).and_return([1, 2]) # We need a admin user or the signup page will show up
+          visit "/alchemy/non-existing-page"
+        end
 
-      before(:each) do
-        visit "/alchemy/non-existing-page"
-      end
+        it "should render the status code in the title tag" do
+          within("title") { page.should have_content("404") }
+        end
 
-      it "should render the status code in the title tag" do
-        within("title") { page.should have_content("404") }
-      end
+        it "should render the layout" do
+          page.should have_selector("#language_select")
+        end
 
-      it "should render the layout" do
-        page.should have_selector("#language_select")
       end
 
-    end
+      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
 
-    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"
 
-      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
 end