locomotivecms_steam 1.0.0.pre.beta.3 → 1.0.0.rc1

data/spec/fixtures/mongodb/locomotive_theme_assets.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "locomotive_engine_2_5_dev.locomotive_theme_assets" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "locomotive_engine_wagon_dev.locomotive_theme_assets" } ] }

data/spec/fixtures/mongodb/locomotive_translations.metadata.json

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "locomotive_engine_2_5_dev.locomotive_translations" } ] }
+{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "locomotive_engine_wagon_dev.locomotive_translations" } ] }

data/spec/integration/liquid/tags/paginate_spec.rb

@@ -69,7 +69,7 @@ EOF
 
     it_should_behave_like 'pagination' do
 
-      let(:site_id)   { BSON::ObjectId.from_string('54eb49c12475804b2b000002') }
+      let(:site_id)   { mongodb_site_id }
       let(:adapter)   { Locomotive::Steam::MongoDBAdapter.new(database: 'steam_test', hosts: ['127.0.0.1:27017']) }
 
     end

data/spec/integration/repositories/content_entry_repository_spec.rb

@@ -82,9 +82,9 @@ describe Locomotive::Steam::ContentEntryRepository do
 
     it_should_behave_like 'a repository' do
 
-      let(:site_id)   { BSON::ObjectId.from_string('54eb49c12475804b2b000002') }
+      let(:site_id)   { mongodb_site_id }
       let(:adapter)   { Locomotive::Steam::MongoDBAdapter.new(database: 'steam_test', hosts: ['127.0.0.1:27017']) }
-      let(:entry_id)  { BSON::ObjectId.from_string('54eb4bbc2475804b2b00003f') }
+      let(:entry_id)  { BSON::ObjectId.from_string('5610310b87f6431588000029') }
 
     end
 

data/spec/integration/repositories/content_type_repository_spec.rb

@@ -46,7 +46,7 @@ describe Locomotive::Steam::ContentTypeRepository do
 
     it_should_behave_like 'a repository' do
 
-      let(:site_id) { BSON::ObjectId.from_string('54eb49c12475804b2b000002') }
+      let(:site_id) { mongodb_site_id }
       let(:adapter) { Locomotive::Steam::MongoDBAdapter.new(database: 'steam_test', hosts: ['127.0.0.1:27017']) }
 
     end

data/spec/integration/repositories/page_repository_spec.rb

@@ -19,7 +19,7 @@ describe Locomotive::Steam::PageRepository do
     describe '#all' do
       let(:conditions) { {} }
       subject { repository.all(conditions) }
-      it { expect(subject.size).to eq 24 }
+      it { expect(subject.size).to eq 26 }
 
       context 'with conditions' do
         let(:conditions) { { fullpath: 'index', 'slug.ne' => '404' } }
@@ -83,7 +83,7 @@ describe Locomotive::Steam::PageRepository do
     describe '#children_of' do
       let(:page) { repository.root }
       subject { repository.children_of(page) }
-      it { expect(subject.size).to eq 14 }
+      it { expect(subject.size).to eq 15 }
     end
 
     describe '#editable_element_for' do
@@ -98,7 +98,7 @@ describe Locomotive::Steam::PageRepository do
 
     it_should_behave_like 'a repository' do
 
-      let(:site_id)       { BSON::ObjectId.from_string('54eb49c12475804b2b000002') }
+      let(:site_id)       { mongodb_site_id }
       let(:adapter)       { Locomotive::Steam::MongoDBAdapter.new(database: 'steam_test', hosts: ['127.0.0.1:27017']) }
 
     end

data/spec/integration/repositories/site_repository_spec.rb

@@ -15,12 +15,12 @@ describe Locomotive::Steam::SiteRepository do
     end
 
     describe '#query' do
-      subject { repository.query { where(subdomain: 'sample') }.first }
-      it { expect(subject.name).to eq 'Sample website' }
+      subject { repository.query { where(handle: 'sample') }.first }
+      it { expect(subject.name).to eq 'Sample site' }
     end
 
     describe '#by_domain' do
-      subject { repository.by_domain('sample.lvh.me') }
+      subject { repository.by_domain('sample.example.com') }
       it { expect(subject).not_to eq nil }
     end
 

data/spec/integration/repositories/snippet_repository_spec.rb

@@ -27,7 +27,7 @@ describe Locomotive::Steam::SnippetRepository do
 
     it_should_behave_like 'a repository' do
 
-      let(:site_id) { BSON::ObjectId.from_string('54eb49c12475804b2b000002') }
+      let(:site_id) { mongodb_site_id }
       let(:adapter) { Locomotive::Steam::MongoDBAdapter.new(database: 'steam_test', hosts: ['127.0.0.1:27017']) }
 
     end

data/spec/integration/repositories/theme_asset_repository_spec.rb

@@ -10,7 +10,7 @@ describe Locomotive::Steam::ThemeAssetRepository do
 
   context 'MongoDB' do
 
-    let(:site_id) { BSON::ObjectId.from_string('54eb49c12475804b2b000002') }
+    let(:site_id) { mongodb_site_id }
     let(:adapter) { Locomotive::Steam::MongoDBAdapter.new(database: 'steam_test', hosts: ['127.0.0.1:27017']) }
 
     describe '#all' do
@@ -20,13 +20,13 @@ describe Locomotive::Steam::ThemeAssetRepository do
 
     describe '#url_for' do
       subject { repository.url_for('stylesheets/application.css') }
-      it { is_expected.to eq '/sites/54eb49c12475804b2b000002/theme/stylesheets/application.css' }
+      it { is_expected.to eq "/sites/#{mongodb_site_id}/theme/stylesheets/application.css" }
     end
 
     describe '#checksums' do
       subject { repository.checksums }
       it { expect(subject.size).to eq 16 }
-      it { expect(subject['stylesheets/application.css']).to eq 'aa017461d702a80ef8837e51e65deb4f' }
+      it { expect(subject['stylesheets/application.css']).to eq '3bacf4c2b7877e230e6990d72dae7724' }
     end
 
   end

data/spec/integration/repositories/translation_repository_spec.rb

@@ -27,7 +27,7 @@ describe Locomotive::Steam::TranslationRepository do
 
     it_should_behave_like 'a repository' do
 
-      let(:site_id) { BSON::ObjectId.from_string('54eb49c12475804b2b000002') }
+      let(:site_id) { mongodb_site_id }
       let(:adapter) { Locomotive::Steam::MongoDBAdapter.new(database: 'steam_test', hosts: ['127.0.0.1:27017']) }
 
     end

data/spec/integration/server/contact_form_spec.rb

@@ -32,7 +32,7 @@ describe 'ContactForm' do
 
         let(:url) { '/entry_submissions/foo' }
 
-        it { expect { response }.to raise_error('Unknown content type "foo"') }
+        it { expect { response }.to raise_error('Unknown content type "foo" or public_submission_enabled property not true') }
 
       end
 

data/spec/integration/server/sitemap_spec.rb

@@ -1,5 +1,7 @@
 require File.dirname(__FILE__) + '/../integration_helper'
 
+require 'locomotive/steam/adapters/filesystem.rb'
+
 describe Locomotive::Steam::Server do
 
   include Rack::Test::Methods
@@ -11,8 +13,9 @@ describe Locomotive::Steam::Server do
   describe 'sitemap.xml' do
 
     let(:now) { Time.use_zone('America/Chicago') { Time.zone.local(2015, 'mar', 25, 10, 0) } }
+    let(:env) { {} }
 
-    subject { Timecop.freeze(now) { get '/sitemap.xml' }; last_response.body }
+    subject { Timecop.freeze(now) { get('/sitemap.xml', {}, env) }; last_response.body }
 
     before { Locomotive::Steam::Adapters::Filesystem::SimpleCacheStore.new.clear }
 
@@ -29,6 +32,19 @@ describe Locomotive::Steam::Server do
       EOF
       ).strip)
     end
+
+    context 'existing sitemap page' do
+
+      let(:template)  { %{<?xml version="1.0" encoding="utf-8"?>OK</xml>} }
+      let(:page)      { instance_double('Page', liquid_source: template, templatized?: false, redirect_url: false, to_liquid: template, not_found?: false, response_type: 'application/xml') }
+      let(:env)       { { 'steam.page' => page } }
+
+      it 'renders the existing sitemap page' do
+        expect(subject).to eq %{<?xml version="1.0" encoding="utf-8"?>OK</xml>}
+      end
+
+    end
+
   end
 
 end

data/spec/support/helpers.rb

@@ -3,6 +3,10 @@ require 'locomotive/common'
 module Spec
   module Helpers
 
+    def mongodb_site_id
+      BSON::ObjectId.from_string('561030e287f6431555000006')
+    end
+
     def reset!
       FileUtils.rm_rf(File.expand_path('../../../site', __FILE__))
     end

data/spec/support/liquid.rb

@@ -12,12 +12,16 @@ module Liquid
 
   class TestDrop < Liquid::Drop
     def initialize(source)
-      @_source = source
+      @_source = source.with_indifferent_access
     end
 
     def before_method(meth)
       @_source[meth.to_sym]
     end
+
+    def as_json(options = nil)
+      @_source.as_json(options)
+    end
   end
 
   class SimpleEventsListener

data/spec/unit/adapters/filesystem/yaml_loaders/content_type_spec.rb

@@ -18,6 +18,7 @@ describe Locomotive::Steam::Adapters::Filesystem::YAMLLoaders::ContentType do
       expect(subject.size).to eq 5
       expect(subject.first[:slug]).to eq('bands')
       expect(subject.first[:entries_custom_fields].size).to eq 5
+      expect(subject.first[:entries_custom_fields].first[:position]).to eq 0
     end
 
   end

data/spec/unit/adapters/filesystem/yaml_loaders/page_spec.rb

@@ -15,11 +15,14 @@ describe Locomotive::Steam::Adapters::Filesystem::YAMLLoaders::Page do
     subject { loader.load(scope).sort { |a, b| a[:_fullpath] <=> b[:_fullpath] } }
 
     it 'tests various stuff' do
-      expect(subject.size).to eq 24
+      expect(subject.size).to eq 26
       expect(subject.first[:title]).to eq(en: 'Page not found')
-      expect(subject[14][:slug]).to eq(en: 'music', fr: 'notre-musique')
-      expect(subject[15][:_fullpath]).to eq 'songs'
-      expect(subject[15][:template_path]).to eq(en: false)
+      expect(subject[15][:is_layout]).to eq true
+      expect(subject[15][:listed]).to eq false
+      expect(subject[15][:published]).to eq false
+      expect(subject[16][:slug]).to eq(en: 'music', fr: 'notre-musique')
+      expect(subject[17][:_fullpath]).to eq 'songs'
+      expect(subject[17][:template_path]).to eq(en: false)
     end
 
   end

data/spec/unit/adapters/filesystem/yaml_loaders/site_spec.rb

@@ -12,7 +12,7 @@ describe Locomotive::Steam::Adapters::Filesystem::YAMLLoaders::Site do
 
     subject { loader.load(nil) }
 
-    it { expect(subject.first[:name]).to eq 'Sample website' }
+    it { expect(subject.first[:name]).to eq 'Sample site' }
 
   end
 

data/spec/unit/decorators/i18n_decorator_spec.rb

@@ -83,6 +83,15 @@ describe Locomotive::Steam::Decorators::I18nDecorator do
     expect(decorated.__locale__).to eq :fr
   end
 
+  describe '#to_hash' do
+
+    before { expect(page).to receive(:to_hash).and_return('title' => { 'en' => 'some stuff', 'fr' => 'some stuff' }) }
+    subject { decorated.to_hash }
+
+    it { expect(subject).to eq('title' => 'Bonjour monde', 'slug' => 'hello-world') }
+
+  end
+
   def i18n_field(name, translations)
     Locomotive::Steam::Models::I18nField.new(name, translations)
   end

data/spec/unit/entities/content_entry_spec.rb

@@ -55,6 +55,35 @@ describe Locomotive::Steam::ContentEntry do
 
   end
 
+  describe '#to_hash' do
+
+    let(:fields)      { [instance_double('TitleField', name: :title, type: :string), instance_double('PictureField', name: :picture, type: :file, localized: true)] }
+    let(:attributes)  { { id: 42, title: 'Hello world', _slug: 'hello-world', picture: Locomotive::Steam::Models::I18nField.new(:picture, fr: 'foo.png', en: 'bar.png'), custom_fields_recipe: ['hello', 'world'], _type: 'Entry' } }
+
+    subject { content_entry.to_hash }
+
+    before do
+      allow(type).to receive(:fields_by_name).and_return({ title: fields.first, picture: fields.last })
+      allow(type).to receive(:persisted_field_names).and_return([:title, :picture])
+      allow(content_entry).to receive(:base_url).and_return('/assets')
+    end
+
+    it { expect(Set.new(subject.keys)).to eq(Set.new(['_id', '_position', '_visible', '_label', '_slug', 'content_type_slug', 'title', 'picture', 'created_at', 'updated_at'])) }
+
+    context 'when decorated' do
+
+      let(:decorated) { Locomotive::Steam::Decorators::I18nDecorator.new(content_entry, :fr, :en) }
+
+      before { allow(content_entry).to receive(:localized_attributes).and_return({ picture: true }) }
+
+      subject { decorated.to_hash }
+
+      it { expect(subject['picture'].url).to eq '/assets/foo.png' }
+
+    end
+
+  end
+
   describe 'dynamic attributes' do
 
     let(:field_type)  { :string }

data/spec/unit/entities/content_type_field_spec.rb

@@ -74,4 +74,45 @@ describe Locomotive::Steam::ContentTypeField do
 
   end
 
+  describe '#persisted_name' do
+
+    subject { field.persisted_name }
+
+    context 'string type' do
+
+      let(:attributes) { { name: 'title', type: 'string' } }
+      it { is_expected.to eq 'title' }
+
+    end
+
+    context 'select type' do
+
+      let(:attributes) { { name: 'category', type: 'select' } }
+      it { is_expected.to eq 'category_id' }
+
+    end
+
+    context 'belongs_to type' do
+
+      let(:attributes) { { name: 'article', class_name: 'articles', type: 'belongs_to' } }
+      it { is_expected.to eq 'article_id' }
+
+    end
+
+    context 'many_to_many type' do
+
+      let(:attributes) { { name: 'articles', class_name: 'articles', type: 'many_to_many' } }
+      it { is_expected.to eq 'article_ids' }
+
+    end
+
+    context 'has_many type' do
+
+      let(:attributes) { { name: 'articles', class_name: 'articles', type: 'has_many', inverse_of: 'author' } }
+      it { is_expected.to eq nil }
+
+    end
+
+  end
+
 end

data/spec/unit/entities/content_type_spec.rb

@@ -56,4 +56,14 @@ describe Locomotive::Steam::ContentType do
 
   end
 
+  describe '#persisted_field_names' do
+
+    let(:fields) { [instance_double('Field1', name: :title, persisted_name: 'title'), instance_double('Field2', name: :author, persisted_name: nil)] }
+
+    subject { content_type.persisted_field_names }
+
+    it { is_expected.to eq(['title']) }
+
+  end
+
 end

data/spec/unit/entities/page_spec.rb

@@ -53,4 +53,28 @@ describe Locomotive::Steam::Page do
     end
   end
 
+  describe '#redirect?' do
+
+    subject { page.redirect? }
+
+    it { is_expected.to eq false }
+
+    context 'redirect_url has been set' do
+
+      let(:attributes) { { redirect: nil, redirect_url: 'http://www.google.fr' } }
+
+      it { is_expected.to eq true }
+
+      context 'but redirect is set to false' do
+
+        let(:attributes) { { redirect: false, redirect_url: 'http://www.google.fr' } }
+
+        it { is_expected.to eq false }
+
+      end
+
+    end
+
+  end
+
 end

data/spec/unit/entities/site_spec.rb

@@ -23,19 +23,35 @@ describe Locomotive::Steam::Site do
 
   describe '#locales' do
 
-    let(:attributes) { { locales: %w(en fr) } }
-
     subject { site.locales }
-    it { is_expected.to eq [:en, :fr] }
+
+    context 'without locales' do
+      it { is_expected.to eq [:en] }
+    end
+
+    context 'with locales' do
+
+      let(:attributes) { { locales: %w(en fr) } }
+      it { is_expected.to eq [:en, :fr] }
+
+    end
 
   end
 
   describe '#default_locale' do
 
-    let(:attributes) { { locales: %w(en fr) } }
-
     subject { site.default_locale }
-    it { is_expected.to eq :en }
+
+    context 'without locales' do
+      it { is_expected.to eq :en }
+    end
+
+    context 'with locales' do
+
+      let(:attributes) { { locales: %w(en fr) } }
+      it { is_expected.to eq :en }
+
+    end
 
   end
 
@@ -60,4 +76,26 @@ describe Locomotive::Steam::Site do
 
   end
 
+  describe '#last_modified_at' do
+
+    subject { site.last_modified_at }
+
+    it { is_expected.to eq nil }
+
+    context 'only updated_at is defined' do
+
+      let(:attributes) { { updated_at: DateTime.parse('2015/10/16 00:00:00') } }
+      it { is_expected.to eq DateTime.parse('2015/10/16 00:00:00') }
+
+    end
+
+    context 'template_version or content_version are defined' do
+
+      let(:attributes) { { updated_at: DateTime.parse('2015/10/16 00:00:00'), template_version: DateTime.parse('2007/06/29 00:00:00'), content_version: DateTime.parse('2009/09/10 00:00:00') } }
+      it { is_expected.to eq DateTime.parse('2009/09/10 00:00:00') }
+
+    end
+
+  end
+
 end

data/spec/unit/liquid/drops/content_entry_spec.rb

@@ -96,4 +96,20 @@ describe Locomotive::Steam::Liquid::Drops::ContentEntry do
 
   end
 
+  describe '#as_json' do
+
+    let(:type) { instance_double('Type', fields_by_name: { title: instance_double('StringField', type: :string ), picture: instance_double('FileField', type: :file), category: instance_double('SelectField', type: :select) }) }
+    let(:picture_field) { Locomotive::Steam::ContentEntry::FileField.new('foo.png', 'http://assets.dev', 42) }
+
+    before do
+      allow(entry).to receive(:to_hash).and_return({ '_id' => 1, 'title' => 'Hello world', 'picture' => picture_field, 'category_id' => 42 })
+      allow(entry).to receive(:category).and_return('Test')
+    end
+
+    subject { drop.as_json }
+
+    it { is_expected.to eq('id' => 1, '_id' => 1, 'title' => 'Hello world', 'picture' => 'http://assets.dev/foo.png?42', 'picture_url' => 'http://assets.dev/foo.png?42', 'category_id' => 42, 'category' => 'Test') }
+
+  end
+
 end

data/spec/unit/liquid/filters/json_spec.rb

@@ -19,7 +19,7 @@ describe Locomotive::Steam::Liquid::Filters::Json do
     describe 'includes only the fields specified' do
 
       let(:input) { [Liquid::TestDrop.new(title: 'Acme', body: 'Lorem ipsum'), 'title'] }
-      it { expect(subject).to eq %("title":"Acme") }
+      it { expect(subject).to eq %({"title":"Acme"}) }
 
     end
 
@@ -39,7 +39,7 @@ describe Locomotive::Steam::Liquid::Filters::Json do
       let(:input) {
         [[Liquid::TestDrop.new(title: 'Acme', body: 'Lorem ipsum'),
           Liquid::TestDrop.new(title: 'Hello world', body: 'Lorem ipsum')], 'title'] }
-      it { expect(subject).to eq %("Acme","Hello world") }
+      it { expect(subject).to eq %(["Acme","Hello world"]) }
 
     end
 
@@ -48,7 +48,30 @@ describe Locomotive::Steam::Liquid::Filters::Json do
       let(:input) {
         [[Liquid::TestDrop.new(title: 'Acme', body: 'Lorem ipsum', date: '2013-12-13'),
           Liquid::TestDrop.new(title: 'Hello world', body: 'Lorem ipsum', date: '2013-12-12')], 'title, body'] }
-      it { expect(subject).to eq %({"title":"Acme","body":"Lorem ipsum"},{"title":"Hello world","body":"Lorem ipsum"}) }
+      it { expect(subject).to eq %([{"title":"Acme","body":"Lorem ipsum"},{"title":"Hello world","body":"Lorem ipsum"}]) }
+
+    end
+
+  end
+
+  describe '#open_json' do
+
+    let(:input) { '' }
+    subject     { open_json(input) }
+
+    it { expect(subject).to eq '' }
+
+    context 'without leading and trailing brackets' do
+
+      let(:input) { %(["foo",[1,2],"bar"]) }
+      it { expect(subject).to eq %("foo",[1,2],"bar") }
+
+    end
+
+    context 'without leading and trailing braces' do
+
+      let(:input) { %({"title":"Acme","body":"Lorem ipsum"}) }
+      it { expect(subject).to eq %("title":"Acme","body":"Lorem ipsum") }
 
     end
 

data/spec/unit/liquid/tags/editable/control_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Locomotive::Steam::Liquid::Tags::Editable::Control do
 
-  let(:page)        { instance_double('Page') }
+  let(:page)        { instance_double('Page', fullpath: 'hello-world') }
   let!(:listener)   { Liquid::SimpleEventsListener.new }
   let(:options)     { { page: page } }
 

data/spec/unit/liquid/tags/editable/file_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Locomotive::Steam::Liquid::Tags::Editable::File do
 
-  let(:page)        { instance_double('Page', updated_at: DateTime.parse('2007-06-29 21:00:00')) }
+  let(:page)        { instance_double('Page', fullpath: 'hello-world', updated_at: DateTime.parse('2007-06-29 21:00:00')) }
   let!(:listener)   { Liquid::SimpleEventsListener.new }
   let(:options)     { { page: page } }
 

data/spec/unit/liquid/tags/editable/model_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Locomotive::Steam::Liquid::Tags::Editable::Model do
 
-  let(:page)        { instance_double('Page') }
+  let(:page)        { instance_double('Page', fullpath: 'hello-world') }
   let!(:listener)   { Liquid::SimpleEventsListener.new }
   let(:options)     { { page: page } }
 

data/spec/unit/liquid/tags/editable/text_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Locomotive::Steam::Liquid::Tags::Editable::Text do
 
-  let(:page)        { instance_double('Page') }
+  let(:page)        { instance_double('Page', fullpath: 'hello-world') }
   let!(:listener)   { Liquid::SimpleEventsListener.new }
   let(:options)     { { page: page } }
 
@@ -74,10 +74,10 @@ describe Locomotive::Steam::Liquid::Tags::Editable::Text do
     let(:live_editing)    { false }
     let(:element_editing) { true }
 
-    let(:page)        { instance_double('Page', fullpath: 'hello-world') }
-    let(:element)     { instance_double('EditableText', _id: 42, id: 42, default_content?: true, inline_editing?: element_editing, inline_editing: element_editing) }
+    let(:child_page)  { instance_double('Page', fullpath: 'child-page') }
+    let(:element)     { instance_double('EditableText', _id: 42, id: 42, default_content?: true, inline_editing?: element_editing, inline_editing: element_editing, format: 'html') }
     let(:services)    { Locomotive::Steam::Services.build_instance(nil) }
-    let(:context)     { ::Liquid::Context.new({}, {}, { page: page, services: services, live_editing: live_editing }) }
+    let(:context)     { ::Liquid::Context.new({}, {}, { page: child_page, services: services, live_editing: live_editing }) }
 
     before { allow(services.editable_element).to receive(:find).and_return(element) }
 
@@ -85,6 +85,11 @@ describe Locomotive::Steam::Liquid::Tags::Editable::Text do
 
     it { is_expected.to eq 'Hello world' }
 
+    it "doesn't try to find the element in another page" do
+      expect(services.page_finder).not_to receive(:find).with('hello-world')
+      is_expected.to eq 'Hello world'
+    end
+
     context 'no element found, render the default content' do
 
       let(:element) { nil }
@@ -92,9 +97,23 @@ describe Locomotive::Steam::Liquid::Tags::Editable::Text do
 
     end
 
+    context 'fixed element' do
+
+      let(:layout)  { instance_double('Page', fullpath: 'layout') }
+      let(:source)  { "{% editable_text title, hint: 'Simple short text', fixed: true %}Hello world{% endeditable_text %}" }
+      let(:options) { { page: layout } }
+      let(:element) { instance_double('EditableText', _id: 42, id: 42, default_content?: true, inline_editing?: element_editing, inline_editing: element_editing, format: 'html', fixed: true) }
+
+      it 'fetches the related page in order to get the element' do
+        expect(services.page_finder).to receive(:find).with('layout').and_return(layout)
+        is_expected.to eq 'Hello world'
+      end
+
+    end
+
     context 'modified content' do
 
-      let(:element) { instance_double('EditableText', content: 'Hello world!', default_content?: false) }
+      let(:element) { instance_double('EditableText', content: 'Hello world!', default_content?: false, format: 'html') }
       it { is_expected.to eq 'Hello world!' }
 
     end
@@ -103,11 +122,18 @@ describe Locomotive::Steam::Liquid::Tags::Editable::Text do
 
       let(:source) { '{% block wrapper %}{% block sidebar %}{% editable_text title %}Hello world{% endeditable_text %}{% endblock %}{% endblock %}' }
 
-      before { expect(services.editable_element).to receive(:find).with(page, 'wrapper/sidebar', 'title').and_return(element) }
+      before { expect(services.editable_element).to receive(:find).with(child_page, 'wrapper/sidebar', 'title').and_return(element) }
       it { is_expected.to eq 'Hello world' }
 
     end
 
+    context 'markdown format' do
+
+      let(:element) { instance_double('EditableText', content: "#Hello world!\nLorem ipsum", default_content?: false, format: 'markdown') }
+      it { is_expected.to eq "<h1>Hello world!</h1>\n<p>Lorem ipsum</p>\n" }
+
+    end
+
     context 'inline-editing mode' do
 
       let(:live_editing) { true }