alchemy_cms 2.1.beta1 → 2.1.beta5

data/spec/factories.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
 	
-	factory :user do
+	factory :user, :class => 'Alchemy::User' do
 		email 'john@doe.com'
 		login "jdoe"
 		password 's3cr3t'
@@ -24,7 +24,7 @@ FactoryGirl.define do
 
 	end
 	
-	factory :language do
+	factory :language, :class => 'Alchemy::Language' do
 		code "kl"
 		name 'Klingonian'
 		default false
@@ -33,8 +33,8 @@ FactoryGirl.define do
 		public true
 	end
 
-	factory :page do
-		language { Language.find_by_code('kl') || Factory(:language) }
+	factory :page, :class => 'Alchemy::Page' do
+		language { Alchemy::Language.find_by_code('kl') || Factory(:language) }
 		name "A Page"
 		parent_id { Factory(:language_root_page).id }
 		page_layout "standard"
@@ -44,7 +44,7 @@ FactoryGirl.define do
   		page_layout 'intro'
   		language_root true
   		public true
-  		parent_id { Page.root.id }
+  		parent_id { Alchemy::Page.root.id }
   	end
 
 		factory :public_page do
@@ -54,12 +54,12 @@ FactoryGirl.define do
 
 	end
 	
-	factory :cell do
-		page { Page.find_by_language_root(true) || Factory(:language_root_page) }
+	factory :cell, :class => 'Alchemy::Cell' do
+		page { Alchemy::Page.find_by_language_root(true) || Factory(:language_root_page) }
 		name "A Cell"
 	end
 	
-	factory :element do
+	factory :element, :class => 'Alchemy::Element' do
 	  name 'article'
   end
 	

data/spec/helpers/{alchemy_helper_spec.rb → admin/base_helper_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe AlchemyHelper do
+describe Alchemy::Admin::BaseHelper do
 
   context "maximum amount of images option" do
 
@@ -38,4 +38,11 @@ describe AlchemyHelper do
 
   end
 
+	context "modules" do
+		it "should render main navi entries for all core modules" do
+			pending 'Do not know how to test helpers defined as helper_method in controller'
+			helper.admin_main_navigation.should have_selector('a.main_navi_entry')
+		end
+	end
+
 end

data/spec/helpers/admin/contents_helper_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Alchemy::Admin::ContentsHelper do
+
+	before(:each) do
+	  @element = Factory(:element)
+	end
+
+  it "should render a dom id" do
+		helper.content_dom_id(@element.contents.first).should match(/essence_text_\d{1,}/)
+	end
+
+	it "should render the content name" do
+		helper.render_content_name(@element.contents.first).should == "Intro"
+	end
+
+	it "should render a link to add new content to element" do
+		helper.render_new_content_link(@element).should match(/Alchemy.openWindow.+\/admin\/elements\/#{@element.id}\/contents\/new/m)
+	end
+
+	it "should render a link to create a content in element" do
+		helper.render_create_content_link(@element).should match(/a.+href.*admin\/contents.+class.+button new_content_link.*data-method.+post/)
+	end
+
+end

data/spec/helpers/admin/elements_helper_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-include AlchemyHelper
+include Alchemy::BaseHelper
 
-describe Admin::ElementsHelper do
+describe Alchemy::Admin::ElementsHelper do
 
 	before(:each) do
 		@page = Factory(:public_page)
@@ -10,11 +10,39 @@ describe Admin::ElementsHelper do
 	end
 
 	it "should render an element editor partial" do
-	  helper.render_editor(@element).should match(/class="content_editor".+id="essence_text_11"/)
+	  helper.render_editor(@element).should match(/class="content_editor".+id="essence_text_\d{1,}"/)
 	end
 
 	it "should render a picture editor partial" do
 		helper.render_picture_editor(@element).should match(/class="essence_picture_editor"/)
 	end
 
+	describe "#grouped_elements_for_select" do
+
+		before(:each) do
+		  @page.stub!(:layout_description).and_return({'name' => "foo", 'cells' => ["foo_cell"]})
+			cell_descriptions = [{'name' => "foo_cell", 'elements' => ["1", "2"]}]
+			@elements = [{'name' => '1'}, {'name' => '2'}]
+			Alchemy::Cell.stub!(:definitions).and_return(cell_descriptions)
+		end
+
+		it "should return string of elements grouped by cell for select_tag helper" do
+			helper.grouped_elements_for_select(@elements).should == helper.grouped_options_for_select({"FooCell"=>[["1", "1#foo_cell"], ["2", "2#foo_cell"]]})
+		end
+
+		context "with empty elements array" do
+			it "should return an empty string" do
+				helper.grouped_elements_for_select([]).should == ""
+			end
+		end
+
+		context "with empty cell definitions" do
+			it "should return an empty string" do
+				@page.stub!(:layout_description).and_return({'name' => "foo"})
+				helper.grouped_elements_for_select(@elements).should == ""
+			end
+		end
+
+	end
+
 end

data/spec/helpers/admin/essences_helper_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Alchemy::Admin::EssencesHelper do
+
+	before(:each) do
+	  @element = Factory(:element)
+		@element.content_by_name('intro').essence.update_attributes(:body => 'hello!')
+	end
+
+	it "should render an essence editor" do
+	  content = @element.content_by_name('intro')
+    render_essence_editor(content).should match(/input.+type="text".+value="hello!/)
+	end
+
+  it "should render an essence editor by name" do
+    render_essence_editor_by_name(@element, 'intro').should match(/input.+type="text".+value="hello!/)
+  end
+
+  it "should render an essence editor by type" do
+    render_essence_editor_by_type(@element, 'EssenceText').should match(/input.+type="text".+value="hello!/)
+  end
+
+  it "should render an essence editor by position" do
+    render_essence_editor_by_position(@element, 1).should match(/input.+type="text".+value="hello!/)
+  end
+
+end

data/spec/helpers/elements_helper_spec.rb

@@ -1,44 +1,122 @@
 require 'spec_helper'
 
-include AlchemyHelper
+include Alchemy::BaseHelper
 
-describe ElementsHelper do
+describe Alchemy::ElementsHelper do
 
 	before(:each) do
 		@page = Factory(:public_page)
-	  @element = Factory(:element, :page => @page)
+		@element = Factory(:element, :page => @page)
+		session[:language_id] = @page.language_id
 	end
 
-  it "should render an element view partial" do
-		helper.render_element(@element).should match(/class="article".+id="article_6"/)
-  end
+	it "should render an element view partial" do
+		helper.render_element(@element).should match(/id="#{@element.name}_#{@element.id}"/)
+	end
+	
+	it "should render a unique dom id for element" do
+		helper.element_dom_id(@element).should == "#{@element.name}_#{@element.id}"
+	end
 
-	it "should render all elements" do
-		@another_element = Factory(:element)
-		helper.stub!(:configuration).and_return(true)
-		helper.render_elements.should match(/id="header_3.+id="article_5"/)
-	end 
+	describe "#render_elements" do
+		
+		before(:each) do
+			helper.stub!(:configuration).and_return(true)
+		end
 
-	it "should render a unique dom id for element" do
-	  helper.element_dom_id(@element).should == "#{@element.name}_#{@element.id}"
+		context "with no certain option given" do
+			it "should render all elements from @page" do
+				@another_element = Factory(:element, :page => @page)
+				# m for regex means line breaks are like every character
+				helper.render_elements.should match(/id="#{@element.name}_#{@element.id.to_s}.*id="#{@another_element.name}_#{@another_element.id.to_s}"/m)
+			end
+
+			it "should not render elements that are in a cell" do
+				cell = Factory(:cell)
+				@another_element = Factory(:element, :page => @page, :cell_id => cell.id)
+				helper.render_elements.should_not match(/id="#{@another_element.name}_#{@another_element.id}"/)
+			end
+		end
+
+		context "with except option" do
+			it "should render all elements except a certain one" do
+				@another_element = Factory(:element, :page => @page)
+				helper.render_elements(:except => @another_element.name).should_not match(/id="#{@another_element.name}_\d*"/)
+			end
+		end
+
+		context "with only option" do
+			it "should render one certain element" do
+				@another_element = Factory(:element, :name => 'headline', :page => @page)
+				helper.render_elements(:only => @element.name).should_not match(/id="#{@another_element.name}_\d*"/)
+			end
+		end
+
+		context "with from_page option" do
+			it "should render all elements from a certain page" do
+				@another_page = Factory(:public_page)
+				@element_on_other_page = Factory(:element, :name => 'headline', :page => @another_page)
+				helper.render_elements(:from_page => @another_page).should match(/id="#{@element_on_other_page.name}_\d*"/)
+			end
+		end
+
+		context "with from_cell option" do
+			it "should render all elements from a certain cell" do
+				cell = Factory(:cell)
+				@another_element = Factory(:element, :page => @page, :cell_id => cell.id)
+				helper.render_elements(:from_cell => cell).should match(/id="#{@another_element.name}_#{@another_element.id}"/)
+			end
+		end
+
+		context "with count option" do
+			it "should render just one element because of the count option" do
+				@page.elements.delete_all
+				@another_element_1 = Factory(:element, :page => @page)
+				@another_element_2 = Factory(:element, :page => @page)
+				@another_element_3 = Factory(:element, :page => @page)
+				helper.render_elements(:count => 1).should match(/id="#{@another_element_1.name}_#{@another_element_1.id}"/)
+			end
+		end
+
+		context "with offset option" do
+			it "should render all elements beginning with the second." do
+				@page.elements.delete_all
+				@another_page = Factory(:public_page)
+				@another_element_1 = Factory(:element, :page => @page)
+				@another_element_2 = Factory(:element, :page => @page)
+				@another_element_3 = Factory(:element, :page => @page)
+				helper.render_elements(:offset => 1).should_not match(/id="#{@another_element_1.name}_#{@another_element_1.id}"/)
+			end
+		end
+		
+		context "with option fallback" do
+			it "should render the fallback element, when no element with the given name is found" do
+				@page.elements.delete_all
+				@another_element_1 = Factory(:element, :page => @page)
+				helper.render_elements(:fallback => {:for => 'foo', :with => @another_element_1.name, :from => @page.page_layout}).should match(/id="#{@another_element_1.name}_#{@another_element_1.id}"/)
+			end
+		end
+		
 	end
 
-	it "should render elements for a cell" do
-		cell = Factory(:cell)
-		Factory(:element, :cell_id => cell.id)
-		helper.stub(:configuration).and_return(true)
-	  helper.render_cell_elements(cell).should match(/id="article_7"/)
+	describe "#render_cell_elements" do
+		it "should render elements for a cell" do
+			cell = Factory(:cell)
+			@element_in_cell = Factory(:element, :cell_id => cell.id)
+			helper.stub(:configuration).and_return(true)
+			helper.render_cell_elements(cell).should match(/id="#{@element_in_cell.name}_#{@element_in_cell.id}"/)
+		end
 	end
 
 	context "in preview mode" do
 
-	  it "should return the data-alchemy-element HTML attribute for element" do
+		it "should return the data-alchemy-element HTML attribute for element" do
 			@preview_mode = true
-		  helper.element_preview_code(@element).should == " data-alchemy-element='#{@element.id}'"
+			helper.element_preview_code(@element).should == " data-alchemy-element='#{@element.id}'"
 		end
 
 		it "should not return the data-alchemy-element HTML attribute if not in preview_mode" do
-		  helper.element_preview_code(@element).should_not == " data-alchemy-element='#{@element.id}'"
+			helper.element_preview_code(@element).should_not == " data-alchemy-element='#{@element.id}'"
 		end
 
 	end

data/spec/helpers/essences_helper_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe EssencesHelper do
+describe Alchemy::EssencesHelper do
 
 	before(:each) do
 	  @element = Factory(:element)
@@ -29,21 +29,4 @@ describe EssencesHelper do
     render_essence_view_by_position(@element, 1).should match(/hello!/)
   end
 
-	it "should render an essence editor" do
-	  content = @element.content_by_name('intro')
-    render_essence_editor(content).should match(/input.+type="text".+value="hello!/)
-	end
-
-  it "should render an essence editor by name" do
-    render_essence_editor_by_name(@element, 'intro').should match(/input.+type="text".+value="hello!/)
-  end
-
-  it "should render an essence editor by type" do
-    render_essence_editor_by_type(@element, 'EssenceText').should match(/input.+type="text".+value="hello!/)
-  end
-
-  it "should render an essence editor by position" do
-    render_essence_editor_by_position(@element, 1).should match(/input.+type="text".+value="hello!/)
-  end
-
 end

data/spec/helpers/pages_helper_spec.rb

@@ -1,44 +1,230 @@
 require 'spec_helper'
 
-describe PagesHelper do
+include Alchemy::BaseHelper
 
+describe Alchemy::PagesHelper do
+	
 	it "should render the current page layout" do
 		@page = Factory(:public_page)
 		helper.stub(:configuration).and_return(true)
-	  render_page_layout.should have_selector('div#content')
+		render_page_layout.should have_selector('div#content')
 	end
 
-	context "navigation and meta data" do
-		
-		before(:each) do
-			@language = Language.get_default
+	describe "#render_navigation" do
+		it "should render the page navigation" do
+			@language = Alchemy::Language.get_default
 			@root_page = Factory(:language_root_page, :language => @language, :name => 'Home')
 			@page = Factory(:public_page, :language => @language, :parent_id => @root_page.id, :visible => true)
 			helper.stub(:multi_language?).and_return(false)
+			helper.render_navigation.should have_selector('ul.navigation_level_1 li.a-public-page.active.last a.active[href="/alchemy/a-public-page"]')
+		end
+	end
+	
+	describe "#render_breadcrumb" do
+		
+		before(:each) do
+			helper.stub(:multi_language?).and_return(false)
+			@language_root = mock_model('Page', :urlname => 'language_root', :name => 'Language Root', :title => 'Language Root', :visible? => true, :public? => true, :restricted? => false)
+			@page = mock_model('Page', :urlname => 'a-public-page', :name => 'A Public Page', :title => 'A Public Page', :visible? => true, :public? => true, :restricted? => false)
+			@language_root.should_receive(:parent).and_return(nil)
+			@page.should_receive(:parent).and_return(@language_root)
+		end
+		
+		it "should render a breadcrumb to current page" do
+			helper.render_breadcrumb.should have_selector('a.active.last[href="/alchemy/a-public-page"]')
 		end
 
-	  it "should render the page navigation" do
-		  helper.render_navigation.should have_selector('ul.navigation_level_1 li.a-public-page.active.last a.active[href="/a-public-page"]')
+		it "should render a breadcrumb with a alternative seperator" do
+			helper.render_breadcrumb(:seperator => '<span>###</span>').should have_selector('span[contains("###")]')
 		end
 
-		it "should render a breadcrumb to current page" do
-			helper.render_breadcrumb.should have_selector('a.active.last[href="/a-public-page"]')
+		it "should render a breadcrumb in reversed order" do
+			helper.render_breadcrumb(:reverse => true).should have_selector('a.active.first[href="/alchemy/a-public-page"]')
+		end
+
+		it "should render a breadcrumb of restricted pages only" do
+			@page.stub!(:restricted? => true, :urlname => 'a-restricted-public-page', :name => 'A restricted Public Page', :title => 'A restricted Public Page')
+			helper.render_breadcrumb(:restricted_only => true).should match(/^(<a(.[^>]+)>)A restricted Public Page/)
+		end
+
+		it "should render a breadcrumb of visible pages only" do
+			@page.stub!(:visible? => false, :urlname => 'a-invisible-public-page', :name => 'A invisible Public Page', :title => 'A invisible Public Page')
+			helper.render_breadcrumb(:visible_only => true).should_not match(/A invisible Public Page/)
+		end
+
+		it "should render a breadcrumb of visible and invisible pages" do
+			@page.stub!(:visible? => false, :urlname => 'a-invisible-public-page', :name => 'A invisible Public Page', :title => 'A invisible Public Page')
+			helper.render_breadcrumb(:visible_only => false).should match(/A invisible Public Page/)
+		end
+		
+		it "should render a breadcrumb of published pages only" do
+			@page.stub!(:public => false, :public? => false, :urlname => 'a-unpublic-page', :name => 'A Unpublic Page', :title => 'A Unpublic Page')
+			helper.render_breadcrumb(:public_only => true).should_not match(/A Unpublic Page/)
 		end
 		
-		it "should render meta tags for current page" do
-			helper.render_meta_data(:title_prefix => 'Peters Petshop').should have_selector('title[contains("Peters Petshop | A Public Page")]')
+		it "should render a breadcrumb of published and unpublished pages" do
+			@page.stub!(:public => false, :public? => false, :urlname => 'a-unpublic-page', :name => 'A Unpublic Page', :title => 'A Unpublic Page')
+			helper.render_breadcrumb(:public_only => false).should match(/A Unpublic Page/)
 		end
 
-		it "should render a title tag for current page" do
-			helper.render_title_tag(:prefix => 'Peters Petshop').should have_selector('title[contains("Peters Petshop | A Public Page")]')
+		it "should render a breadcrumb without the page named 'Not Me'" do
+			@page.stub!(:urlname => 'not-me', :name => 'Not Me', :title => 'Not Me')
+			helper.render_breadcrumb(:without => @page).should_not match(/Not Me/)
+		end
+		
+	end
+
+	describe "using own url helpers" do
+
+		before(:each) do
+			@page = mock_model(Alchemy::Page, :urlname => 'testpage', :language_code => 'en')
+		end
+
+		describe "#show_page_path_params" do
+
+			context "when multi_language" do
+
+				before(:each) do
+					helper.stub!(:multi_language?).and_return(true)
+				end
+
+				it "should return a Hash with urlname and language_id parameter" do
+					helper.stub!(:multi_language?).and_return(true)
+					helper.show_page_path_params(@page).should include(:urlname => 'testpage', :lang => 'en')
+				end
+
+				it "should return a Hash with urlname, language_id and query parameter" do
+					helper.stub!(:multi_language?).and_return(true)
+					helper.show_page_path_params(@page, {:query => 'test'}).should include(:urlname => 'testpage', :lang => 'en', :query => 'test')
+				end
+
+			end
+
+			context "not multi_language" do
+
+				before(:each) do
+					helper.stub!(:multi_language?).and_return(false)
+				end
+
+				it "should return a Hash with the urlname but without language_id parameter" do
+					helper.show_page_path_params(@page).should include(:urlname => 'testpage')
+					helper.show_page_path_params(@page).should_not include(:lang => 'en')
+				end
+
+				it "should return a Hash with urlname and query parameter" do
+					helper.show_page_path_params(@page, {:query => 'test'}).should include(:urlname => 'testpage', :query => 'test')
+					helper.show_page_path_params(@page).should_not include(:lang => 'en')
+				end
+
+			end
+
+		end
+
+		describe "#show_alchemy_page_path" do
+
+			context "when multi_language" do
+
+				before(:each) do
+					helper.stub!(:multi_language?).and_return(true)
+				end
+
+				it "should return the correct relative path string" do
+					helper.show_alchemy_page_path(@page).should == "/alchemy/#{@page.language_code}/testpage"
+				end
+
+				it "should return the correct relative path string with additional parameters" do
+					helper.show_alchemy_page_path(@page, {:query => 'test'}).should == "/alchemy/#{@page.language_code}/testpage?query=test"
+				end
+
+			end
+
+			context "not multi_language" do
+
+				before(:each) do
+					helper.stub!(:multi_language?).and_return(false)
+				end
+
+				it "should return the correct relative path string" do
+					helper.show_alchemy_page_path(@page).should == "/alchemy/testpage"
+				end
+
+				it "should return the correct relative path string with additional parameter" do
+					helper.show_alchemy_page_path(@page, {:query => 'test'}).should == "/alchemy/testpage?query=test"
+				end
+
+			end
+
+		end
+
+		describe "#show_alchemy_page_url" do
+
+			context "when multi_language" do
+
+				before(:each) do
+					helper.stub!(:multi_language?).and_return(true)
+				end
+
+				it "should return the correct url string" do
+					helper.show_alchemy_page_url(@page).should == "http://#{helper.request.host}/alchemy/#{@page.language_code}/testpage"
+				end
+
+				it "should return the correct url string with additional parameters" do
+					helper.show_alchemy_page_url(@page, {:query => 'test'}).should == "http://#{helper.request.host}/alchemy/#{@page.language_code}/testpage?query=test"
+				end
+
+			end
+
+			context "not multi_language" do
+
+				before(:each) do
+					helper.stub!(:multi_language?).and_return(false)
+				end
+
+				it "should return the correct url string" do
+					helper.show_alchemy_page_url(@page).should == "http://#{helper.request.host}/alchemy/testpage"
+				end
+
+				it "should return the correct url string with additional parameter" do
+					helper.show_alchemy_page_url(@page, {:query => 'test'}).should == "http://#{helper.request.host}/alchemy/testpage?query=test"
+				end
+
+			end
 		end
+	end
+	
+	describe "#render_meta_data" do
+		
+		let(:language) do
+			mock_model('Language', :code => 'en')
+		end
+		
+		it "should render meta keywords of current page" do
+			@page = mock_model('Page', :language => language, :title => 'A Public Page', :meta_description => '', :meta_keywords => 'keyword1, keyword2', :robot_index? => false, :robot_follow? => false, :contains_feed? => false, :updated_at => '2011-11-29-23:00:00')
+			helper.render_meta_data.should have_selector('meta[name="keywords"][content="keyword1, keyword2"]')
+		end
+		
+		it "should render meta description 'blah blah' of current page" do
+			@page = mock_model('Page', :language => language, :title => 'A Public Page', :meta_description => 'blah blah', :meta_keywords => '', :robot_index? => false, :robot_follow? => false, :contains_feed? => false, :updated_at => '2011-11-29-23:00:00')
+			helper.render_meta_data.should have_selector('meta[name="description"][content="blah blah"]')
+		end
+	end
 
+	describe "#render_title_tag" do
+		it "should render a title tag for current page" do
+			@page = mock_model('Page', :title => 'A Public Page')
+			helper.render_title_tag.should have_selector('title[contains("A Public Page")]')
+		end
+		
+		it "should render a title tag for current page with a prefix and a seperator" do
+			@page = mock_model('Page', :title => 'A Public Page')
+			helper.render_title_tag(:prefix => 'Peters Petshop', :seperator => '###').should have_selector('title[contains("Peters Petshop ### A Public Page")]')
+		end
 	end
 
-  context "method language_switches" do
+  describe "#language_switcher" do
 
 		before :each do
-			@default_language = Language.get_default
+			@default_language = Alchemy::Language.get_default
 			@klingonian = Factory(:language)
 			# simulates link_to_public_child = true
 			helper.stub(:configuration).and_return(true)
@@ -47,7 +233,7 @@ describe PagesHelper do
 
 		it "should return nil when having only one public language" do
 			helper.stub(:configuration).and_return(true)
-			helper.language_switches.should be nil
+			helper.language_switcher.should be nil
 		end
 
 		context "with two public languages and two language_roots" do
@@ -66,25 +252,25 @@ describe PagesHelper do
 				
 				it "should return nil if only one language_root is public and both do not have children" do
 					@klingonian_language_root.update_attributes(:public => false)
-					helper.language_switches.should == nil
+					helper.language_switcher.should == nil
 				end
 				
 				it "should return nil if only one language_root is public and both have none public children" do
 					@klingonian_language_root.update_attributes(:public => false)
 					@default_first_public_child = Factory(:page, :language => @default_language, :parent_id => @default_language_root.id, :public => false, :name => "child1")
 					@klingonian_first_public_child = Factory(:page, :language => @klingonian, :parent_id => @klingonian_language_root.id, :public => false, :name => "child1")
-					helper.language_switches.should == nil
+					helper.language_switcher.should == nil
 				end
 				
 				it "should render two links when having two public language_root pages" do
-					helper.language_switches.should have_selector('a', :count => 2)
+					helper.language_switcher.should have_selector('a', :count => 2)
 				end
 			
 				it "should render two links when having just one public language_root but a public children in both language_roots" do
 					@klingonian_language_root.update_attributes(:public => false)
 					@default_first_public_child = Factory(:page, :language => @default_language, :parent_id => @default_language_root.id, :public => true, :name => "child1")
 					@klingonian_first_public_child = Factory(:page, :language => @klingonian, :parent_id => @klingonian_language_root.id, :public => true, :name => "child1")
-					helper.language_switches.should have_selector('a', :count => 2)
+					helper.language_switcher.should have_selector('a', :count => 2)
 				end
 			
 				it "should render two links when having two not public language_roots but a public children in both" do
@@ -92,7 +278,7 @@ describe PagesHelper do
 					@klingonian_language_root.update_attributes(:public => false)
 					@default_first_public_child = Factory(:page, :language => @default_language, :parent_id => @default_language_root.id, :public => true, :name => "child1")
 					@klingonian_first_public_child = Factory(:page, :language => @klingonian, :parent_id => @klingonian_language_root.id, :public => true, :name => "child1")
-					helper.language_switches.should have_selector('a', :count => 2)
+					helper.language_switcher.should have_selector('a', :count => 2)
 				end
 			
 				it "should return nil when having two not public language_roots and a public children in only one of them" do
@@ -100,7 +286,7 @@ describe PagesHelper do
 					@klingonian_language_root.update_attributes(:public => false)
 					@default_first_public_child = Factory(:page, :language => @default_language, :parent_id => @default_language_root.id, :public => false, :name => "child1")
 					@klingonian_first_public_child = Factory(:page, :language => @klingonian, :parent_id => @klingonian_language_root.id, :public => true, :name => "child1")
-					helper.language_switches.should == nil
+					helper.language_switcher.should == nil
 				end
 				
 			end
@@ -113,14 +299,14 @@ describe PagesHelper do
 				end
 				
 				it "should render two links when having two public language_root pages" do
-					helper.language_switches.should have_selector('a', :count => 2)
+					helper.language_switcher.should have_selector('a', :count => 2)
 				end
 				
 				it "should render nil when having just one public language_root but a public children in both language_roots" do
 					@klingonian_language_root.update_attributes(:public => false)
 					@default_first_public_child = Factory(:page, :language => @default_language, :parent_id => @default_language_root.id, :public => true, :name => "child1")
 					@klingonian_first_public_child = Factory(:page, :language => @klingonian, :parent_id => @klingonian_language_root.id, :public => true, :name => "child1")
-					helper.language_switches.should == nil
+					helper.language_switcher.should == nil
 				end
 				
 				it "should render nil when having two not public language_roots but a public children in both" do
@@ -128,7 +314,7 @@ describe PagesHelper do
 					@klingonian_language_root.update_attributes(:public => false)
 					@default_first_public_child = Factory(:page, :language => @default_language, :parent_id => @default_language_root.id, :public => true, :name => "child1")
 					@klingonian_first_public_child = Factory(:page, :language => @klingonian, :parent_id => @klingonian_language_root.id, :public => true, :name => "child1")
-					helper.language_switches.should == nil
+					helper.language_switcher.should == nil
 				end
 				
 			end