locomotivecms_steam 1.5.0.beta3 → 1.5.0.rc0

data/spec/unit/services/auth_service_spec.rb

@@ -161,12 +161,18 @@ describe Locomotive::Steam::AuthService do
     end
 
 
-    it "returns :wrong_credentials if the password is empty" do
+    it "returns :wrong_credentials if the password is nil" do
       entry = instance_double('Account', password: nil)
       expect(entries).to receive(:all).with('accounts', { 'email' => 'john@doe.net' }).and_return([entry])
       is_expected.to eq :wrong_credentials
     end
 
+    it "returns :wrong_credentials if the password is blank" do
+      entry = instance_double('Account', password: '')
+      expect(entries).to receive(:all).with('accounts', { 'email' => 'john@doe.net' }).and_return([entry])
+      is_expected.to eq :wrong_credentials
+    end
+
     it "returns both :signed_in and the entry if the password matches the entry's password" do
       entry = build_account('easyone')
       expect(entries).to receive(:all).with('accounts', { 'email' => 'john@doe.net' }).and_return([entry])

data/spec/unit/services/content_entry_service_spec.rb

@@ -17,7 +17,8 @@ describe Locomotive::Steam::ContentEntryService do
     let(:first_validation)  { false }
     let(:errors)            { [:title] }
     let(:type)              { instance_double('Comments') }
-    let(:entry)             { instance_double('Entry', title: 'Hello world', content_type: type, valid?: first_validation, errors: errors, attributes: { title: 'Hello world' }, localized_attributes: []) }
+    let(:entry_id)          { nil }
+    let(:entry)             { instance_double('Entry', _id: entry_id, title: 'Hello world', content_type: type, valid?: first_validation, errors: errors, attributes: { title: 'Hello world' }, localized_attributes: []) }
 
     before do
       allow(type_repository).to receive(:by_slug).and_return(type)
@@ -47,12 +48,32 @@ describe Locomotive::Steam::ContentEntryService do
         let(:unique_fields) { { title: instance_double('Field', name: 'title') } }
 
         before do
-          allow(entry_repository).to receive(:exists?).with(title: 'Hello world').and_return(true)
           expect(entry.errors).to receive(:add).with(:title, :taken).and_return(true)
         end
 
-        it { is_expected.to eq false }
-        it { subject; expect(entry.errors).to eq([:title]) }
+        context 'the entry has never been persisted before' do
+
+          before do
+            allow(entry_repository).to receive(:exists?).with(title: 'Hello world', :'_id.ne' => nil).and_return(true)
+          end
+
+          it { is_expected.to eq false }
+          it { subject; expect(entry.errors).to eq([:title]) }
+
+        end
+
+        context 'the entry has already been persisted' do
+
+          let(:entry_id) { 42 }
+
+          before do
+            allow(entry_repository).to receive(:exists?).with(title: 'Hello world', :'_id.ne' => 42).and_return(true)
+          end
+
+          it { is_expected.to eq false }
+          it { subject; expect(entry.errors).to eq([:title]) }
+
+        end
 
       end
 

data/spec/unit/services/cookie_service_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe Locomotive::Steam::CookieService do
+
+  let(:steam_cookies)   { {} }
+  let(:request_cookies) { {} }
+  let(:request)         { instance_double('Request', env: { 'steam.cookies' => steam_cookies }, cookies: request_cookies) }
+  let(:cookie)          { {'value' => 'bar2'} }
+  let(:service)         { described_class.new(request) }
+
+  describe '#get cookies from request' do
+
+    let(:request_cookies) { {'foo' => 'bar'} }
+    subject { service.get('foo') }
+
+    context 'from request' do
+      it { is_expected.to eq 'bar' }
+    end
+
+    context 'from response' do
+      let(:steam_cookies) { {'foo' => {'value' => 'bar2'}} }
+      it { is_expected.to eq 'bar2' }
+    end
+
+  end
+
+  describe '#set cookies from response' do
+
+    subject { service.set('foo', cookie) }
+
+    it 'set the cookies into steam' do
+      is_expected.to eq cookie
+      expect(steam_cookies).to eq({'foo' => cookie})
+    end
+
+  end
+
+end

data/spec/unit/services/page_finder_service_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+describe Locomotive::Steam::PageFinderService do
+
+  let(:site)        { instance_double('Site', default_locale: :en) }
+  let(:repository)  { instance_double('PageRepository', site: site, locale: :en)}
+  let(:service)     { described_class.new(repository) }
+
+  describe '#find_by_id' do
+
+    let(:id)    { 42 }
+    let(:page)  { instance_double('Page', title: 'My page', localized_attributes: []) }
+
+    subject { service.find_by_id(id) }
+
+    it 'calls the repository to get the page and decorate it' do
+      expect(repository).to receive(:find).with(42).and_return(page)
+      expect(subject.title).to eq 'My page'
+    end
+
+  end
+
+  describe '#match' do
+
+    let(:path) { '/something' }
+    let(:pages) { [instance_double('Page 1', title: 'Page #1', fullpath: 'something', position: 2, localized_attributes: []) ] }
+
+    before { allow(repository).to receive(:matching_fullpath).and_return(pages) }
+
+    subject { service.match(path) }
+
+    it { expect(subject.map(&:title)).to eq(['Page #1']) }
+
+    context '2 pages at the root of the site' do
+
+      let(:pages) { [
+        instance_double('Page 1', title: 'Page #1', fullpath: 'something', position: 2, localized_attributes: []),
+        instance_double('Page 2', title: 'Page #2', fullpath: 'content_type_template', position: 1, localized_attributes: [])
+      ] }
+
+      it { expect(subject.map(&:title)).to eq(['Page #2', 'Page #1']) }
+
+    end
+
+    context '2 pages in the same folder' do
+
+      let(:pages) { [
+        instance_double('Page 1', title: 'Page #1', fullpath: 'folder/something', position: 2, localized_attributes: []),
+        instance_double('Page 2', title: 'Page #2', fullpath: 'folder/content_type_template', position: 1, localized_attributes: [])
+      ] }
+
+      it { expect(subject.map(&:title)).to eq(['Page #2', 'Page #1']) }
+
+    end
+
+    context '2 pages in different folder' do
+
+      let(:pages) { [
+        instance_double('Page 1', title: 'Page #1', fullpath: 'folder/something', position: 2, localized_attributes: []),
+        instance_double('Page 2', title: 'Page #2', fullpath: 'anotherfolder/content_type_template', position: 1, localized_attributes: [])
+      ] }
+
+      it { expect(subject.map(&:title)).to eq(['Page #1', 'Page #2']) }
+
+    end
+
+  end
+end
+

data/spec/unit/services/recaptcha_service_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+describe Locomotive::Steam::RecaptchaService do
+
+  let(:api_url)     { nil }
+  let(:secret)      { 'asecretkey' }
+  let(:site)        { instance_double('Site', metafields: { google: { recaptcha_api_url: api_url, recaptcha_secret: secret } }) }
+  let(:request)     { instance_double('Request', ip: '127.0.0.1') }
+  let(:service)     { described_class.new(site, request) }
+
+  describe '#verify' do
+
+    let(:code) { nil }
+
+    subject { service.verify(code) }
+
+    it { is_expected.to eq false }
+
+    context 'the code is not nil' do
+
+      let(:code)    { '42' }
+      let(:success) { false }
+
+      before do
+        expect(HTTParty).to receive(:get).with('https://www.google.com/recaptcha/api/siteverify', {
+          query: {
+            secret:   'asecretkey',
+            response: '42',
+            remoteip: '127.0.0.1'
+          }
+        }).and_return(instance_double('Response', parsed_response: { 'success' => success }))
+      end
+
+      context 'the code is verified' do
+
+        let(:success) { true }
+        it { is_expected.to eq true }
+
+      end
+
+      context 'the code is not verified' do
+
+        let(:success) { false }
+        it { is_expected.to eq false }
+
+      end
+
+    end
+
+    context 'using a different API url' do
+
+      let(:code)    { '42' }
+      let(:api_url) { 'https://recaptcha.net/api' }
+
+      before do
+        expect(HTTParty).to receive(:get).with('https://recaptcha.net/api', {
+          query: {
+            secret:   'asecretkey',
+            response: '42',
+            remoteip: '127.0.0.1'
+          }
+        }).and_return(instance_double('Response', parsed_response: { 'success' => true }))
+      end
+
+      it { is_expected.to eq true }
+
+    end
+
+  end
+
+end

data/spec/unit/services/translator_service_spec.rb

@@ -8,13 +8,14 @@ describe Locomotive::Steam::TranslatorService do
 
   describe '#translate' do
 
+    let(:key)           { 'example_test' }
     let(:input)         { 'example_test' }
     let(:locale)        { nil }
     let(:scope)         { nil }
     let(:interpolation) { {} }
 
     before do
-      allow(repository).to receive(:group_by_key).and_return({ 'example_test' => translation })
+      allow(repository).to receive(:group_by_key).and_return({ key => translation })
     end
 
     subject { service.translate(input, interpolation.merge('locale' => locale, 'scope' => scope)) }
@@ -50,6 +51,15 @@ describe Locomotive::Steam::TranslatorService do
 
         it { is_expected.to eq 'French' }
 
+        context 'the translation has been overwritten for the site' do
+
+          let(:key)         { 'locomotive_locales_fr' }
+          let(:translation) { { 'en' => 'Français' } }
+
+          it { is_expected.to eq 'Français' }
+
+        end
+
       end
 
       describe 'interpolation' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.5.0.beta3
+  version: 1.5.0.rc0
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2019-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -451,6 +451,7 @@ files:
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/locales/ru.yml
+- docker-compose.yml
 - lib/locomotive/steam.rb
 - lib/locomotive/steam/adapters/concerns/key.rb
 - lib/locomotive/steam/adapters/filesystem.rb
@@ -565,13 +566,16 @@ files:
 - lib/locomotive/steam/liquid/template.rb
 - lib/locomotive/steam/middlewares.rb
 - lib/locomotive/steam/middlewares/auth.rb
+- lib/locomotive/steam/middlewares/concerns/auth_helpers.rb
 - lib/locomotive/steam/middlewares/concerns/helpers.rb
 - lib/locomotive/steam/middlewares/concerns/liquid_context.rb
+- lib/locomotive/steam/middlewares/concerns/recaptcha.rb
 - lib/locomotive/steam/middlewares/default_env.rb
 - lib/locomotive/steam/middlewares/dynamic_assets.rb
 - lib/locomotive/steam/middlewares/encoded_link_redirection.rb
 - lib/locomotive/steam/middlewares/entry_submission.rb
 - lib/locomotive/steam/middlewares/favicon.rb
+- lib/locomotive/steam/middlewares/impersonated_entry.rb
 - lib/locomotive/steam/middlewares/locale.rb
 - lib/locomotive/steam/middlewares/locale_redirection.rb
 - lib/locomotive/steam/middlewares/logging.rb
@@ -622,6 +626,7 @@ files:
 - lib/locomotive/steam/services/auth_service.rb
 - lib/locomotive/steam/services/concerns/decorator.rb
 - lib/locomotive/steam/services/content_entry_service.rb
+- lib/locomotive/steam/services/cookie_service.rb
 - lib/locomotive/steam/services/csrf_protection_service.rb
 - lib/locomotive/steam/services/editable_element_service.rb
 - lib/locomotive/steam/services/email_service.rb
@@ -634,6 +639,7 @@ files:
 - lib/locomotive/steam/services/page_finder_service.rb
 - lib/locomotive/steam/services/page_redirection_service.rb
 - lib/locomotive/steam/services/parent_finder_service.rb
+- lib/locomotive/steam/services/recaptcha_service.rb
 - lib/locomotive/steam/services/section_finder_service.rb
 - lib/locomotive/steam/services/site_finder_service.rb
 - lib/locomotive/steam/services/snippet_finder_service.rb
@@ -881,6 +887,7 @@ files:
 - spec/unit/middlewares/encoded_link_redirection_spec.rb
 - spec/unit/middlewares/entry_submission_spec.rb
 - spec/unit/middlewares/helpers_spec.rb
+- spec/unit/middlewares/impersonated_entry_spec.rb
 - spec/unit/middlewares/locale_redirection_spec.rb
 - spec/unit/middlewares/locale_spec.rb
 - spec/unit/middlewares/page_spec.rb
@@ -911,13 +918,16 @@ files:
 - spec/unit/services/asset_host_service_spec.rb
 - spec/unit/services/auth_service_spec.rb
 - spec/unit/services/content_entry_service_spec.rb
+- spec/unit/services/cookie_service_spec.rb
 - spec/unit/services/email_service_spec.rb
 - spec/unit/services/entry_submission_service_spec.rb
 - spec/unit/services/external_api_service_spec.rb
 - spec/unit/services/image_resizer_service_spec.rb
 - spec/unit/services/markdown_service_spec.rb
+- spec/unit/services/page_finder_service_spec.rb
 - spec/unit/services/page_redirection_service_spec.rb
 - spec/unit/services/parent_finder_service_spec.rb
+- spec/unit/services/recaptcha_service_spec.rb
 - spec/unit/services/section_finder_service_spec.rb
 - spec/unit/services/textile_service_spec.rb
 - spec/unit/services/translator_service_spec.rb
@@ -1185,6 +1195,7 @@ test_files:
 - spec/unit/middlewares/encoded_link_redirection_spec.rb
 - spec/unit/middlewares/entry_submission_spec.rb
 - spec/unit/middlewares/helpers_spec.rb
+- spec/unit/middlewares/impersonated_entry_spec.rb
 - spec/unit/middlewares/locale_redirection_spec.rb
 - spec/unit/middlewares/locale_spec.rb
 - spec/unit/middlewares/page_spec.rb
@@ -1215,13 +1226,16 @@ test_files:
 - spec/unit/services/asset_host_service_spec.rb
 - spec/unit/services/auth_service_spec.rb
 - spec/unit/services/content_entry_service_spec.rb
+- spec/unit/services/cookie_service_spec.rb
 - spec/unit/services/email_service_spec.rb
 - spec/unit/services/entry_submission_service_spec.rb
 - spec/unit/services/external_api_service_spec.rb
 - spec/unit/services/image_resizer_service_spec.rb
 - spec/unit/services/markdown_service_spec.rb
+- spec/unit/services/page_finder_service_spec.rb
 - spec/unit/services/page_redirection_service_spec.rb
 - spec/unit/services/parent_finder_service_spec.rb
+- spec/unit/services/recaptcha_service_spec.rb
 - spec/unit/services/section_finder_service_spec.rb
 - spec/unit/services/textile_service_spec.rb
 - spec/unit/services/translator_service_spec.rb