alchemy_cms 2.2.rc6 → 2.2.rc7

data/spec/controllers/pages_controller_spec.rb

@@ -6,13 +6,13 @@ describe Alchemy::PagesController do
 
   before(:each) do
     @default_language = Alchemy::Language.get_default
-    @default_language_root = Factory(:language_root_page, :language => @default_language, :name => 'Home', :public => true)
+    @default_language_root = FactoryGirl.create(:language_root_page, :language => @default_language, :name => 'Home', :public => true)
   end
 
   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)
+      @page = FactoryGirl.create(:public_page, :parent_id => @default_language_root.id, :page_layout => 'news', :name => 'News', :language => @default_language)
     end
 
     it "should render a rss feed" do
@@ -102,9 +102,9 @@ describe Alchemy::PagesController do
   describe "url nesting" 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)
+      @catalog = FactoryGirl.create(:public_page, :name => "Catalog", :parent_id => @default_language_root.id, :language => @default_language)
+      @products = FactoryGirl.create(:public_page, :name => "Products", :parent_id => @catalog.id, :language => @default_language)
+      @product = FactoryGirl.create(: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
@@ -133,7 +133,7 @@ describe Alchemy::PagesController do
 
   context "when a non-existent page is requested" do
     it "should rescue a RoutingError with rendering a 404 page." do
-      Factory(:admin_user) # otherwise we are redirected to create_user
+      FactoryGirl.create(:admin_user) # otherwise we are redirected to create_user
       get :show, {:urlname => 'doesntexist'}
       response.status.should == 404
       response.body.should have_content('The page you were looking for doesn\'t exist')

data/spec/dummy/config/database.yml

@@ -1,25 +1,31 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-development:
+sqlite: &sqlite
   adapter: sqlite3
-  database: db/development.sqlite3
+  database: db/<%= Rails.env %>.sqlite3
+
+mysql: &mysql
+  adapter: mysql2
+  username: root
+  password: 
+  database: alchemy_cms_dummy_<%= Rails.env %>
+
+postgresql: &postgresql
+  adapter: postgresql
+  username: postgres
+  password: 
+  database: alchemy_cms_dummy_<%= Rails.env %>
+  min_messages: ERROR
+
+defaults: &defaults
   pool: 5
   timeout: 5000
+  host: localhost
+  <<: *<%= ENV['DB'] || "sqlite" %>
+
+development:
+  <<: *defaults
 
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test:
-  adapter: sqlite3
-  database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
+  <<: *defaults
 
 production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  pool: 5
-  timeout: 5000
+  <<: *defaults

data/spec/dummy/db/schema.rb

@@ -200,7 +200,7 @@ ActiveRecord::Schema.define(:version => 20120302040145) do
     t.string   "urlname"
     t.string   "title"
     t.string   "language_code"
-    t.boolean  "language_root",    :limit => 255
+    t.boolean  "language_root"
     t.string   "page_layout"
     t.text     "meta_keywords"
     t.text     "meta_description"

data/spec/factories.rb

@@ -39,9 +39,9 @@ FactoryGirl.define do
 
   factory :page, :class => 'Alchemy::Page' do
 
-    language { Alchemy::Language.find_by_language_code('kl') || Factory(:language) }
-    name "A Page"
-    parent_id { (Alchemy::Page.find_by_language_root(true) || Factory(:language_root_page)).id }
+    language { Alchemy::Language.find_by_language_code('kl') || FactoryGirl.create(:language) }
+    sequence(:name) { |n| "A Page #{n}" }
+    parent_id { (Alchemy::Page.find_by_language_root(true) || FactoryGirl.create(:language_root_page)).id }
     page_layout "standard"
 
     factory :language_root_page do
@@ -53,7 +53,7 @@ FactoryGirl.define do
     end
 
     factory :public_page do
-      name "A Public Page"
+      sequence(:name) { |n| "A Public Page #{n}" }
       public true
     end
 
@@ -68,7 +68,7 @@ FactoryGirl.define do
   end
 
   factory :cell, :class => 'Alchemy::Cell' do
-    page { Alchemy::Page.find_by_language_root(true) || Factory(:language_root_page) }
+    page { Alchemy::Page.find_by_language_root(true) || FactoryGirl.create(:language_root_page) }
     name "A Cell"
   end
 

data/spec/helpers/admin/contents_helper_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Alchemy::Admin::ContentsHelper do
 
   before(:each) do
-    @element = Factory(:element)
+    @element = FactoryGirl.create(:element)
   end
 
   it "should render a dom id" do

data/spec/helpers/admin/elements_helper_spec.rb

@@ -5,8 +5,8 @@ include Alchemy::BaseHelper
 describe Alchemy::Admin::ElementsHelper do
 
   before(:each) do
-    @page = Factory(:public_page)
-    @element = Factory(:element, :page => @page)
+    @page = FactoryGirl.create(:public_page)
+    @element = FactoryGirl.create(:element, :page => @page)
   end
 
   it "should render an element editor partial" do

data/spec/helpers/admin/essences_helper_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Alchemy::Admin::EssencesHelper do
 
   before(:each) do
-    @element = Factory(:element)
+    @element = FactoryGirl.create(:element)
     @element.content_by_name('intro').essence.update_attributes(:body => 'hello!')
   end
 

data/spec/helpers/elements_helper_spec.rb

@@ -5,8 +5,8 @@ include Alchemy::BaseHelper
 describe Alchemy::ElementsHelper do
 
   before(:each) do
-    @page = Factory(:public_page)
-    @element = Factory(:element, :page => @page)
+    @page = FactoryGirl.create(:public_page)
+    @element = FactoryGirl.create(:element, :page => @page)
     session[:language_id] = @page.language_id
   end
 
@@ -26,53 +26,53 @@ describe Alchemy::ElementsHelper do
 
     context "with no certain option given" do
       it "should render all elements from @page" do
-        @another_element = Factory(:element, :page => @page)
+        @another_element = FactoryGirl.create(: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)
+        cell = FactoryGirl.create(:cell)
+        @another_element = FactoryGirl.create(: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)
+        @another_element = FactoryGirl.create(: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)
+        @another_element = FactoryGirl.create(: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, :name => 'Another Page')
-        @element_on_other_page = Factory(:element, :name => 'headline', :page => @another_page)
+        @another_page = FactoryGirl.create(:public_page)
+        @element_on_other_page = FactoryGirl.create(:element, :name => 'headline', :page => @another_page)
         helper.render_elements(:from_page => @another_page).should match(/id="#{@element_on_other_page.name}_\d*"/)
       end
 
       it "should not render any elements in a cell from the given page" do
-        @another_page = Factory(:public_page, :name => 'And Another Page')
-        @cell = Factory(:cell, :name => "Celltest", :page => @another_page)
-        @element_not_in_cell = Factory(:element, :name => 'headline', :page => @another_page)
-        @element_in_cell = Factory(:element, :name => 'article', :cell => @cell, :page => @another_page)
+        @another_page = FactoryGirl.create(:public_page)
+        @cell = FactoryGirl.create(:cell, :name => "Celltest", :page => @another_page)
+        @element_not_in_cell = FactoryGirl.create(:element, :name => 'headline', :page => @another_page)
+        @element_in_cell = FactoryGirl.create(:element, :name => 'article', :cell => @cell, :page => @another_page)
         helper.render_elements(:from_page => @another_page).should_not match(/id="#{@element_in_cell.name}_#{@element_in_cell.id}*"/)
       end
 
       context "and from_cell option" do
         it "should render all elements from the page's cell" do
-          @another_page = Factory(:public_page, :name => 'And even another page')
-          @cell = Factory(:cell, :name => "Celltest", :page => @another_page)
-          @element_not_in_cell = Factory(:element, :name => 'headline', :page => @another_page)
-          @element_in_cell = Factory(:element, :name => 'article', :cell => @cell, :page => @another_page)
+          @another_page = FactoryGirl.create(:public_page)
+          @cell = FactoryGirl.create(:cell, :name => "Celltest", :page => @another_page)
+          @element_not_in_cell = FactoryGirl.create(:element, :name => 'headline', :page => @another_page)
+          @element_in_cell = FactoryGirl.create(:element, :name => 'article', :cell => @cell, :page => @another_page)
           helper.render_elements(:from_page => @another_page, :from_cell => "Celltest").should match(/id="#{@element_in_cell.name}_#{@element_in_cell.id}*"/)
         end
       end
@@ -81,25 +81,25 @@ describe Alchemy::ElementsHelper do
 
     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)
+        cell = FactoryGirl.create(:cell)
+        @another_element = FactoryGirl.create(:element, :page => @page, :cell_id => cell.id)
         helper.render_elements(:from_cell => cell).should match(/id="#{@another_element.name}_#{@another_element.id}"/)
       end
 
       context "with from_cell and only option" do
         it "should render certain elements from a certain cell" do
-          cell = Factory(:cell)
-          @another_element = Factory(:element, :page => @page, :cell_id => cell.id)
-          @another_element2 = Factory(:element, :page => @page)
+          cell = FactoryGirl.create(:cell)
+          @another_element = FactoryGirl.create(:element, :page => @page, :cell_id => cell.id)
+          @another_element2 = FactoryGirl.create(:element, :page => @page)
           helper.render_elements(:from_cell => cell, :only => @another_element.name).should_not match(/id="#{@another_element2.name}_#{@another_element2.id}"/)
         end
       end
 
       context "with from_cell and except option" do
         it "should render all elements except certain ones from a certain cell" do
-          cell = Factory(:cell)
-          @another_element = Factory(:element, :page => @page, :cell_id => cell.id)
-          @another_element2 = Factory(:element, :page => @page, :cell_id => cell.id)
+          cell = FactoryGirl.create(:cell)
+          @another_element = FactoryGirl.create(:element, :page => @page, :cell_id => cell.id)
+          @another_element2 = FactoryGirl.create(:element, :page => @page, :cell_id => cell.id)
           helper.render_elements(:from_cell => cell, :except => @another_element.name).should_not match(/id="#{@another_element.name}_#{@another_element.id}"/)
         end
       end
@@ -109,9 +109,9 @@ describe Alchemy::ElementsHelper do
     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)
+        @another_element_1 = FactoryGirl.create(:element, :page => @page)
+        @another_element_2 = FactoryGirl.create(:element, :page => @page)
+        @another_element_3 = FactoryGirl.create(:element, :page => @page)
         helper.render_elements(:count => 1).should match(/id="#{@another_element_1.name}_#{@another_element_1.id}"/)
       end
     end
@@ -119,10 +119,10 @@ describe Alchemy::ElementsHelper do
     context "with offset option" do
       it "should render all elements beginning with the second." do
         @page.elements.delete_all
-        @another_page = Factory(:public_page, :name => 'And even one more page')
-        @another_element_1 = Factory(:element, :page => @page)
-        @another_element_2 = Factory(:element, :page => @page)
-        @another_element_3 = Factory(:element, :page => @page)
+        @another_page = FactoryGirl.create(:public_page)
+        @another_element_1 = FactoryGirl.create(:element, :page => @page)
+        @another_element_2 = FactoryGirl.create(:element, :page => @page)
+        @another_element_3 = FactoryGirl.create(:element, :page => @page)
         helper.render_elements(:offset => 1).should_not match(/id="#{@another_element_1.name}_#{@another_element_1.id}"/)
       end
     end
@@ -130,7 +130,7 @@ describe Alchemy::ElementsHelper do
     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)
+        @another_element_1 = FactoryGirl.create(: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
@@ -139,8 +139,8 @@ describe Alchemy::ElementsHelper do
 
   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)
+      cell = FactoryGirl.create(:cell)
+      @element_in_cell = FactoryGirl.create(: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

data/spec/helpers/essences_helper_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Alchemy::EssencesHelper do
 
   before(:each) do
-    @element = Factory(:element)
+    @element = FactoryGirl.create(:element)
     @element.content_by_name('intro').essence.update_attributes(:body => 'hello!')
   end
 

data/spec/helpers/pages_helper_spec.rb

@@ -9,7 +9,7 @@ describe Alchemy::PagesHelper do
   end
 
   it "should render the current page layout" do
-    @page = Factory(:public_page)
+    @page = FactoryGirl.create(:public_page)
     render_page_layout.should have_selector('div#content')
   end
 
@@ -17,8 +17,8 @@ describe Alchemy::PagesHelper do
 
     before(:each) 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)
+      @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)
     end
 
     context "not in multi_language mode" do
@@ -28,19 +28,19 @@ describe Alchemy::PagesHelper do
       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="/alchemy/a-public-page"]')
+        helper.render_navigation.should have_selector("ul.navigation_level_1 li.#{@page.urlname}.active.last a.active[href=\"/alchemy/#{@page.urlname}\"]")
       end
 
       context "with enabled url nesting" do
 
         before(:each) do
           helper.stub!(:configuration).and_return(true)
-          @level2 = Factory(:public_page, :parent_id => @page.id, :language => @language, :name => 'Level 2', :visible => true)
-          @page = Factory(:public_page, :parent_id => @level2.id, :language => @language, :name => 'Nested Page', :visible => true)
+          @level2 = FactoryGirl.create(:public_page, :parent_id => @page.id, :language => @language, :visible => true)
+          @level3 = FactoryGirl.create(:public_page, :parent_id => @level2.id, :language => @language, :visible => true)
         end
 
         it "should render nested page links" do
-          helper.render_navigation(:all_sub_menues => true).should have_selector('ul li a[href="/alchemy/a-public-page/level-2/nested-page"]')
+          helper.render_navigation(:all_sub_menues => true).should have_selector("ul li a[href=\"/alchemy/#{@page.urlname}/#{@level2.urlname}/#{@level3.urlname}\"]")
         end
 
       end
@@ -53,11 +53,11 @@ describe Alchemy::PagesHelper 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')
+      @language_root = FactoryGirl.create(:language_root_page, :language => @language, :name => 'Intro')
+      @level_1 = FactoryGirl.create(:public_page, :language => @language, :parent_id => @language_root.id, :visible => true, :name => 'Level 1')
+      @level_2 = FactoryGirl.create(:public_page, :language => @language, :parent_id => @level_1.id, :visible => true, :name => 'Level 2')
+      @level_3 = FactoryGirl.create(:public_page, :language => @language, :parent_id => @level_2.id, :visible => true, :name => 'Level 3')
+      @level_4 = FactoryGirl.create(:public_page, :language => @language, :parent_id => @level_3.id, :visible => true, :name => 'Level 4')
       helper.stub(:multi_language?).and_return(false)
     end
 
@@ -327,7 +327,7 @@ describe Alchemy::PagesHelper do
 
     before :each do
       @default_language = Alchemy::Language.get_default
-      @klingonian = Factory(:language)
+      @klingonian = FactoryGirl.create(:language)
       # simulates link_to_public_child = true
       helper.stub(:multi_language?).and_return(true)
       helper.stub(:configuration) { |arg| arg == :redirect_to_public_child ? true : false }
@@ -340,8 +340,8 @@ describe Alchemy::PagesHelper do
     context "with two public languages and two language_roots" do
 
       before :each do
-        @default_language_root = Factory(:language_root_page, :language => @default_language, :name => 'Default Language Root')
-        @klingonian_language_root = Factory(:language_root_page)
+        @default_language_root = FactoryGirl.create(:language_root_page, :language => @default_language, :name => 'Default Language Root')
+        @klingonian_language_root = FactoryGirl.create(:language_root_page)
       end
 
       context "and config redirect_to_public_child is set to TRUE" do
@@ -353,8 +353,8 @@ describe Alchemy::PagesHelper do
 
         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")
+          @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")
           helper.language_switcher.should == nil
         end
 
@@ -364,24 +364,24 @@ describe Alchemy::PagesHelper do
 
         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")
+          @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")
           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
           @default_language_root.update_attributes(:public => false)
           @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")
+          @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")
           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
           @default_language_root.update_attributes(:public => false)
           @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")
+          @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")
           helper.language_switcher.should == nil
         end
 
@@ -400,16 +400,16 @@ describe Alchemy::PagesHelper do
 
         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")
+          @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")
           helper.language_switcher.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 = 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")
+          @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")
           helper.language_switcher.should == nil
         end