alchemy_cms 2.0.7 → 2.1.beta1

data/spec/helpers/pages_helper_spec.rb

@@ -3,17 +3,17 @@ require 'spec_helper'
 describe PagesHelper do
 
 	it "should render the current page layout" do
-		@page = FactoryGirl.create(:public_page)
+		@page = Factory(:public_page)
 		helper.stub(:configuration).and_return(true)
 	  render_page_layout.should have_selector('div#content')
 	end
 
 	context "navigation and meta data" do
-
+		
 		before(:each) do
 			@language = Language.get_default
-			@root_page = FactoryGirl.create(:language_root_page, :language => @language, :name => 'Home')
-			@page = FactoryGirl.create(:public_page, :language => @language, :parent_id => @root_page.id, :visible => true)
+			@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)
 		end
 
@@ -24,7 +24,7 @@ describe PagesHelper do
 		it "should render a breadcrumb to current page" do
 			helper.render_breadcrumb.should have_selector('a.active.last[href="/a-public-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")]')
 		end
@@ -39,7 +39,7 @@ describe PagesHelper do
 
 		before :each do
 			@default_language = Language.get_default
-			@klingonian = FactoryGirl.create(:language)
+			@klingonian = Factory(:language)
 			# simulates link_to_public_child = true
 			helper.stub(:configuration).and_return(true)
 			helper.stub(:multi_language?).and_return(true)
@@ -53,88 +53,88 @@ describe PagesHelper do
 		context "with two public languages and two language_roots" do
 
 			before :each do
-				@default_language_root = FactoryGirl.create(:language_root_page, :language => @default_language, :name => 'Default Language Root')
-				@klingonian_language_root = FactoryGirl.create(:language_root_page)
+				@default_language_root = Factory(:language_root_page, :language => @default_language, :name => 'Default Language Root')
+				@klingonian_language_root = Factory(:language_root_page)
 			end
-
+			
 			context "and config redirect_to_public_child is set to TRUE" do
-
+				
 				before :each do
 					# simulates link_to_public_child = true
 					helper.stub(:configuration).and_return(true)
 				end
-
+				
 				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
 				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 = FactoryGirl.create(:page, :language => @default_language, :parent_id => @default_language_root.id, :public => false, :name => "child1")
-					@klingonian_first_public_child = FactoryGirl.create(:page, :language => @klingonian, :parent_id => @klingonian_language_root.id, :public => false, :name => "child1")
+					@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
 				end
-
+				
 				it "should render two links when having two public language_root pages" do
 					helper.language_switches.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 = FactoryGirl.create(:page, :language => @default_language, :parent_id => @default_language_root.id, :public => true, :name => "child1")
-					@klingonian_first_public_child = FactoryGirl.create(:page, :language => @klingonian, :parent_id => @klingonian_language_root.id, :public => true, :name => "child1")
+					@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)
 				end
-
+			
 				it "should render two links when having two not public language_roots but a public children in both" do
 					@default_language_root.update_attributes(:public => false)
 					@klingonian_language_root.update_attributes(:public => false)
-					@default_first_public_child = FactoryGirl.create(:page, :language => @default_language, :parent_id => @default_language_root.id, :public => true, :name => "child1")
-					@klingonian_first_public_child = FactoryGirl.create(:page, :language => @klingonian, :parent_id => @klingonian_language_root.id, :public => true, :name => "child1")
+					@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)
 				end
-
+			
 				it "should return nil when having two not public language_roots and a public children in only one of them" do
 					@default_language_root.update_attributes(:public => false)
 					@klingonian_language_root.update_attributes(:public => false)
-					@default_first_public_child = FactoryGirl.create(:page, :language => @default_language, :parent_id => @default_language_root.id, :public => false, :name => "child1")
-					@klingonian_first_public_child = FactoryGirl.create(:page, :language => @klingonian, :parent_id => @klingonian_language_root.id, :public => true, :name => "child1")
+					@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
 				end
-
+				
 			end
-
+		
 			context "and config redirect_to_public_child is set to FALSE" do
-
+				
 				before :each do
 					# simulates link_to_public_child = false
 					helper.stub(:configuration).and_return(false)
 				end
-
+				
 				it "should render two links when having two public language_root pages" do
 					helper.language_switches.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 = FactoryGirl.create(:page, :language => @default_language, :parent_id => @default_language_root.id, :public => true, :name => "child1")
-					@klingonian_first_public_child = FactoryGirl.create(:page, :language => @klingonian, :parent_id => @klingonian_language_root.id, :public => true, :name => "child1")
+					@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
 				end
-
+				
 				it "should render nil when having two not public language_roots but a public children in both" do
 					@default_language_root.update_attributes(:public => false)
 					@klingonian_language_root.update_attributes(:public => false)
-					@default_first_public_child = FactoryGirl.create(:page, :language => @default_language, :parent_id => @default_language_root.id, :public => true, :name => "child1")
-					@klingonian_first_public_child = FactoryGirl.create(:page, :language => @klingonian, :parent_id => @klingonian_language_root.id, :public => true, :name => "child1")
+					@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
 				end
-
+				
 			end
-
+		
 		end
-
+		
 	end
 
 end

data/spec/integration/pages_controller_spec.rb

@@ -4,15 +4,18 @@ describe PagesController do
 
 	before(:each) do
 		# We need an user or the signup view will show up
-	  FactoryGirl.create(:admin_user)
+
+	  user = Factory.build(:admin_user)
+    user.save_without_session_maintenance
+
 		@default_language = Language.get_default
-		@default_language_root = FactoryGirl.create(:language_root_page, :language => @default_language, :name => 'Home')
+		@default_language_root = Factory(:language_root_page, :language => @default_language, :name => 'Home')
 	end
 
 	context "rendering a page" do
 
 		it "should including all its elements and contents" do
-			p = FactoryGirl.create(:public_page, :language => @default_language)
+			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 '/a-public-page'
@@ -21,8 +24,8 @@ describe PagesController do
 
 		it "should have 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)
+				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 '/'
 			within('div#navigation ul') { page.should have_selector('li a[href="/page-1"], li a[href="/page-2"]') }
@@ -31,34 +34,34 @@ describe PagesController do
 	end
 
 	context "performing a fulltext search" do
-
+	
 		before(:each) 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)
+		  @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)
 		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)
-			search_result_page = FactoryGirl.create(:public_page, :language => @default_language, :name => 'Suche', :page_layout => 'search', :parent_id => @default_language_root.id)
+			search_result_page = Factory(:public_page, :language => @default_language, :name => 'Suche', :page_layout => 'search', :parent_id => @default_language_root.id)
 			visit('/suche?query=Petshop')
 			within('div#content .searchresult') { 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)
-			search_result_page = FactoryGirl.create(:public_page, :language => @default_language, :name => 'Suche', :page_layout => 'search', :parent_id => @default_language_root.id)
+			search_result_page = Factory(:public_page, :language => @default_language, :name => 'Suche', :page_layout => 'search', :parent_id => @default_language_root.id)
 			visit('/suche?query=Petshop')
 			within('div#content .searchresult') { page.should have_content('Petshop') }
 	  end
-
+	
 	end
 
 	context "redirecting" do
-
+		
 		context "in multi language mode" do
 
 			before(:each) do
-			  @page = FactoryGirl.create(:public_page)
+			  @page = Factory(:public_page)
 			end
 
 			it "should redirect to url with nested language code" do
@@ -67,12 +70,12 @@ describe PagesController do
 			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)
+					@child = Factory(:public_page, :name => 'Public Child', :parent_id => @page.id)
 				end
-
+				
 				it ", if requested page is unpublished" do
 		    	visit '/kl/not-public'
 					page.current_path.should == '/kl/public-child'
@@ -82,7 +85,7 @@ describe PagesController do
 		    	visit '/not-public'
 					page.current_path.should == '/kl/public-child'
 				end
-
+			  
 			end
 
 			it "should redirect to pages url, if requested url is index url" do
@@ -101,11 +104,11 @@ describe PagesController do
 	  	end
 
 		end
-
+		
 		context "not in multi language mode" do
 
 			before(:each) do
-			  @page = FactoryGirl.create(:public_page, :language => @default_language, :parent_id => @default_language_root.id)
+			  @page = Factory(:public_page, :language => @default_language, :parent_id => @default_language_root.id)
 			end
 
 		  it "should redirect from nested language code url to normal url" do
@@ -114,12 +117,12 @@ describe PagesController do
 			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)
+					@child = Factory(:public_page, :name => 'Public Child', :parent_id => @page.id, :language => @default_language)
 				end
-
+				
 			  it ", if requested page is unpublished" do
 		    	visit '/not-public'
 					page.current_path.should == '/public-child'
@@ -129,7 +132,7 @@ describe PagesController do
 		    	visit '/de/not-public'
 					page.current_path.should == '/public-child'
 				end
-
+				
 			end
 
 			it "should redirect to pages url, if requested url is index url" do
@@ -143,7 +146,7 @@ describe PagesController do
 		  end
 
 		end
-
+		
 	end
 
 end

data/spec/integration/security_spec.rb

@@ -16,7 +16,8 @@ describe "Security: " do
   
   context "If on or more users are present" do
     it "a visitor should not be able to signup" do
-      @user = User.create({:login => 'foo', :email => 'foo@bar.com', :password => 's3cr3t', :password_confirmation => 's3cr3t'})
+      @user = User.new({:login => 'foo', :email => 'foo@bar.com', :password => 's3cr3t', :password_confirmation => 's3cr3t'})
+      @user.save_without_session_maintenance
       visit '/admin/signup'
       within('#alchemy_greeting') { page.should_not have_content('have to signup') }
     end

data/spec/models/content_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Content do
 
   it "should return the ingredient from its essence" do
-    FactoryGirl.create(:element)
+    Factory(:element)
 		EssenceText.first.update_attributes(:body => "Hello")
 		Content.first.ingredient.should == EssenceText.first.ingredient
   end

data/spec/models/element_spec.rb

@@ -9,19 +9,19 @@ describe Element do
 	  end
 
 		it "should return all public elements" do
-			elements = [FactoryGirl.create(:element, :public => true), FactoryGirl.create(:element, :public => true)]
+			elements = [Factory(:element, :public => true), Factory(:element, :public => true)]
 		  Element.published.all.should == elements
 		end
 
 		it "should return all elements by name" do
-			elements = [FactoryGirl.create(:element, :name => 'article'), FactoryGirl.create(:element, :name => 'article')]
+			elements = [Factory(:element, :name => 'article'), Factory(:element, :name => 'article')]
 		  Element.named(['article']).all.should == elements
 		end
 
 		it "should return all elements but excluded ones" do
-			FactoryGirl.create(:element, :name => 'article')
-			FactoryGirl.create(:element, :name => 'article')
-			excluded = [FactoryGirl.create(:element, :name => 'claim')]
+			Factory(:element, :name => 'article')
+			Factory(:element, :name => 'article')
+			excluded = [Factory(:element, :name => 'claim')]
 		  Element.excluded(['article']).all.should == excluded
 		end
 
@@ -47,7 +47,7 @@ describe Element do
 	context "retrieving contents, essences and ingredients" do
 
 		before(:each) do
-			@element = FactoryGirl.create(:element, :name => 'news')
+			@element = Factory(:element, :name => 'news')
 		end
 
 		it "should return an ingredient by name" do
@@ -65,7 +65,7 @@ describe Element do
 	end
 
 	it "should return a collection of trashed elements" do
-	  @element = FactoryGirl.create(:element)
+	  @element = Factory(:element)
 		@element.trash
 		Element.trashed.should include(@element)
 	end
@@ -73,14 +73,14 @@ describe Element do
 	context "trashed" do
 
 		before(:each) do
-		  @element = FactoryGirl.create(:element)
+		  @element = Factory(:element)
 			@element.trash
 		end
-
+	  
 		it "should be not public" do
 	   	@element.public.should be_false
 		end
-
+		
 		it "should have no page" do
 			@element.page.should == nil
 		end
@@ -88,7 +88,7 @@ describe Element do
 		it "should be folded" do
 	    @element.folded.should == true
 		end
-
+		
 	end
 
 	it "should raise error if all_for_page method has no page" do

data/spec/models/language_spec.rb

@@ -3,25 +3,25 @@ require 'spec_helper'
 describe Language do
 
 	before(:all) do
-		@language = FactoryGirl.create(:language)
+		@language = Factory(:language)
 	end
-
+	
 	after(:all) do
 		@language.destroy if @language
 	end
 
 	it "should return a label for code" do
 	  @language.label(:code).should == 'kl'
-	end
+	end 
 
 	it "should return a label for name" do
 		@language.label(:name).should == 'Klingonian'
 	end
-
+		
 	it "should not be deletable if it is the default language" do
 		@default_language = Language.find_by_default(true)
 		if !@default_language
-			@default_language = FactoryGirl.create(:language, :name => "default", :code => "aa", :frontpage_name => "intro", :default => true)
+			@default_language = Factory(:language, :name => "default", :code => "aa", :frontpage_name => "intro", :default => true)
 		end
 		expect { @default_language.destroy }.should raise_error
 	end

data/spec/models/page_spec.rb

@@ -3,58 +3,58 @@
 require 'spec_helper'
 
 describe Page do
-
+	
 	before(:each) do
 		@rootpage = Page.rootpage
 		@language = Language.get_default
-		@language_root = FactoryGirl.create(:page, :parent_id => @rootpage.id, :language => @language, :language_root => true, :page_layout => 'intro')
+		@language_root = Factory(:page, :parent_id => @rootpage.id, :language => @language, :language_root => true, :page_layout => 'intro')
 	end
-
+	
 	describe ".layout_description" do
-
+		
 		context "for a language root page" do
-
+			
 			it "should return the page layout description as hash" do
 				@language_root.layout_description['name'].should == 'intro'
 			end
-
+			
 			it "should return an empty hash for root page" do
 				@rootpage.layout_description.should == {}
 			end
-
+			
 		end
-
+		
 		it "should raise Exception if the page_layout could not be found in the definition file" do
 			@page = mock(:page, :page_layout => 'foo')
 			expect { @page.layout_description }.to raise_error
 		end
-
+		
 	end
-
+	
 	it "should contain one rootpage" do
 		Page.rootpage.should be_instance_of(Page)
 	end
 
 	it "should return all rss feed elements" do
-		@page = FactoryGirl.create(:public_page, :page_layout => 'news', :parent_id => @language_root.id, :language => @language)
+		@page = Factory(:public_page, :page_layout => 'news', :parent_id => @language_root.id, :language => @language)
 		@page.feed_elements.should == Element.find_all_by_name('news')
 	end
-
+	
 	context "finding elements" do
-
+	
 		before(:each) do
-			@page = FactoryGirl.create(:public_page)
+			@page = Factory(:public_page)
 			@non_public_elements = [
-				FactoryGirl.create(:element, :public => false, :page => @page),
-				FactoryGirl.create(:element, :public => false, :page => @page)
+				Factory(:element, :public => false, :page => @page),
+				Factory(:element, :public => false, :page => @page)
 			]
 		end
-
+		
 	  it "should return the collection of elements if passed an array into options[:collection]" do
 			options = {:collection => @page.elements}
 			@page.find_elements(options).all.should == @page.elements.all
 		end
-
+		
 		context "with show_non_public argument TRUE" do
 
 			it "should return all elements from empty options" do
@@ -78,7 +78,7 @@ describe Page do
 		  end
 
 		end
-
+		
 		context "with show_non_public argument FALSE" do
 
 			it "should return all elements from empty arguments" do
@@ -102,56 +102,56 @@ describe Page do
 		  end
 
 		end
-
+	
 	end
-
+	
 	context "create" do
 		it "the rootpage with page_layout rootpage does not need a parent_id" do
 			@rootpage.rootpage?.should be_true
 		end
-
+		
 		it "all pages except the rootpage must have a parent_id" do
-			page = FactoryGirl.build(:page, :page_layout => "anypage", :parent_id => nil, :language => @language)
+			page = Factory.build(:page, :page_layout => "anypage", :parent_id => nil, :language => @language)
 			page.valid?
 			page.should have(1).error_on(:parent_id)
 		end
-
+		
 		it "must not be created if the page_layout is set to 'rootpage' and a page already exists with this page_layout and parent_id = nil" do
-		  page = FactoryGirl.build(:page, :name => "anypage", :page_layout => "rootpage", :parent_id => @language_root.id, :language => @language)
+		  page = Factory.build(:page, :name => "anypage", :page_layout => "rootpage", :parent_id => @language_root.id, :language => @language)
 			page.valid?
 			page.should have(1).error_on(:page_layout)
 		end
-
+		
 		it "should get a webfriendly urlname on create" do
-			page = FactoryGirl.create(:page, :name => 'klingon$&stößel ', :language => @language, :parent_id => @language_root.id)
+			page = Factory(:page, :name => 'klingon$&stößel ', :language => @language, :parent_id => @language_root.id)
 			page.urlname.should == 'klingon-stoessel'
 		end
 
 	  it "should generate a three letter urlname from two letter name" do
-	    page = FactoryGirl.create(:page, :name => 'Au', :language => @language, :parent_id => @language_root.id)
+	    page = Factory(:page, :name => 'Au', :language => @language, :parent_id => @language_root.id)
 	    page.urlname.should == '-au'
 	  end
 
 	  it "should generate a three letter urlname from two letter name with umlaut" do
-	    page = FactoryGirl.create(:page, :name => 'Aü', :language => @language, :parent_id => @language_root.id)
+	    page = Factory(:page, :name => 'Aü', :language => @language, :parent_id => @language_root.id)
 	    page.urlname.should == 'aue'
 	  end
 
 	  it "should generate a three letter urlname from one letter name" do
-	    page = FactoryGirl.create(:page, :name => 'A', :language => @language, :parent_id => @language_root.id)
+	    page = Factory(:page, :name => 'A', :language => @language, :parent_id => @language_root.id)
 	    page.urlname.should == '--a'
 	  end
 	end
-
+	
 	context "with children" do
 		before(:each) do
-			@first_child = FactoryGirl.create(:page, :name => "First child", :language => @language, :public => false, :parent_id => @language_root.id)
+			@first_child = Factory(:page, :name => "First child", :language => @language, :public => false, :parent_id => @language_root.id)
 			@first_child.move_to_child_of(@language_root)
-
-			@first_public_child = FactoryGirl.create(:page, :name => "First public child", :language => @language, :parent_id => @language_root.id, :public => true)
+			
+			@first_public_child = Factory(:page, :name => "First public child", :language => @language, :parent_id => @language_root.id, :public => true)
 			@first_public_child.move_to_child_of(@language_root)
 		end
-
+		
 		it "should return a page object (or nil if no public child exists) for first_public_child" do
 			if @language_root.children.any?
 				@language_root.first_public_child.should == @first_public_child
@@ -160,63 +160,63 @@ describe Page do
 			end
 		end
 	end
-
+	
 	context ".public" do
 	  it "should return 2 pages that are public" do
-			FactoryGirl.create(:public_page, :name => 'First Public Child', :parent_id => @language_root.id, :language => @language)
-			FactoryGirl.create(:public_page, :name => 'Second Public Child', :parent_id => @language_root.id, :language => @language)
+			Factory(:public_page, :name => 'First Public Child', :parent_id => @language_root.id, :language => @language)
+			Factory(:public_page, :name => 'Second Public Child', :parent_id => @language_root.id, :language => @language)
 	    Page.published.should have(2).pages
 	  end
 	end
-
+		
 	context ".not_locked" do
 	  it "should return 3 pages that are not blocked by a user at the moment" do
-	    FactoryGirl.create(:public_page, :locked => true, :name => 'First Public Child', :parent_id => @language_root.id, :language => @language)
-			FactoryGirl.create(:public_page, :name => 'Second Public Child', :parent_id => @language_root.id, :language => @language)
+	    Factory(:public_page, :locked => true, :name => 'First Public Child', :parent_id => @language_root.id, :language => @language)
+			Factory(:public_page, :name => 'Second Public Child', :parent_id => @language_root.id, :language => @language)
 	    Page.not_locked.should have(3).pages
 	  end
 	end
 	context ".all_locked" do
 	  it "should return 1 page that is blocked by a user at the moment" do
-	    FactoryGirl.create(:public_page, :locked => true, :name => 'First Public Child', :parent_id => @language_root.id, :language => @language)
+	    Factory(:public_page, :locked => true, :name => 'First Public Child', :parent_id => @language_root.id, :language => @language)
 	    Page.all_locked.should have(1).pages
 	  end
 	end
-
+	
 	context ".language_roots" do
 	  it "should return 1 language_root" do
-			FactoryGirl.create(:public_page, :name => 'First Public Child', :parent_id => @language_root.id, :language => @language)
+			Factory(:public_page, :name => 'First Public Child', :parent_id => @language_root.id, :language => @language)
 	    Page.language_roots.should have(1).pages
 	  end
 	end
-
-
+	
+	
 	context ".layoutpages" do
 	  it "should return 1 layoutpage" do
-			FactoryGirl.create(:public_page, :layoutpage => true, :name => 'Layoutpage', :parent_id => @rootpage.id, :language => @language)
+			Factory(:public_page, :layoutpage => true, :name => 'Layoutpage', :parent_id => @rootpage.id, :language => @language)
 	    Page.layoutpages.should have(1).pages
 	  end
 	end
-
+	
 	context ".visible" do
 	  it "should return 1 visible page" do
-	    FactoryGirl.create(:public_page, :name => 'First Public Child', :visible => true, :parent_id => @language_root.id, :language => @language)
+	    Factory(:public_page, :name => 'First Public Child', :visible => true, :parent_id => @language_root.id, :language => @language)
 	    Page.visible.should have(1).pages
 	  end
 	end
-
+	
 	context ".accessable" do
 	  it "should return 2 accessable pages" do
-	    FactoryGirl.create(:public_page, :name => 'First Public Child', :restricted => true, :parent_id => @language_root.id, :language => @language)
+	    Factory(:public_page, :name => 'First Public Child', :restricted => true, :parent_id => @language_root.id, :language => @language)
 			Page.accessable.should have(2).pages
 	  end
 	end
-
+	
 	context ".restricted" do
 	  it "should return 1 restricted page" do
-	    FactoryGirl.create(:public_page, :name => 'First Public Child', :restricted => true, :parent_id => @language_root.id, :language => @language)
+	    Factory(:public_page, :name => 'First Public Child', :restricted => true, :parent_id => @language_root.id, :language => @language)
 	    Page.restricted.should have(1).pages
 	  end
 	end
-
+	
 end