locomotive_cms 2.0.3 → 2.1.0

data/spec/models/locomotive/content_type_spec.rb

@@ -10,7 +10,7 @@ describe Locomotive::ContentType do
 
     it 'should have a valid factory' do
       content_type = FactoryGirl.build(:content_type)
-      content_type.entries_custom_fields.build :label => 'anything', :type => 'string'
+      content_type.entries_custom_fields.build label: 'anything', type: 'string'
       content_type.should be_valid
     end
 
@@ -25,29 +25,29 @@ describe Locomotive::ContentType do
     end
 
     it 'requires the presence of slug' do
-      content_type = FactoryGirl.build(:content_type, :name => nil, :slug => nil)
+      content_type = FactoryGirl.build(:content_type, name: nil, slug: nil)
       content_type.should_not be_valid
       content_type.errors[:slug].should == ["can't be blank"]
     end
 
     it 'is not valid if slug is not unique' do
       content_type = FactoryGirl.build(:content_type)
-      content_type.entries_custom_fields.build :label => 'anything', :type => 'string'
+      content_type.entries_custom_fields.build label: 'anything', type: 'string'
       content_type.save
-      (content_type = FactoryGirl.build(:content_type, :site => content_type.site)).should_not be_valid
+      (content_type = FactoryGirl.build(:content_type, site: content_type.site)).should_not be_valid
       content_type.errors[:slug].should == ["is already taken"]
     end
 
     it 'is not valid if there is not at least one field' do
       content_type = FactoryGirl.build(:content_type)
       content_type.should_not be_valid
-      content_type.errors[:entries_custom_fields].should == { :base => ['At least, one custom field is required'] }
+      content_type.errors[:entries_custom_fields].should == { base: ['At least, one custom field is required'] }
     end
 
     %w(created_at updated_at).each do |name|
       it "does not allow #{name} as name" do
         content_type = FactoryGirl.build(:content_type)
-        field = content_type.entries_custom_fields.build :label => 'anything', :type => 'string', :name => name
+        field = content_type.entries_custom_fields.build label: 'anything', type: 'string', name: name
         field.valid?.should be_false
         field.errors[:name].should == ['is reserved']
       end
@@ -70,9 +70,9 @@ describe Locomotive::ContentType do
   context '#ordered_entries' do
 
     before(:each) do
-      (@content_type = build_content_type(:order_by => 'created_at')).save
-      @content_2 = @content_type.entries.create :name => 'Sacha'
-      @content_1 = @content_type.entries.create :name => 'Did'
+      (@content_type = build_content_type(order_by: 'created_at')).save
+      @content_2 = @content_type.entries.create name: 'Sacha'
+      @content_1 = @content_type.entries.create name: 'Did'
     end
 
     it 'orders with the ASC direction by default' do
@@ -91,26 +91,26 @@ describe Locomotive::ContentType do
     end
 
     it 'returns a list of entries ordered by a column specified by order_by (ASC)' do
-      @content_type.order_by = @content_type.entries_custom_fields.where(:name => 'name').first._id
+      @content_type.order_by = @content_type.entries_custom_fields.where(name: 'name').first._id
       @content_type.ordered_entries.collect(&:name).should == %w(Did Sacha)
     end
 
     it 'returns a list of entries ordered by a column specified by order_by (DESC)' do
-      @content_type.order_by = @content_type.entries_custom_fields.where(:name => 'name').first._id
+      @content_type.order_by = @content_type.entries_custom_fields.where(name: 'name').first._id
       @content_type.order_direction = 'desc'
       @content_type.ordered_entries.collect(&:name).should == %w(Sacha Did)
     end
 
     it 'returns a list of contents ordered through condition {order_by: "name asc"}' do
-      @content_type.order_by = @content_type.entries_custom_fields.where(:name => 'name').first._id
+      @content_type.order_by = @content_type.entries_custom_fields.where(name: 'name').first._id
       @content_type.order_direction = 'desc'
-      @content_type.ordered_entries(:order_by => 'name asc').collect(&:name).should == %w(Did Sacha)
+      @content_type.ordered_entries(order_by: 'name asc').collect(&:name).should == %w(Did Sacha)
     end
 
     it 'returns a list of entries ordered by a Date column when first instance is missing the value' do
-      @content_type.order_by = @content_type.entries_custom_fields.where(:name => 'active_at').first._id
+      @content_type.order_by = @content_type.entries_custom_fields.where(name: 'active_at').first._id
       @content_2.update_attribute :active_at, Date.parse('01/01/2001')
-      content_3 = @content_type.entries.create :name => 'Mario', :active_at => Date.parse('02/02/2001')
+      content_3 = @content_type.entries.create name: 'Mario', active_at: Date.parse('02/02/2001')
 
       @content_type.ordered_entries.map(&:active_at).should == [nil, Date.parse('01/01/2001'), Date.parse('02/02/2001')]
 
@@ -125,12 +125,12 @@ describe Locomotive::ContentType do
     before(:each) do
       build_belongs_to_has_many_relationship
 
-      @category_1 = @category_content_type.entries.create :name => 'Gems'
-      @category_2 = @category_content_type.entries.create :name => 'Service'
+      @category_1 = @category_content_type.entries.create name: 'Gems'
+      @category_2 = @category_content_type.entries.create name: 'Service'
 
-      @content_1 = @content_type.entries.create :name => 'Github',        :category => @category_2
-      @content_2 = @content_type.entries.create :name => 'LocomotiveCMS', :category => @category_1, :description => 'Lorem ipsum',  :_position_in_category => 1
-      @content_3 = @content_type.entries.create :name => 'RubyOnRails',   :category => @category_1, :description => 'Zzzzzz',       :_position_in_category => 2
+      @content_1 = @content_type.entries.create name: 'Github',        category: @category_2
+      @content_2 = @content_type.entries.create name: 'LocomotiveCMS', category: @category_1, description: 'Lorem ipsum',  _position_in_category: 1
+      @content_3 = @content_type.entries.create name: 'RubyOnRails',   category: @category_1, description: 'Zzzzzz',       _position_in_category: 2
     end
 
     context '#ordering in a belongs_to/has_many relationship' do
@@ -150,7 +150,7 @@ describe Locomotive::ContentType do
       end
 
       it 'uses the order by position if the UI option is enabled' do
-        field = @category_content_type.entries_custom_fields.where(:name => 'projects').first
+        field = @category_content_type.entries_custom_fields.where(name: 'projects').first
         field.ui_enabled = true;
 
         @category_content_type.save!; @category_1 = safe_find(@category_1.class, @category_1._id)
@@ -173,14 +173,14 @@ describe Locomotive::ContentType do
       end
 
       it 'groups entries with a different columns order' do
-        @category_content_type.update_attributes :order_by => @category_content_type.entries_custom_fields.first._id, :order_direction => 'desc'
+        @category_content_type.update_attributes order_by: @category_content_type.entries_custom_fields.first._id, order_direction: 'desc'
         groups = @content_type.send(:group_by_belongs_to_field, @content_type.group_by_field)
 
         groups.map { |h| h[:name] }.should == %w(Service Gems)
       end
 
       it 'deals with entries without a value for the group_by field (orphans)' do
-        @content_type.entries.create :name => 'MacOsX'
+        @content_type.entries.create name: 'MacOsX'
         groups = @content_type.send(:group_by_belongs_to_field, @content_type.group_by_field)
 
         groups.map { |h| h[:name] }.should == ['Gems', 'Service', nil]
@@ -198,7 +198,7 @@ describe Locomotive::ContentType do
       site = FactoryGirl.build(:site)
       Locomotive::Site.stubs(:find).returns(site)
 
-      @content_type = build_content_type(:site => site)
+      @content_type = build_content_type(site: site)
       # Locomotive::ContentType.logger = Logger.new($stdout)
       # Locomotive::ContentType.db.connection.instance_variable_set(:@logger, Logger.new($stdout))
     end
@@ -207,14 +207,14 @@ describe Locomotive::ContentType do
 
       %w{label type}.each do |key|
         it "should validate presence of #{key}" do
-          field = @content_type.entries_custom_fields.build({ :label => 'Shortcut', :type => 'string' }.merge(key.to_sym => nil))
+          field = @content_type.entries_custom_fields.build({ label: 'Shortcut', type: 'string' }.merge(key.to_sym => nil))
           field.should_not be_valid
           field.errors[key.to_sym].should == ["can't be blank"]
         end
       end
 
       it 'should not have unique label' do
-        field = @content_type.entries_custom_fields.build :label => 'Active', :type => 'boolean'
+        field = @content_type.entries_custom_fields.build label: 'Active', type: 'boolean'
         field.should_not be_valid
         field.errors[:label].should == ["is already taken"]
       end
@@ -283,14 +283,14 @@ describe Locomotive::ContentType do
       end
 
       it 'adds new field' do
-        @content_type.entries_custom_fields.build :label => 'Author', :name => 'author', :type => 'string'
+        @content_type.entries_custom_fields.build label: 'Author', name: 'author', type: 'string'
         @content_type.save && @content_type.reload
         asset = @content_type.entries.first
         lambda { asset.author }.should_not raise_error
       end
 
       it 'removes a field' do
-        @content_type.entries_custom_fields.destroy_all :conditions => { :name => 'active_at' }
+        @content_type.entries_custom_fields.destroy_all(name: 'active_at')
         @content_type.save && @content_type.reload
         asset = @content_type.entries.first
         lambda { asset.active_at }.should raise_error
@@ -298,7 +298,7 @@ describe Locomotive::ContentType do
 
       it 'removes the field used as the label when setting the original label_field_name value before' do
         @content_type.label_field_name = 'name'
-        @content_type.entries_custom_fields.destroy_all :conditions => { :name => @content_type.label_field_name }
+        @content_type.entries_custom_fields.destroy_all(name: @content_type.label_field_name)
         @content_type.save
         @content_type.label_field_name.should == 'description'
       end
@@ -317,8 +317,8 @@ describe Locomotive::ContentType do
 
       it 'adds new field' do
         @content_type.entries_custom_fields.clear
-        field = @content_type.entries_custom_fields.build :label => 'Title'
-        @content_type.entries_custom_fields_attributes = { 0 => { :id => field.id.to_s, 'label' => 'A title', 'type' => 'string' }, 1 => { 'label' => 'Tagline', 'type' => 'sring' } }
+        field = @content_type.entries_custom_fields.build label: 'Title'
+        @content_type.entries_custom_fields_attributes = { 0 => { id: field.id.to_s, 'label' => 'A title', 'type' => 'string' }, 1 => { 'label' => 'Tagline', 'type' => 'sring' } }
         @content_type.entries_custom_fields.size.should == 2
         @content_type.entries_custom_fields.first.label.should == 'A title'
         @content_type.entries_custom_fields.last.label.should == 'Tagline'
@@ -327,10 +327,10 @@ describe Locomotive::ContentType do
       it 'updates/removes fields' do
         @content_type.save
 
-        field = @content_type.entries_custom_fields.build :label => 'Title', :type => 'string'
+        field = @content_type.entries_custom_fields.build label: 'Title', type: 'string'
         @content_type.save
 
-        @content_type.update_attributes(:entries_custom_fields_attributes => {
+        @content_type.update_attributes(entries_custom_fields_attributes: {
           '0' => { '_id' => lookup_field_id(1), 'label' => 'My Description', 'type' => 'text', '_destroy' => '1' },
           '1' => { '_id' => lookup_field_id(2), 'label' => 'Active', 'type' => 'boolean', '_destroy' => '1' },
           '2' => { '_id' => field._id, 'label' => 'My Title !' },
@@ -350,29 +350,30 @@ describe Locomotive::ContentType do
 
   def build_content_type(options = {}, &block)
     FactoryGirl.build(:content_type, options).tap do |content_type|
-      content_type.entries_custom_fields.build :label => 'Name',        :type => 'string'
-      content_type.entries_custom_fields.build :label => 'Description', :type => 'text'
-      content_type.entries_custom_fields.build :label => 'Active',      :type => 'boolean'
-      content_type.entries_custom_fields.build :label => 'Active at',   :type => 'date'
+      content_type.entries_custom_fields.build label: 'Name',        type: 'string'
+      content_type.entries_custom_fields.build label: 'Description', type: 'text'
+      content_type.entries_custom_fields.build label: 'Active',      type: 'boolean'
+      content_type.entries_custom_fields.build label: 'Active at',   type: 'date'
       block.call(content_type) if block_given?
     end
   end
 
   def safe_find(klass, id)
     Mongoid::IdentityMap.clear
+    # Rails.logger.debug "---> reload #{klass}, #{id}!!!!!"
     klass.find(id)
   end
 
   def build_content_entry(content_type)
-    content_type.entries.build(:name => 'Asset on steroids', :description => 'Lorem ipsum', :active => true)
+    content_type.entries.build(name: 'Asset on steroids', description: 'Lorem ipsum', active: true)
   end
 
   def build_belongs_to_has_many_relationship
-    (@category_content_type = build_content_type(:name => 'Categories')).save!
+    (@category_content_type = build_content_type(name: 'Categories')).save!
     category_klass = @category_content_type.klass_with_custom_fields(:entries).name
 
     @content_type = build_content_type.tap do |content_type|
-      field = content_type.entries_custom_fields.build :label => 'Category', :type => 'belongs_to', :class_name => category_klass
+      field = content_type.entries_custom_fields.build label: 'Category', type: 'belongs_to', class_name: category_klass
       content_type.order_by           = 'name'
       content_type.order_direction    = 'desc'
       content_type.group_by_field_id  = field._id
@@ -380,7 +381,7 @@ describe Locomotive::ContentType do
     end
     project_klass = @content_type.klass_with_custom_fields(:entries).name
 
-    field = @category_content_type.entries_custom_fields.build :label => 'Projects', :type => 'has_many', :class_name => project_klass, :inverse_of => :category, :ui_enabled => false
+    field = @category_content_type.entries_custom_fields.build label: 'Projects', type: 'has_many', class_name: project_klass, inverse_of: :category, ui_enabled: false
     @category_content_type.save!
   end
 

data/spec/models/locomotive/editable_control_spec.rb

@@ -10,9 +10,9 @@ describe Locomotive::EditableControl do
   describe '#simple' do
 
     before(:each) do
-      @home.update_attributes :raw_template => "{% block body %}{% editable_control 'menu', options: 'true=Yes,false=No' %}false{% endeditable_control %}{% endblock %}"
+      @home.update_attributes raw_template: "{% block body %}{% editable_control 'menu', options: 'true=Yes,false=No' %}false{% endeditable_control %}{% endblock %}"
 
-      @sub_page_1 = FactoryGirl.create(:page, :slug => 'sub_page_1', :parent => @home, :raw_template => "{% extends 'parent' %}")
+      @sub_page_1 = FactoryGirl.create(:page, slug: 'sub_page_1', parent: @home, raw_template: "{% extends 'parent' %}")
     end
 
     it 'exists' do
@@ -36,11 +36,11 @@ describe Locomotive::EditableControl do
   describe '"sticky" elements' do
 
     before(:each) do
-      @home.update_attributes :raw_template => "{% block body %}{% editable_control 'menu', options: 'true=Yes,false=No', fixed: true %}false{% endeditable_control %}{% endblock %}"
+      @home.update_attributes raw_template: "{% block body %}{% editable_control 'menu', options: 'true=Yes,false=No', fixed: true %}false{% endeditable_control %}{% endblock %}"
       @home_el = @home.editable_elements.first
 
-      @sub_page_1 = FactoryGirl.create(:page, :slug => 'sub_page_1', :parent => @home, :raw_template => "{% extends 'parent' %}")
-      @sub_page_2 = FactoryGirl.create(:page, :slug => 'sub_page_2', :parent => @home, :raw_template => "{% extends 'parent' %}")
+      @sub_page_1 = FactoryGirl.create(:page, slug: 'sub_page_1', parent: @home, raw_template: "{% extends 'parent' %}")
+      @sub_page_2 = FactoryGirl.create(:page, slug: 'sub_page_2', parent: @home, raw_template: "{% extends 'parent' %}")
 
       @sub_page_1_el = @sub_page_1.editable_elements.first
       @sub_page_2_el = @sub_page_2.editable_elements.first

data/spec/models/locomotive/editable_file_spec.rb

@@ -6,7 +6,7 @@ describe Locomotive::EditableFile do
     @site = FactoryGirl.create(:site)
     @home = @site.pages.root.first
 
-    @home.update_attributes :raw_template => "{% block body %}{% editable_file 'image' %}Lorem ipsum{% endeditable_file %}{% endblock %}"
+    @home.update_attributes raw_template: "{% block body %}{% editable_file 'image' %}Lorem ipsum{% endeditable_file %}{% endblock %}"
 
     @home = @site.pages.root.first
   end
@@ -39,15 +39,31 @@ describe Locomotive::EditableFile do
     before(:each) do
       @editable_file = @home.editable_elements.first
       @editable_file.source = FixturedAsset.open('5k.png')
+      # @editable_file.save
+      # Rails.logger.debug "------------- START --------"
+      # puts "changed"
+      # puts @editable_file.changed.inspect
+      # puts "changes"
+      # puts @editable_file.changes.inspect
+      # puts @home.changes.inspect
       @home.save
+      @home.reload
+      # puts @editable_file.inspect
+      # puts @home.errors.inspect
+      # Rails.logger.debug "------------- DONE --------"
+      # @home = Locomotive::Page.find(@home._id)
     end
 
     it 'has a valid source' do
       @editable_file.source?.should be_true
+      # puts @editable_file.source.inspect
     end
 
     it 'returns the right path even if the page has been retrieved with the minimum_attributes scope' do
-      @home = @site.pages.minimal_attributes(%w(editable_elements)).root.first
+      # @home = @site.pages.minimal_attributes(%w(editable_elements)).root.first
+      @home = @site.pages.root.first
+      # puts @home.inspect
+      # puts @home.editable_elements.inspect
       @home.editable_elements.first.source?.should be_true
     end
 
@@ -56,10 +72,10 @@ describe Locomotive::EditableFile do
   describe '"sticky" files' do
 
     before(:each) do
-      @home.update_attributes :raw_template => "{% block body %}{% editable_file 'image', fixed: true %}/foo.png{% endeditable_file %}{% endblock %}"
+      @home.update_attributes raw_template: "{% block body %}{% editable_file 'image', fixed: true %}/foo.png{% endeditable_file %}{% endblock %}"
 
-      @sub_page_1 = FactoryGirl.create(:page, :slug => 'sub_page_1', :parent => @home, :raw_template => "{% extends 'index' %}")
-      @sub_page_2 = FactoryGirl.create(:page, :slug => 'sub_page_2', :parent => @home, :raw_template => "{% extends 'index' %}")
+      @sub_page_1 = FactoryGirl.create(:page, slug: 'sub_page_1', parent: @home, raw_template: "{% extends 'index' %}")
+      @sub_page_2 = FactoryGirl.create(:page, slug: 'sub_page_2', parent: @home, raw_template: "{% extends 'index' %}")
 
       @sub_page_1_el = @sub_page_1.editable_elements.first
       @sub_page_2_el = @sub_page_2.editable_elements.first

data/spec/models/locomotive/editable_long_text_spec.rb

@@ -6,9 +6,9 @@ describe Locomotive::EditableLongText do
     @site = FactoryGirl.create(:site)
     @home = @site.pages.root.first
 
-    @home.update_attributes :raw_template => "{% block body %}{% editable_long_text 'body' %}Lorem ipsum{% endeditable_long_text %}{% endblock %}"
+    @home.update_attributes raw_template: "{% block body %}{% editable_long_text 'body' %}Lorem ipsum{% endeditable_long_text %}{% endblock %}"
 
-    @sub_page_1 = FactoryGirl.create(:page, :slug => 'sub_page_1', :parent => @home, :raw_template => "{% extends 'parent' %}")
+    @sub_page_1 = FactoryGirl.create(:page, slug: 'sub_page_1', parent: @home, raw_template: "{% extends 'parent' %}")
   end
 
   it 'exists' do
@@ -32,7 +32,7 @@ describe Locomotive::EditableLongText do
   describe 'when modifying the raw template' do
 
     it 'can update its content from the raw template if the user has not modified it' do
-      @home.update_attributes :raw_template => "{% block body %}{% editable_long_text 'body' %}Lorem ipsum v2{% endeditable_long_text %}{% endblock %}"
+      @home.update_attributes raw_template: "{% block body %}{% editable_long_text 'body' %}Lorem ipsum v2{% endeditable_long_text %}{% endblock %}"
       @home.editable_elements.first.default_content.should be_true
       @home.editable_elements.first.content.should == 'Lorem ipsum v2'
     end

data/spec/models/locomotive/editable_short_text_spec.rb

@@ -8,14 +8,14 @@ describe Locomotive::EditableShortText do
       @site = FactoryGirl.create(:site)
       @home = @site.pages.root.first
 
-      @home.update_attributes :raw_template => "{% block body %}{% editable_short_text 'body' %}Lorem ipsum{% endeditable_short_text %}{% endblock %}"
+      @home.update_attributes raw_template: "{% block body %}{% editable_short_text 'body' %}Lorem ipsum{% endeditable_short_text %}{% endblock %}"
 
-      @sub_page_1 = FactoryGirl.create(:page, :slug => 'sub_page_1', :parent => @home, :raw_template => "{% extends 'parent' %}")
-      @sub_page_2 = FactoryGirl.create(:page, :slug => 'sub_page_2', :parent => @home, :raw_template => "{% extends 'parent' %}")
+      @sub_page_1 = FactoryGirl.create(:page, slug: 'sub_page_1', parent: @home, raw_template: "{% extends 'parent' %}")
+      @sub_page_2 = FactoryGirl.create(:page, slug: 'sub_page_2', parent: @home, raw_template: "{% extends 'parent' %}")
 
       @sub_page_1_el = @sub_page_1.editable_elements.first
 
-      @sub_page_1_1 = FactoryGirl.create(:page, :slug => 'sub_page_1_1', :parent => @sub_page_1, :raw_template => "{% extends 'parent' %}")
+      @sub_page_1_1 = FactoryGirl.create(:page, slug: 'sub_page_1_1', parent: @sub_page_1, raw_template: "{% extends 'parent' %}")
     end
 
     context '#locales' do
@@ -35,7 +35,7 @@ describe Locomotive::EditableShortText do
 
       it 'adds new locale within sub page elements' do
         ::Mongoid::Fields::I18n.with_locale 'fr' do
-          @home.update_attributes :title => 'Accueil', :raw_template => "{% block body %}{% editable_short_text 'body' %}Lorem ipsum{% endeditable_short_text %}{% endblock %}"
+          @home.update_attributes title: 'Accueil', raw_template: "{% block body %}{% editable_short_text 'body' %}Lorem ipsum{% endeditable_short_text %}{% endblock %}"
           page = Locomotive::Page.find(@sub_page_1._id)
           page.editable_elements.first.content = 'Lorem ipsum (FR)'
           page.save
@@ -131,11 +131,11 @@ describe Locomotive::EditableShortText do
       @site = FactoryGirl.create(:site)
       @home = @site.pages.root.first
 
-      @home.update_attributes :raw_template => "{% block body %}{% editable_short_text 'body', fixed: true %}Lorem ipsum{% endeditable_short_text %}{% endblock %}"
+      @home.update_attributes raw_template: "{% block body %}{% editable_short_text 'body', fixed: true %}Lorem ipsum{% endeditable_short_text %}{% endblock %}"
       @home_el = @home.editable_elements.first
 
-      @sub_page_1 = FactoryGirl.create(:page, :slug => 'sub_page_1', :parent => @home, :raw_template => "{% extends 'parent' %}")
-      @sub_page_2 = FactoryGirl.create(:page, :slug => 'sub_page_2', :parent => @home, :raw_template => "{% extends 'parent' %}")
+      @sub_page_1 = FactoryGirl.create(:page, slug: 'sub_page_1', parent: @home, raw_template: "{% extends 'parent' %}")
+      @sub_page_2 = FactoryGirl.create(:page, slug: 'sub_page_2', parent: @home, raw_template: "{% extends 'parent' %}")
 
       @sub_page_1_el = @sub_page_1.editable_elements.first
       @sub_page_2_el = @sub_page_2.editable_elements.first

data/spec/models/locomotive/extensions/page/editable_elements_spec.rb

@@ -6,14 +6,14 @@ describe Locomotive::Extensions::Page::EditableElements do
     @site = FactoryGirl.create(:site)
     @home = @site.pages.root.first
 
-    @home.update_attributes :raw_template => "{% editable_short_text 'body' %}Lorem ipsum{% endeditable_short_text %}"
+    @home.update_attributes raw_template: "{% editable_short_text 'body' %}Lorem ipsum{% endeditable_short_text %}"
 
-    @sub_page_1 = FactoryGirl.create(:page, :slug => 'sub_page_1', :parent => @home, :raw_template => "{% extends 'parent' %}")
-    @sub_page_2 = FactoryGirl.create(:page, :slug => 'sub_page_2', :parent => @home, :raw_template => "{% extends 'parent' %}")
+    @sub_page_1 = FactoryGirl.create(:page, slug: 'sub_page_1', parent: @home, raw_template: "{% extends 'parent' %}")
+    @sub_page_2 = FactoryGirl.create(:page, slug: 'sub_page_2', parent: @home, raw_template: "{% extends 'parent' %}")
 
     @sub_page_1_el = @sub_page_1.editable_elements.first
 
-    @sub_page_1_1 = FactoryGirl.create(:page, :slug => 'sub_page_1_1', :parent => @sub_page_1, :raw_template => "{% extends 'parent' %}")
+    @sub_page_1_1 = FactoryGirl.create(:page, slug: 'sub_page_1_1', parent: @sub_page_1, raw_template: "{% extends 'parent' %}")
   end
 
   describe 'modification of an element within the home page' do
@@ -23,7 +23,7 @@ describe Locomotive::Extensions::Page::EditableElements do
     end
 
     it 'changes the type of the element in all the children' do
-      @home.update_attributes :raw_template => "{% editable_long_text 'body' %}Lorem ipsum{% endeditable_long_text %}"
+      @home.update_attributes raw_template: "{% editable_long_text 'body' %}Lorem ipsum{% endeditable_long_text %}"
       @sub_page_1.reload
       @sub_page_1.editable_elements.first._type.should == 'Locomotive::EditableLongText'
       @sub_page_1_1.reload
@@ -31,7 +31,7 @@ describe Locomotive::Extensions::Page::EditableElements do
     end
 
     it 'changes the hint of the element in all the children' do
-      @home.update_attributes :raw_template => "{% editable_long_text 'body', hint: 'My very useful hint' %}Lorem ipsum{% endeditable_long_text %}"
+      @home.update_attributes raw_template: "{% editable_long_text 'body', hint: 'My very useful hint' %}Lorem ipsum{% endeditable_long_text %}"
       @sub_page_1.reload
       @sub_page_1.editable_elements.first.hint.should == 'My very useful hint'
       @sub_page_1_1.reload
@@ -44,7 +44,7 @@ describe Locomotive::Extensions::Page::EditableElements do
 
     it 'does not remove the editable elements in other locales' do
       Mongoid::Fields::I18n.with_locale(:fr) do
-        @home.update_attributes :raw_template => "{% editable_short_text 'corps' %}Lorem ipsum{% endeditable_short_text %}"
+        @home.update_attributes raw_template: "{% editable_short_text 'corps' %}Lorem ipsum{% endeditable_short_text %}"
       end
       @home.reload
       @home.editable_elements.count.should == 2
@@ -52,12 +52,12 @@ describe Locomotive::Extensions::Page::EditableElements do
 
     it 'removes the editable elements which are not present in at least one locale' do
       Mongoid::Fields::I18n.with_locale(:fr) do
-        @home.update_attributes :raw_template => ''
+        @home.update_attributes raw_template: ''
       end
       @home.reload
       @home.editable_elements.count.should == 1
 
-      @home.update_attributes :raw_template => ''
+      @home.update_attributes raw_template: ''
       @home.reload
       @home.editable_elements.count.should == 0
     end