alchemy_cms 2.1.12 → 2.2.rc1

data/spec/controllers/admin/clipboard_controller_spec.rb

@@ -2,48 +2,48 @@ require 'spec_helper'
 
 describe Alchemy::Admin::ClipboardController do
 
-	before(:each) do
-		activate_authlogic
-		Alchemy::UserSession.create(Factory(:admin_user))
-	end
-
-	context "clipboard" do
-
-		it "should hold element ids" do
-			@page = Factory(:page, :parent_id => Alchemy::Page.rootpage.id)
-			@element = Factory(:element, :page => @page)
-			@another_element = Factory(:element, :page => @page)
-			session['clipboard'] = { 'elements' => [{:id => @element.id, :action => 'copy'}] }
-			post(:insert, {:remarkable_type => 'element', :remarkable_id => @another_element.id, :format => :js})
-			session['clipboard']['elements'].should == [{:id => @element.id, :action => 'copy'}, {:id => @another_element.id, :action => 'copy'}]
-		end
-
-		it "should not have the same element twice" do
-			@page = Factory(:page, :parent_id => Alchemy::Page.rootpage.id)
-			@element = Factory(:element, :page => @page)
-			session['clipboard'] = { 'elements' => [{:id => @element.id, :action => 'copy'}] }
-			post(:insert, {:remarkable_type => 'element', :remarkable_id => @element.id, :format => :js})
-			session['clipboard']['elements'].should == [{:id => @element.id, :action => 'copy'}]
-		end
-
-		it "should remove element ids" do
-			@page = Factory(:page, :parent_id => Alchemy::Page.rootpage.id)
-			@element = Factory(:element, :page => @page)
-			@another_element = Factory(:element, :page => @page)
-			session['clipboard'] = { 'elements' => [{:id => @element.id, :action => 'copy'}, {:id => @another_element.id, :action => 'copy'}] }
-			delete(:remove, {:remarkable_type => 'element', :remarkable_id => @another_element.id, :format => :js})
-			session['clipboard']['elements'].should == [{:id => @element.id, :action => 'copy'}]
-		end
-
-		it "should be clearable" do
-			@page = Factory(:page, :parent_id => Alchemy::Page.rootpage.id)
-			@element = Factory(:element, :page => @page)
-			@another_element = Factory(:element, :page => @page)
-			session['clipboard'] = { 'elements' => [@element.id, @another_element.id] }
-			delete(:clear, :format => :js)
-			session['clipboard'].should == {}
-		end
-
-	end
+  before(:each) do
+    activate_authlogic
+    Alchemy::UserSession.create(Factory(:admin_user))
+  end
+
+  context "clipboard" do
+
+    it "should hold element ids" do
+      @page = Factory(:page, :parent_id => Alchemy::Page.rootpage.id)
+      @element = Factory(:element, :page => @page)
+      @another_element = Factory(:element, :page => @page)
+      session['clipboard'] = {'elements' => [{:id => @element.id, :action => 'copy'}]}
+      post(:insert, {:remarkable_type => 'element', :remarkable_id => @another_element.id, :format => :js})
+      session['clipboard']['elements'].should == [{:id => @element.id, :action => 'copy'}, {:id => @another_element.id.to_s, :action => 'copy'}]
+    end
+
+    it "should not have the same element twice" do
+      @page = Factory(:page, :parent_id => Alchemy::Page.rootpage.id)
+      @element = Factory(:element, :page => @page)
+      session['clipboard'] = {'elements' => [{:id => @element.id, :action => 'copy'}]}
+      post(:insert, {:remarkable_type => 'element', :remarkable_id => @element.id, :format => :js})
+      session['clipboard']['elements'].should == [{:id => @element.id, :action => 'copy'}]
+    end
+
+    it "should remove element ids" do
+      @page = Factory(:page, :parent_id => Alchemy::Page.rootpage.id)
+      @element = Factory(:element, :page => @page)
+      @another_element = Factory(:element, :page => @page)
+      session['clipboard'] = {'elements' => [{:id => @element.id, :action => 'copy'}, {:id => @another_element.id, :action => 'copy'}]}
+      delete(:remove, {:remarkable_type => 'element', :remarkable_id => @another_element.id, :format => :js})
+      session['clipboard']['elements'].should == [{:id => @element.id, :action => 'copy'}]
+    end
+
+    it "should be clearable" do
+      @page = Factory(:page, :parent_id => Alchemy::Page.rootpage.id)
+      @element = Factory(:element, :page => @page)
+      @another_element = Factory(:element, :page => @page)
+      session['clipboard'] = {'elements' => [@element.id, @another_element.id]}
+      delete(:clear, :format => :js)
+      session['clipboard'].should == {}
+    end
+
+  end
 
 end

data/spec/controllers/admin/contents_controller_spec.rb

@@ -2,34 +2,34 @@ require 'spec_helper'
 
 describe Alchemy::Admin::ContentsController do
 
-	before(:each) do
-		activate_authlogic
-		Alchemy::UserSession.create Factory(:admin_user)
-	end
+  before(:each) do
+    activate_authlogic
+    Alchemy::UserSession.create Factory(:admin_user)
+  end
 
-	it "should update a content via ajax" do
-		@element = Factory(:element)
-		post :update, {:id => @element.contents.find_by_name('intro').id, :content => {:body => 'Peters Petshop'}, :format => :js}
-		@element.ingredient('intro').should == "Peters Petshop"
-	end
+  it "should update a content via ajax" do
+    @element = Factory(:element)
+    post :update, {:id => @element.contents.find_by_name('intro').id, :content => {:body => 'Peters Petshop'}, :format => :js}
+    @element.ingredient('intro').should == "Peters Petshop"
+  end
 
-	describe "#order" do
+  describe "#order" do
 
-		context "with content_ids in params" do
+    context "with content_ids in params" do
 
-			before(:each) do
-				@element = Factory(:element)
-			end
+      before(:each) do
+        @element = Factory(:element)
+      end
 
-			it "should reorder the contents" do
-				content_ids = @element.contents.essence_texts.collect(&:id)
-				post :order, {:content_ids => content_ids.reverse, :format => :js}
-				response.status.should == 200
-				@element.contents.essence_texts.collect(&:id).should == content_ids.reverse
-			end
+      it "should reorder the contents" do
+        content_ids = @element.contents.essence_texts.collect(&:id)
+        post :order, {:content_ids => content_ids.reverse, :format => :js}
+        response.status.should == 200
+        @element.contents.essence_texts.collect(&:id).should == content_ids.reverse
+      end
 
-		end
+    end
 
-	end
+  end
 
 end

data/spec/controllers/admin/elements_controller_spec.rb

@@ -2,21 +2,21 @@ require 'spec_helper'
 
 describe Alchemy::Admin::ElementsController do
 
-	render_views
+  render_views
 
-	before(:each) do
-		activate_authlogic
-		Alchemy::UserSession.create Factory(:admin_user)
-	end
+  before(:each) do
+    activate_authlogic
+    Alchemy::UserSession.create Factory(:admin_user)
+  end
 
-	let(:page) {mock_model('Page', {:id => 1, :urlname => 'lulu'})}
-	let(:element) {mock_model('Element', {:id => 1, :page_id => page.id, :public => true, :display_name_with_preview_text => 'lalaa', :dom_id => 1})}
+  let(:page) { mock_model('Page', {:id => 1, :urlname => 'lulu'}) }
+  let(:element) { mock_model('Element', {:id => 1, :page_id => page.id, :public => true, :display_name_with_preview_text => 'lalaa', :dom_id => 1}) }
 
-	it "should return a select tag with elements" do
-		Alchemy::Page.should_receive(:find_by_urlname_and_language_id).and_return(page)
-		Alchemy::Element.should_receive(:find_all_by_page_id_and_public).and_return([element])
-		get :list, {:page_urlname => page.urlname, :format => :js}
-		response.body.should match(/select(.*)elements_from_page_selector(.*)option/)
-	end
+  it "should return a select tag with elements" do
+    Alchemy::Page.should_receive(:find_by_urlname_and_language_id).and_return(page)
+    Alchemy::Element.should_receive(:find_all_by_page_id_and_public).and_return([element])
+    get :list, {:page_urlname => page.urlname, :format => :js}
+    response.body.should match(/select(.*)elements_from_page_selector(.*)option/)
+  end
 
 end

data/spec/controllers/admin/languages_controller_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+class Alchemy::Config;
+end
+
+describe Alchemy::Admin::LanguagesController do
+
+  before(:each) do
+    activate_authlogic
+    Alchemy::UserSession.create Factory(:admin_user)
+  end
+
+  describe "new" do
+
+    context "when default_language.page_layout is set" do
+      it "should use it as page_layout-default for the new language" do
+        Alchemy::Config.should_receive(:get).with(:default_language) { {'page_layout' => "new_standard"} }
+        get :new
+        assigns(:language).page_layout.should eql("new_standard")
+      end
+    end
+
+    context "when default_language or page_layout aren't configured" do
+      it "should fallback to 'intro'" do
+        get :new
+        assigns(:language).page_layout.should eql("intro")
+      end
+    end
+
+  end
+end

data/spec/controllers/admin/pages_controller_spec.rb

@@ -2,49 +2,18 @@ require 'spec_helper'
 
 describe Alchemy::Admin::PagesController do
 
-	before(:each) do
-		activate_authlogic
-		Alchemy::UserSession.create Factory(:admin_user)
-	end
+  before(:each) do
+    activate_authlogic
+    Alchemy::UserSession.create Factory(:admin_user)
+  end
 
-	describe "#flush" do
+  describe "#flush" do
 
-		it "should remove the cache of all pages" do
-			post :flush, {:format => :js}
-			response.status.should == 200
-		end
+    it "should remove the cache of all pages" do
+      post :flush, {:format => :js}
+      response.status.should == 200
+    end
 
-	end
-
-	describe '#copy_language_tree' do
-
-		before(:each) do
-			@language = Alchemy::Language.get_default
-			@language_root = Factory(:language_root_page, :language => @language, :name => 'Intro')
-			@level_1 = Factory(:public_page, :language => @language, :parent_id => @language_root.id, :visible => true, :name => 'Level 1')
-			@level_2 = Factory(:public_page, :language => @language, :parent_id => @level_1.id, :visible => true, :name => 'Level 2')
-			@level_3 = Factory(:public_page, :language => @language, :parent_id => @level_2.id, :visible => true, :name => 'Level 3')
-			@level_4 = Factory(:public_page, :language => @language, :parent_id => @level_3.id, :visible => true, :name => 'Level 4')
-			@new_language = Factory(:language)
-			session[:language_code] = @new_language.code
-			session[:language_id] = @new_language.id
-			post :copy_language_tree, {:languages => {:new_lang_id => @new_language.id, :old_lang_id => @language.id}}
-			@new_lang_root = Alchemy::Page.language_root_for(@new_language.id)
-		end
-
-		it "should copy all pages" do
-			@new_lang_root.descendants.count.should == 4
-			@new_lang_root.descendants.collect(&:name).should == ["Level 1 (Copy)", "Level 2 (Copy)", "Level 3 (Copy)", "Level 4 (Copy)"]
-		end
-
-		it "should not set layoutpage attribute to nil" do
-			@new_lang_root.layoutpage.should_not be_nil
-		end
-
-		it "should not set layoutpage attribute to true" do
-			@new_lang_root.layoutpage.should_not be_true
-		end
-
-	end
+  end
 
 end

data/spec/controllers/admin/resources_controller_spec.rb

@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + "/../../../lib/alchemy/resource"
+require File.dirname(__FILE__) + "/../../../lib/alchemy/resources_helper"
+
+module Alchemy
+  module Admin
+    class ResourcesController
+      helper Alchemy::ResourcesHelper
+    end
+  end
+end
+
+
+describe Alchemy::Admin::ResourcesController do
+  describe "index" do
+    it "should include ResourcesHelper" do
+      Alchemy::Admin::ResourcesController.new.respond_to?(:resource_window_size).should be_true
+    end
+  end
+end

data/spec/controllers/admin/trash_controller_spec.rb

@@ -2,18 +2,18 @@ require 'spec_helper'
 
 describe Alchemy::Admin::TrashController do
 
-	render_views
+  render_views
 
-	before(:each) do
-		activate_authlogic
-		Alchemy::UserSession.create Factory(:admin_user)
-	end
+  before(:each) do
+    activate_authlogic
+    Alchemy::UserSession.create Factory(:admin_user)
+  end
 
-	it "should hold trashed elements" do
-		@page = Factory(:page, :parent_id => Alchemy::Page.rootpage.id)
-		@element = Factory(: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
+  it "should hold trashed elements" do
+    @page = Factory(:page, :parent_id => Alchemy::Page.rootpage.id)
+    @element = Factory(: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
 
 end

data/spec/controllers/base_controller_spec.rb

@@ -2,66 +2,66 @@ require 'spec_helper'
 
 describe Alchemy::BaseController do
 
-	describe "#set_language_from" do
+  describe "#set_language_from" do
 
-		it "should set the language from id" do
-			@language = Alchemy::Language.get_default
-			controller.send :set_language_from, @language.id
-			controller.session[:language_id].should == @language.id
-		end
+    it "should set the language from id" do
+      @language = Alchemy::Language.get_default
+      controller.send :set_language_from, @language.id
+      controller.session[:language_id].should == @language.id
+    end
 
-		it "should set the language from code" do
-			@language = Factory(:language, :code => 'kl')
-			controller.send :set_language_from, "kl"
-			controller.session[:language_id].should == @language.id
-			controller.session[:language_code].should == @language.code
-		end
+    it "should set the language from code" do
+      @language = Factory(:language, :code => 'kl')
+      controller.send :set_language_from, "kl"
+      controller.session[:language_id].should == @language.id
+      controller.session[:language_code].should == @language.code
+    end
 
-		it "should set the language from id as string" do
-			@language = Factory(:language)
-			controller.send :set_language_from, @language.id.to_s
-			controller.session[:language_id].should == @language.id
-			controller.session[:language_code].should == @language.code
-		end
+    it "should set the language from id as string" do
+      @language = Factory(:language)
+      controller.send :set_language_from, @language.id.to_s
+      controller.session[:language_id].should == @language.id
+      controller.session[:language_code].should == @language.code
+    end
 
-	end
+  end
 
-	describe "#set_language" do
+  describe "#set_language" do
 
-		context "with no lang param" do
+    context "with no lang param" do
 
-			it "should set the default language" do
-				controller.stub!(:params).and_return({})
-				controller.send :set_language
-				controller.session[:language_id].should == Alchemy::Language.get_default.id
-				controller.session[:language_code].should == Alchemy::Language.get_default.code
-			end
+      it "should set the default language" do
+        controller.stub!(:params).and_return({})
+        controller.send :set_language
+        controller.session[:language_id].should == Alchemy::Language.get_default.id
+        controller.session[:language_code].should == Alchemy::Language.get_default.code
+      end
 
-		end
+    end
 
-		context "with lang param" do
+    context "with lang param" do
 
-			it "should set the language" do
-				@language = Factory(:language)
-				controller.stub!(:params).and_return({:lang => 'kl'})
-				controller.send :set_language
-				controller.session[:language_id].should == @language.id
-				controller.session[:language_code].should == @language.code
-			end
+      it "should set the language" do
+        @language = Factory(:language)
+        controller.stub!(:params).and_return({:lang => 'kl'})
+        controller.send :set_language
+        controller.session[:language_id].should == @language.id
+        controller.session[:language_code].should == @language.code
+      end
 
-			context "for language that does not exist" do
+      context "for language that does not exist" do
 
-				it "should set the language to default" do
-					controller.stub!(:params).and_return({:lang => 'fo'})
-					controller.send :set_language
-					controller.session[:language_id].should == Alchemy::Language.get_default.id
-					controller.session[:language_code].should == Alchemy::Language.get_default.code
-				end
+        it "should set the language to default" do
+          controller.stub!(:params).and_return({:lang => 'fo'})
+          controller.send :set_language
+          controller.session[:language_id].should == Alchemy::Language.get_default.id
+          controller.session[:language_code].should == Alchemy::Language.get_default.code
+        end
 
-			end
+      end
 
-		end
+    end
 
-	end
+  end
 
 end

data/spec/controllers/pages_controller_spec.rb

@@ -2,132 +2,142 @@ require 'spec_helper'
 
 describe Alchemy::PagesController do
 
-	render_views
+  render_views
 
-	before(:each) do
-		@default_language = Alchemy::Language.get_default
-		@default_language_root = Factory(:language_root_page, :language => @default_language, :name => 'Home', :public => true)
-	end
+  before(:each) do
+    @default_language = Alchemy::Language.get_default
+    @default_language_root = Factory(:language_root_page, :language => @default_language, :name => 'Home', :public => true)
+  end
 
-	context "requested for a page containing a feed" do
+  context "requested for a page containing a feed" do
 
-		before(:each) do
-			@page = Factory(:public_page, :parent_id => @default_language_root.id, :page_layout => 'news', :name => 'News', :language => @default_language)
-		end
+    before(:each) do
+      @page = Factory(:public_page, :parent_id => @default_language_root.id, :page_layout => 'news', :name => 'News', :language => @default_language)
+    end
 
-		it "should render a rss feed" do
-			get :show, :urlname => 'news', :format => :rss
-			response.content_type.should == 'application/rss+xml'
-		end
+    it "should render a rss feed" do
+      get :show, :urlname => 'news', :format => :rss
+      response.content_type.should == 'application/rss+xml'
+    end
 
-		it "should include content" do
-			@page.elements.first.content_by_name('news_headline').essence.update_attributes({:body => 'Peters Petshop'})
-			get :show, :urlname => 'news', :format => :rss
-			response.body.should match /Peters Petshop/
-		end
-	
-	end
+    it "should include content" do
+      @page.elements.first.content_by_name('news_headline').essence.update_attributes({:body => 'Peters Petshop'})
+      get :show, :urlname => 'news', :format => :rss
+      response.body.should match /Peters Petshop/
+    end
 
-	context "requested for a page that does not contain a feed" do
+  end
 
-		it "should render xml 404 error" do
-			get :show, :urlname => 'home', :format => :rss
-			response.status.should == 404
-		end
+  context "requested for a page that does not contain a feed" do
 
-	end
+    it "should render xml 404 error" do
+      get :show, :urlname => 'home', :format => :rss
+      response.status.should == 404
+    end
 
-	describe "Layout rendering" do
+  end
 
-		context "with param layout set to none" do
+  describe "Layout rendering" do
 
-			it "should not render a layout" do
-				get :show, :urlname => :home, :layout => false
-				response.body.should_not have_content('<head>')
-			end
+    context "with param layout set to none" do
 
-		end
+      it "should not render a layout" do
+        get :show, :urlname => :home, :layout => false
+        response.body.should_not have_content('<head>')
+      end
 
-		context "with param layout set to a custom layout" do
+    end
 
-			before do
-				@custom_layout = Rails.root.join('app/views/layouts', 'custom.html.erb')
-				File.open(@custom_layout, 'w') do |custom_layout|
-					custom_layout.puts "<html>I am a custom layout</html>"
-				end
-			end
+    context "with param layout set to a custom layout" do
 
-			it "should render the custom layout" do
-				get :show, :urlname => :home, :layout => 'custom'
-				response.body.should have_content('I am a custom layout')
-			end
+      before do
+        @custom_layout = Rails.root.join('app/views/layouts', 'custom.html.erb')
+        File.open(@custom_layout, 'w') do |custom_layout|
+          custom_layout.puts "<html>I am a custom layout</html>"
+        end
+      end
 
-			after do
-				FileUtils.rm(@custom_layout)
-			end
+      it "should render the custom layout" do
+        get :show, :urlname => :home, :layout => 'custom'
+        response.body.should have_content('I am a custom layout')
+      end
 
-		end
+      after do
+        FileUtils.rm(@custom_layout)
+      end
 
-		context "with application layout absent" do
+    end
 
-			it "should render pages layout" do
-				get :show, :urlname => :home
-				response.body.should_not have_content('I am the application layout')
-			end
+    context "with application layout absent" do
 
-		end
+      it "should render pages layout" do
+        get :show, :urlname => :home
+        response.body.should_not have_content('I am the application layout')
+      end
 
-		context "with application layout present" do
+    end
 
-			before do
-				@app_layout = Rails.root.join('app/views/layouts', 'application.html.erb')
-				File.open(@app_layout, 'w') do |app_layout|
-					app_layout.puts "<html>I am the application layout</html>"
-				end
-			end
+    context "with application layout present" do
 
-			it "should render application layout" do
-				get :show, :urlname => :home
-				response.body.should have_content('I am the application layout')
-			end
+      before do
+        @app_layout = Rails.root.join('app/views/layouts', 'application.html.erb')
+        File.open(@app_layout, 'w') do |app_layout|
+          app_layout.puts "<html>I am the application layout</html>"
+        end
+      end
 
-			after do
-				FileUtils.rm(@app_layout)
-			end
+      it "should render application layout" do
+        get :show, :urlname => :home
+        response.body.should have_content('I am the application layout')
+      end
 
-		end
+      after do
+        FileUtils.rm(@app_layout)
+      end
 
-	end
+    end
 
-	describe "url nesting" do
+  end
 
-		before(:each) do
-			@catalog = Factory(:public_page, :name => "Catalog", :parent_id => @default_language_root.id, :language => @default_language)
-			@products = Factory(:public_page, :name => "Products", :parent_id => @catalog.id, :language => @default_language)
-			@product = Factory(:public_page, :name => "Screwdriver", :parent_id => @products.id, :language => @default_language)
-			@product.elements.find_by_name('article').contents.essence_texts.first.essence.update_attribute(:body, 'screwdriver')
-			controller.stub!(:configuration) { |arg| arg == :url_nesting ? true : false }
-		end
+  describe "url nesting" do
 
-		context "with correct levelnames in params" do
+    before(:each) do
+      @catalog = Factory(:public_page, :name => "Catalog", :parent_id => @default_language_root.id, :language => @default_language)
+      @products = Factory(:public_page, :name => "Products", :parent_id => @catalog.id, :language => @default_language)
+      @product = Factory(:public_page, :name => "Screwdriver", :parent_id => @products.id, :language => @default_language)
+      @product.elements.find_by_name('article').contents.essence_texts.first.essence.update_attribute(:body, 'screwdriver')
+      controller.stub!(:configuration) { |arg| arg == :url_nesting ? true : false }
+    end
 
-			it "should show the requested page" do
-				get :show, {:level1 => 'catalog', :level2 => 'products', :urlname => 'screwdriver'}
-				response.status.should == 200
-				response.body.should have_content("screwdriver")
-			end
+    context "with correct levelnames in params" do
 
-		end
+      it "should show the requested page" do
+        get :show, {:level1 => 'catalog', :level2 => 'products', :urlname => 'screwdriver'}
+        response.status.should == 200
+        response.body.should have_content("screwdriver")
+      end
 
-		context "with incorrect levelnames in params" do
+    end
 
-			it "should show 404 page" do
-				get :show, {:level1 => 'catalog', :level2 => 'faqs', :urlname => 'screwdriver'}
-				response.status.should == 404
-			end
+    context "with incorrect levelnames in params" do
 
-		end
+      it "should raise a RoutingError that is in turn handled by rails (as 404 status)" do
+        expect {
+          get :show, {:level1 => 'catalog', :level2 => 'faqs', :urlname => 'screwdriver'}
+        }.to raise_error(ActionController::RoutingError)
+      end
 
-	end
+    end
+
+  end
+
+  context "when a non-existent page is requested" do
+    it "should raise a RoutingError (that is handled by rails, see integration specs)" do
+      Factory(:admin_user) # otherwise we are redirected to create_user
+      expect {
+        get :show, {:urlname => 'doesntexist'}
+      }.to raise_error(ActionController::RoutingError)
+    end
+  end
 
 end