locomotivecms_steam 1.2.1 → 1.3.0.rc1

data/spec/fixtures/default/app/views/pages/all.liquid.haml

@@ -11,6 +11,6 @@ published: true
 {% endfor %}
 </ul>
 
-<!-- TEST -->{{ site.index.children | map: 'title' | join: " - " }}<!-- TEST -->
+<!-- TEST -->{{ site.index.children | map: 'title' | sort | join: " - " }}<!-- TEST -->
 
 {% endblock %}

data/spec/fixtures/default/app/views/pages/emails/reset_password.liquid

@@ -0,0 +1,15 @@
+---
+title: Reset password instructions
+listed: false
+published: true
+handle: reset_password_instructions
+---
+Hello {{ account.name }},
+
+To reset your password please follow the link below:
+
+{{ reset_password_url }}
+
+If you need help or have any questions, please visit https://www.locomotivecms.com
+Thanks!
+Locomotive

data/spec/fixtures/default/app/views/pages/songs/template.liquid.haml

@@ -15,4 +15,4 @@ handle: a-song-template
 #content_type_size{content_type_size: "{{ page.content_type.size }}"}
 #content_type_count{content_type_count: "{{ page.content_type.count }}"}
 
-{% endblock %}
+{% endblock %}

data/spec/fixtures/default/config/metafields_schema.yml

@@ -31,3 +31,13 @@ github:
       min: 0
       max: 3600
 
+smtp:
+  fields:
+    address:
+      type: string
+    localhost:
+      type: string
+    user_name:
+      type: string
+    password:
+      type: string

data/spec/fixtures/default/config/site.yml

@@ -32,3 +32,8 @@ metafields:
   github:
     api_url: https://api.github.com/repos/vmg/redcarpet/issues?state=closed
     expires_in: 42
+  smtp:
+    address: localhost
+    port: 25
+    user_name: user
+    password: password

data/spec/fixtures/default/config/translations.yml

@@ -1,3 +1,27 @@
 powered_by:
   en: Powered by
-  fr: Propulsé par
+  fr: Propulsé par
+
+auth_wrong_credentials:
+  en: Your email and/or password are incorrect
+  fr: Votre email et/ou mot de passe sont incorrects
+
+auth_signed_out:
+  en: You've been signed out
+  fr: Vous avez été déconnecté(e)
+
+auth_wrong_email:
+  en: Your email is unknown
+  fr: Votre email est inconnu
+
+auth_reset_password_instructions_sent:
+  en: "The instructions for changing your password have been emailed to you"
+  fr: "Les instructions pour modifier votre mot de passe viennent de vous être envoyées"
+
+auth_invalid_token:
+  en: "The reset token is not valid anymore"
+  fr: "Le token de re-initialisation du mot de passe n'est plus valide"
+
+auth_password_too_short:
+  en: "Your password is too short"
+  fr: "Votre mot de passe est trop court"

data/spec/fixtures/default/data/accounts.yml

@@ -0,0 +1,15 @@
+- "John":
+    email: 'john@doe.net'
+    password: 'easyone'
+
+- "Jane":
+    email: 'john@doe.net'
+    password: 'anotherone'
+    _auth_reset_token: '420000000000000'
+    _auth_reset_sent_at: '2020-01-01T15:00:00.000Z'
+
+- "Mickey":
+    email: 'mickey@doe.net'
+    password: 'anotherone'
+    _auth_reset_token: '420000000000001'
+    _auth_reset_sent_at: '2016-01-01T15:00:00.000Z'

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1 +1 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "locomotive_engine_wagon_dev.locomotive_theme_assets" } ] }
+{"options":{},"indexes":[{"v":1,"key":{"_id":1},"name":"_id_","ns":"locomotive_engine_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_wagon_dev.locomotive_translations" } ] }
+{"options":{},"indexes":[{"v":1,"key":{"_id":1},"name":"_id_","ns":"locomotive_engine_dev.locomotive_translations"}]}

data/spec/integration/repositories/content_entry_repository_spec.rb

@@ -116,7 +116,7 @@ describe Locomotive::Steam::ContentEntryRepository do
 
       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('5610310b87f6431588000029') }
+      let(:entry_id)  { BSON::ObjectId.from_string('5829ffa087f6435971756881') }
 
     end
 

data/spec/integration/repositories/content_type_repository_spec.rb

@@ -13,7 +13,7 @@ describe Locomotive::Steam::ContentTypeRepository do
 
     describe '#all' do
       subject { repository.all }
-      it { expect(subject.size).to eq 5 }
+      it { expect(subject.size).to eq 6 }
     end
 
     describe '#by_slug' do

data/spec/integration/repositories/page_repository_spec.rb

@@ -14,7 +14,7 @@ describe Locomotive::Steam::PageRepository do
     describe '#all' do
       let(:conditions) { {} }
       subject { repository.all(conditions) }
-      it { expect(subject.size).to eq 26 }
+      it { expect(subject.size).to eq 33 }
 
       context 'with conditions' do
         let(:conditions) { { fullpath: 'index', 'slug.ne' => '404' } }
@@ -34,7 +34,7 @@ describe Locomotive::Steam::PageRepository do
 
     describe '#only_handle_and_fullpath' do
       subject { repository.only_handle_and_fullpath }
-      it { expect(subject.size).to eq 3 }
+      it { expect(subject.size).to eq 8 }
     end
 
     describe '#by_fullpath' do
@@ -78,7 +78,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 15 }
+      it { expect(subject.size).to eq 17 }
     end
 
     describe '#editable_element_for' do

data/spec/integration/repositories/theme_asset_repository_spec.rb

@@ -26,7 +26,7 @@ describe Locomotive::Steam::ThemeAssetRepository do
     describe '#checksums' do
       subject { repository.checksums }
       it { expect(subject.size).to eq 16 }
-      it { expect(subject['stylesheets/application.css']).to eq '3bacf4c2b7877e230e6990d72dae7724' }
+      it { expect(subject['stylesheets/application.css']).to eq 'f431407c21db339b7759c2d7ded2553f' }
     end
 
   end

data/spec/integration/repositories/translation_repository_spec.rb

@@ -13,7 +13,7 @@ describe Locomotive::Steam::TranslationRepository do
 
     describe '#all' do
       subject { repository.all }
-      it { expect(subject.size).to eq 1 }
+      it { expect(subject.size).to eq 7 }
     end
 
     describe '#by_key' do

data/spec/integration/server/auth_spec.rb

@@ -0,0 +1,196 @@
+require File.dirname(__FILE__) + '/../integration_helper'
+
+describe 'Authentication' do
+
+  include Rack::Test::Methods
+
+  def app
+    run_server
+  end
+
+  describe 'sign in action' do
+
+    it 'renders the form' do
+      get '/account/sign-in'
+      expect(last_response.body).to include '/account/sign-in'
+      expect(last_response.body).not_to include "You've been signed out"
+    end
+
+    describe 'press the sign in button' do
+
+      let(:params) { {
+        auth_action:          'sign_in',
+        auth_content_type:    'accounts',
+        auth_id_field:        'email',
+        auth_password_field:  'password',
+        auth_id:              'john@doe.net',
+        auth_password:        'easyone',
+        auth_callback:        '/account/me'
+      } }
+
+      it 'redirects to the callback' do
+        sign_in(params)
+        expect(last_response.status).to eq 301
+        expect(last_response.location).to eq '/account/me'
+      end
+
+      it 'displays the profile page as described in the params' do
+        sign_in(params, true)
+        expect(last_response.body).to include "My name is John and I'm logged in!"
+      end
+
+      context 'wrong credentials' do
+
+        let(:params) { {
+          auth_action:          'sign_in',
+          auth_content_type:    'accounts',
+          auth_id_field:        'email',
+          auth_password_field:  'password',
+          auth_id:              'john@doe.net',
+          auth_password:        'dontrememberit',
+          auth_callback:        '/account/me'
+        } }
+
+        it 'renders the sign in page with an error message' do
+          sign_in(params)
+          expect(last_response.status).to eq 200
+          expect(last_response.body).to include '/account/sign-in'
+          expect(last_response.body).to include 'Your email and/or password are incorrect'
+        end
+
+      end
+
+      def sign_in(params, follow_redirect = false)
+        post '/account/sign-in', params
+        follow_redirect! if follow_redirect
+        last_response
+      end
+
+    end
+
+  end
+
+  describe 'sign out action' do
+
+    let(:params) { {
+      auth_action:          'sign_out',
+      auth_content_type:    'accounts'
+    } }
+
+    let(:rack_session) { {
+      'authenticated_entry_type'  => 'accounts',
+      'authenticated_entry_id'    => 'john'
+    } }
+
+    it 'displays the profile page as described in the params' do
+      post '/account/sign-in', params, { 'rack.session' => rack_session }
+      expect(last_response.body).to include "You've been signed out"
+      expect(last_response.body).not_to include "You're already authenticated!"
+    end
+
+  end
+
+  describe 'forgot password action' do
+
+    let(:email) { '' }
+
+    let(:params) { {
+      auth_action:                'forgot_password',
+      auth_content_type:          'accounts',
+      auth_id_field:              'email',
+      auth_id:                    email,
+      auth_reset_password_url:    'http://acme.com/account/reset-password',
+      auth_callback:              '/account/sign-in',
+      auth_email_from:            'support@acme.com',
+      auth_email_handle:          'reset_password_instructions',
+      auth_email_smtp_address:    'smtp.nowhere.net',
+      auth_email_smtp_user_name:  'jane',
+      auth_email_smtp_password:   'easyone'
+    } }
+
+    it 'renders the forgot password page with an error message' do
+      post '/account/forgot-password', params
+      expect(last_response.status).to eq 200
+      expect(last_response.body).to include 'Forgot your password'
+      expect(last_response.body).to include 'Your email is unknown'
+    end
+
+    context 'with an known email' do
+
+      let(:email) { 'john@doe.net' }
+
+      it 'sends an email to the account' do
+        post '/account/forgot-password', params
+        expect(last_response.status).to eq 200
+        expect(last_response.body).to include "The instructions for changing your password have been emailed to you"
+      end
+
+    end
+
+  end
+
+  describe 'reset password action' do
+
+    let(:token) { '' }
+    let(:new_password) { 'newone!' }
+
+    let(:params) { {
+      auth_action:                'reset_password',
+      auth_content_type:          'accounts',
+      auth_password_field:        'password',
+      auth_password:              new_password,
+      auth_reset_token:           token,
+      auth_callback:              '/account/me'
+    } }
+
+    it 'renders the reset password page with an error message' do
+      post '/account/reset-password', params
+      expect(last_response.status).to eq 200
+      expect(last_response.body).to include 'Change your password'
+      expect(last_response.body).to include 'The reset token is not valid anymore'
+    end
+
+    context 'with an expired token' do
+
+      let(:token) { '420000000000001' }
+
+      it 'renders the reset password page with an error message' do
+        post '/account/reset-password', params
+        expect(last_response.status).to eq 200
+        expect(last_response.body).to include 'Change your password'
+        expect(last_response.body).to include 'The reset token is not valid anymore'
+      end
+
+    end
+
+    context 'with a valid token' do
+
+      let(:token) { '420000000000000' }
+
+      it 'sends an email to the account' do
+        post '/account/reset-password', params
+        expect(last_response.status).to eq 301
+        follow_redirect!
+        expect(last_response.body).to include "My name is Jane and I'm logged in!"
+      end
+
+      context 'with a too short password' do
+
+        let(:new_password) { 'short' }
+
+        it 'renders the reset password page with an error message' do
+          post '/account/reset-password', params
+          expect(last_response.status).to eq 200
+          expect(last_response.body).to include 'Change your password'
+          expect(last_response.body).to include 'Your password is too short'
+        end
+
+      end
+
+    end
+
+  end
+
+end
+
+

data/spec/integration/server/basic_spec.rb

@@ -173,4 +173,22 @@ describe Locomotive::Steam::Server do
 
   end
 
+  describe 'page with parse or render errors' do
+
+    context 'liquid parsing error' do
+
+      subject { get '/about-us/john-doe'; last_response.body }
+      it { expect { subject }.to raise_error(Locomotive::Steam::RenderError, "Liquid syntax error (line 1): Syntax Error in 'for loop' - Valid syntax: for [item] in [collection]") }
+
+    end
+
+    context 'rendering error' do
+
+      subject { get '/fr/a-notre-sujet/jean-personne'; last_response.body }
+      it { expect { subject }.to raise_error(Locomotive::Steam::ActionError, "identifier 'foo' undefined") }
+
+    end
+
+  end
+
 end