qbrick 2.6.0 → 2.6.1

data/spec/controllers/qbrick/cms/pages_controller_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
-# TODO: For some reason rspec does not recognize this as controller
-#       spec even though it is in spec/controllers?
 describe Qbrick::Cms::PagesController, type: :controller do
-  subject { described_class }
+  routes { Qbrick::Engine.routes }
 
   describe 'mirroring' do
     around(:each) do |example|
@@ -12,7 +10,7 @@ describe Qbrick::Cms::PagesController, type: :controller do
       end
     end
 
-    let(:page) { FactoryGirl.create(:page, url_de: 'de', url_en: 'en') }
+    let(:page) { FactoryGirl.create(:page, path_de: 'de', path_en: 'en') }
     let!(:brick) do
       FactoryGirl.create(:text_brick,
                          brick_list_id: page.id,
@@ -36,7 +34,7 @@ describe Qbrick::Cms::PagesController, type: :controller do
 
     context 'with no bricks on target locale' do
       it 'clones the existing bricks' do
-        xhr :get, :mirror, use_route: :qbrick, target_locale: :en, page_id: page.id
+        xhr :get, :mirror, target_locale: :en, page_id: page.id
         I18n.with_locale :en do
           expect(page.bricks.count).to eq(1)
         end
@@ -45,13 +43,13 @@ describe Qbrick::Cms::PagesController, type: :controller do
 
     context 'with bricks on target locale' do
       it 'does not clone anything without the required parameter' do
-        xhr :get, :mirror, use_route: :qbrick, target_locale: :en, page_id: page.id
+        xhr :get, :mirror, target_locale: :en, page_id: page.id
         expect(page.bricks.unscoped.where(locale: :en, brick_list_id: page.id).first.text).to eq('ENGLISH')
       end
 
       it 'clones the bricks when required parameter is set' do
         expect(page.bricks).to be_any
-        xhr :get, :mirror, use_route: :qbrick, target_locale: :en, page_id: page.id, rutheless: 'true'
+        xhr :get, :mirror, target_locale: :en, page_id: page.id, rutheless: 'true'
         I18n.with_locale :en do
           expect(Qbrick::Page.find(page.id).bricks.first.text).to eq('DEUTSCH')
         end

data/spec/controllers/qbrick/pages_controller_spec.rb

@@ -1,92 +1,79 @@
 require 'spec_helper'
 
 describe Qbrick::PagesController, type: :controller do
-  subject { described_class }
+  routes { Qbrick::Engine.routes }
 
   describe '#index' do
-    before do
-      @pages = [
-        create(:page, published_de: true, fulltext_de: 'foobar'),
-        create(:page, published_de: true, fulltext_de: 'barfoo')
-      ]
-    end
+    let(:search_term) { 'foobar' }
+    let!(:matching) { create(:page, published: 1).tap { |p| p.update_attribute :fulltext, search_term } }
+    let!(:nonmatching) { create(:page, published: 1).tap { |p| p.update_attribute :fulltext, 'barfoo' } }
+    let!(:unpublished) { create(:page, published: 0).tap { |p| p.update_attribute :fulltext, search_term } }
 
     context 'with search parameter' do
       it 'assigns the search results' do
-        I18n.with_locale :de do
-          get(:index,  use_route: :qbrick, search: 'foobar')
-        end
-        expect(assigns(:pages)).to eq([@pages.first])
+        expect(matching.fulltext).to eq search_term
+        expect(unpublished.fulltext).to eq search_term
+
+        get :index, search: search_term
+
+        result = assigns :pages
+        expect(result).to include matching
+        expect(result).not_to include nonmatching
+        expect(result).not_to include unpublished
       end
     end
   end
 
   describe '#show' do
     it "doesn't show unpublished pages" do
-      I18n.with_locale(:de) do
-        unpublished_page = FactoryGirl.create :page, url_de: 'de', published_de: false
-        expect { get :show, url: unpublished_page.slug, use_route: :qbrick }.to raise_error(ActionController::RoutingError)
-      end
+      unpublished_page = FactoryGirl.create :page, published: 0
+      expect { get :show, url: unpublished_page.slug }.to raise_error(ActionController::RoutingError)
     end
 
     describe 'routing' do
-      context 'without url' do
-        before do
-          @page = FactoryGirl.create(:page, url_de: 'de', published_de: true)
-        end
+      context 'on root page' do
+        let!(:root_page) { create :root_page }
 
         context 'with matching locale' do
-          it 'sets the corresponding page' do
-            I18n.with_locale(:de) do
-              get :show, use_route: :qbrick
-            end
-            expect(assigns(:page)).to eq(@page)
+          it 'loads the page' do
+            get :show
+            expect(assigns(:page)).to eq(root_page)
           end
         end
 
         context 'without matching locale' do
           it 'raises a routing error' do
-            expect { get(:show, use_route: :qbrick, locale: :en) }.to raise_error(ActionController::RoutingError)
+            expect { get(:show, locale: :de) }.to raise_error(ActionController::RoutingError)
           end
         end
       end
     end
 
     describe 'page type' do
-      around(:each) do |example|
-        I18n.with_locale :de do
-          example.run
-        end
-      end
-
       context 'when page is not a redirect page' do
         it 'responds with page' do
-          page = FactoryGirl.create(:page, slug: 'dumdidum',
-                                           url: 'de/dumdidum')
-          get :show, url: page.slug, use_route: :qbrick
+          page = FactoryGirl.create :page, slug: 'dumdidum'
+          get :show, url: page.slug
           expect(assigns(:page)).to eq(page)
         end
       end
 
       context 'when page is a redirect page' do
         it 'redirects to the redirected url' do
-          page = FactoryGirl.create(:page, page_type: 'redirect', slug: 'dumdidum',
-                                           url: 'de/dumdidum', redirect_url: 'de/redirect_page')
-          get :show, url: page.slug, use_route: :qbrick
+          page = FactoryGirl.create :page, page_type: 'redirect', slug: 'dumdidum', redirect_url: 'de/redirect_page'
+          get :show, url: page.slug
           expect(response).to redirect_to('/de/redirect_page')
         end
 
         it 'redirects to invalid redirect urls with too many preceding slashes' do
-          page = FactoryGirl.create(:page, page_type: 'redirect', slug: 'dumdidum',
-                                           url: 'de/dumdidum', redirect_url: '///de/redirect_page')
-          get :show, url: page.slug, use_route: :qbrick
+          page = FactoryGirl.create :page, page_type: 'redirect', slug: 'dumdidum', redirect_url: '///de/redirect_page', published: 1
+          get :show, url: page.slug
           expect(response).to redirect_to('/de/redirect_page')
         end
 
         it 'redirects to root' do
-          page = FactoryGirl.create(:page, page_type: 'redirect', slug: 'dumdidum',
-                                           url: 'de/dumdidum', redirect_url: '/')
-          get :show, url: page.slug, use_route: :qbrick
+          page = FactoryGirl.create(:page, page_type: 'redirect', slug: 'dumdidum', redirect_url: '/')
+          get :show, url: page.slug
           expect(response).to redirect_to('/')
         end
       end

data/spec/controllers/qbrick/sitemaps_controller_spec.rb

@@ -1,13 +1,12 @@
 require 'spec_helper'
 
 describe Qbrick::SitemapsController, type: :controller do
-  describe '#index' do
-    before do
-      @page = FactoryGirl.create :page
-    end
+  routes { Qbrick::Engine.routes }
 
+  describe '#index' do
     it 'should be able to send a xml file' do
-      get :index, use_route: :qbrick, format: 'xml'
+      @page = FactoryGirl.create :page
+      get :index, format: 'xml'
     end
   end
 end

data/spec/factories.rb

@@ -7,7 +7,13 @@ FactoryGirl.define do
     p.title { FactoryGirl.generate(:title) }
     p.published 1
     p.body 'lorem ipsum'
-    p.url ''
+    p.page_type Qbrick::PageType::CONTENT
+  end
+
+  factory :root_page, parent: :page do |p|
+    sequence(:title) { |n| "Root Title #{n}" }
+    p.parent nil
+    p.page_type Qbrick::PageType::NAVIGATION
   end
 
   factory :text_brick, class: 'Qbrick::TextBrick' do |tb|

data/spec/features/administrator_management_spec.rb

@@ -1,21 +1,18 @@
 require 'spec_helper'
 
 describe 'Administrator Management', type: :feature do
-  def create_admin
-    @admin ||= FactoryGirl.create(:admin)
-  end
+  let!(:root_page) { create :root_page }
+  let(:admin) { create :admin }
 
-  def create_and_login_admin
-    create_admin
-    visit qbrick.cms_pages_path
-    fill_in 'E-Mail', with: @admin.email
-    fill_in 'Password', with: @admin.password
-    click_on 'Login'
+  around(:each) do |example|
+    I18n.with_locale(:en) { example.run }
   end
 
   before :each do
-    @page = FactoryGirl.create(:page, page_type: 'navigation', published: true, title: 'home')
-    create_and_login_admin
+    visit qbrick.cms_pages_path
+    fill_in 'E-Mail', with: admin.email
+    fill_in 'Password', with: admin.password
+    click_on 'Login'
   end
 
   describe 'admin' do
@@ -34,10 +31,10 @@ describe 'Administrator Management', type: :feature do
 
       it 'can change his/her password' do
         click_on 'Change Password'
-        fill_in 'Current Password', with: @admin.password
+        fill_in 'Current Password', with: admin.password
         fill_in 'Password', with: new_password
         fill_in 'Password Confirmation', with: new_password
-        expect { click_on 'Update Admin' }.to change { Qbrick::Admin.find_by_email(@admin.email).encrypted_password }
+        expect { click_on 'Update Admin' }.to change { Qbrick::Admin.find_by_email(admin.email).encrypted_password }
       end
 
       it 'can create a new admin user' do

data/spec/features/cms_pages_spec.rb

@@ -3,6 +3,10 @@
 require 'spec_helper'
 
 describe 'Cms/Pages', type: :feature do
+  around(:each) do |example|
+    I18n.with_locale(:en) { example.run }
+  end
+
   before do
     admin = FactoryGirl.create(:admin)
     login_as(admin, scope: :admin)
@@ -10,7 +14,7 @@ describe 'Cms/Pages', type: :feature do
 
   context '#new' do
     before do
-      visit qbrick.new_cms_page_path
+      visit qbrick.new_cms_page_path content_locale: 'en'
       fill_in 'Title', with: 'The Title of the page'
       fill_in 'Keywords', with: 'My keywords'
       fill_in 'Description', with: 'My Description'
@@ -23,35 +27,37 @@ describe 'Cms/Pages', type: :feature do
         end
 
         it 'is not possible to change the value in url' do
-          expect(page.find('#page_url')['disabled']).to be_truthy
+          expect(page.find('#page_path_with_prefixed_locale')['disabled']).to be_truthy
         end
       end
 
       context 'when page is invalid' do
         it 'does not create a routing error by switching the locale' do
-          @page = FactoryGirl.create(:page, title: 'DummyPage', title_en: 'DummyEN', slug: 'dummy_page')
-          visit qbrick.edit_cms_page_path(@page)
+          sample_page = FactoryGirl.create :page, title: 'DummyPage', title_en: 'DummyEN', slug: 'dummy_page'
+          visit qbrick.edit_cms_page_path(sample_page)
           fill_in 'page_title', with: ''
           click_on 'Update Page'
           within '.language-navigation' do
             click_on 'EN'
           end
-          expect(page).to have_content(@page.title_en)
+          expect(page).to have_content(sample_page.title_en)
         end
       end
     end
 
     describe '#update' do
       context 'when creating a redirect page' do
+        let(:a_page) do
+          FactoryGirl.create :page, path_de: '/dumdidum'
+        end
         before do
-          @page = FactoryGirl.create(:page, url: 'de/dumdidum')
-          visit qbrick.edit_cms_page_path(@page)
+          visit qbrick.edit_cms_page_path a_page, content_locale: 'en'
           select 'redirect', from: 'Pagetyp'
         end
 
         it 'has a value in redirect_page' do
           fill_in 'Redirect URL', with: 'target_page'
-          expect { click_on 'Update Page' }.to change { @page.reload.redirect_url }.to('target_page')
+          expect { click_on 'Update Page' }.to change { Qbrick::Page.find(a_page.id).redirect_url }.to('target_page')
         end
 
         it 'is invalid when no value is in redirect_page' do
@@ -59,9 +65,9 @@ describe 'Cms/Pages', type: :feature do
           expect(page).to have_css('.error', count: 1)
         end
 
-        it 'does not change the value in url' do
+        it 'does not change the value in path' do
           fill_in 'Redirect URL', with: 'target_page'
-          expect { click_on 'Update Page' }.to_not change { @page.reload.url }
+          expect { click_on 'Update Page' }.to_not change { a_page.reload.path }
         end
       end
     end
@@ -69,11 +75,11 @@ describe 'Cms/Pages', type: :feature do
 
   describe '#edit' do
     it 'shows error messages on invalid bricks' do
-      @page = FactoryGirl.create(:page)
-      invalid_brick = FactoryGirl.build(:text_brick, text: nil, brick_list: @page)
+      sample_page = FactoryGirl.create(:page)
+      invalid_brick = FactoryGirl.build(:text_brick, text: nil, brick_list: sample_page)
       invalid_brick.save(validate: false)
 
-      visit qbrick.edit_cms_page_path(@page)
+      visit qbrick.edit_cms_page_path(sample_page)
       expect(page).to have_css('.error', count: 1)
     end
   end

data/spec/features/search_spec.rb

@@ -3,25 +3,26 @@ require 'spec_helper'
 describe 'pages#index', type: :feature do
   context 'with search parameter' do
     let! :page1 do
-      p = create :page,
-                 published: true,
-                 title: 'Chromodorididae Ardeadoris'
-      p.bricks << Qbrick::TextBrick.new(locale: I18n.locale,
-                                        text: "#{'foo bar' * 300} Chromodorididae #{'foo bar' * 300}")
-      p.save!
-      p
+      main_page = nil
+      I18n.with_locale(:en) do
+        main_page = create :page, published: 1, title: 'Chromodorididae Ardeadoris'
+        main_page.bricks << Qbrick::TextBrick.new(locale: I18n.locale,
+                                                  text: "#{'foo bar' * 300} Chromodorididae #{'foo bar' * 300}")
+        main_page.save!
+      end
+      main_page
     end
 
     let! :page2 do
-      create :page,
-             published: true,
-             title: 'Chromodorididae Berlanguella'
+      I18n.with_locale(:en) do
+        create :page, published: 1, title: 'Chromodorididae Berlanguella'
+      end
     end
 
     let! :page3 do
-      create :page,
-             published: true,
-             title: 'Gastropoda'
+      I18n.with_locale(:en) do
+        create :page, published: 1, title: 'Gastropoda'
+      end
     end
 
     context 'with fulltext' do
@@ -66,11 +67,8 @@ describe 'pages#index', type: :feature do
     end
 
     context 'without matches' do
-      before do
-        visit qbrick.pages_path(locale: :en, search: 'foobar')
-      end
-
       it 'renders match count' do
+        visit qbrick.pages_path(locale: :en, search: 'foobar')
         expect(page).to have_content('No results')
       end
     end

data/spec/helpers/qbrick/cms/pages_helper_spec.rb

@@ -1,14 +1,21 @@
 require 'spec_helper'
 
 describe Qbrick::Cms::PagesHelper, type: :helper do
+  let!(:page) do
+    I18n.with_locale(:en) do
+      create :page, title: 'Page 1', slug: 'page1', path_de: nil, title_de: nil, slug_de: nil
+    end
+  end
+  before(:each) { @page = page }
+
   describe '#content_tab_active' do
     it 'returns active when page has a title and no errors' do
-      @page = create(:page, title: 'Page 1', slug: 'page1')
-      expect(helper.content_tab_active(@page)).to be(:active)
+      I18n.with_locale :en do
+        expect(helper.content_tab_active(@page)).to be(:active)
+      end
     end
 
     it 'returns nil when page has no translation' do
-      @page = create(:page, title: 'Page 1', slug: 'page1')
       I18n.with_locale :de do
         expect(helper.content_tab_active(@page)).to be_nil
       end
@@ -17,7 +24,6 @@ describe Qbrick::Cms::PagesHelper, type: :helper do
 
   describe '#metadata_tab_active' do
     it 'returns active when page is not translated' do
-      @page = create(:page, title: 'Page 1', slug: 'page1')
       I18n.with_locale :de do
         expect(helper.metadata_tab_active(@page)).to be(:active)
       end
@@ -26,7 +32,6 @@ describe Qbrick::Cms::PagesHelper, type: :helper do
 
   describe '#hide_content_tab?' do
     it 'has a page without translations' do
-      @page = create(:page, title: 'Page 1', slug: 'page1')
       I18n.with_locale :de do
         expect(helper.hide_content_tab?(@page)).to be_truthy
       end

data/spec/lib/translatable_spec.rb

@@ -11,8 +11,8 @@ describe Qbrick::Translatable do
   end
 
   describe 'normal locale' do
-    before do
-      I18n.locale = :en
+    around(:each) do |example|
+      I18n.with_locale(:en) { example.run }
     end
 
     describe '.translate' do
@@ -61,8 +61,8 @@ describe Qbrick::Translatable do
       end
 
       context 'when changing the locale' do
-        before do
-          I18n.locale = :de
+        around(:each) do |example|
+          I18n.with_locale(:de) { example.run }
         end
 
         it 'delegates the getter to current locale' do
@@ -79,15 +79,11 @@ describe Qbrick::Translatable do
   end
 
   describe 'country specific locale' do
-    before do
-      @locales = I18n.available_locales
-      I18n.available_locales = [:de, 'de-CH']
-      I18n.locale = 'de-CH'
-    end
-
-    after do
-      I18n.available_locales = @locales
-      I18n.locale = :en
+    around(:each) do |example|
+      available_locales_backup = I18n.available_locales.deep_dup
+      I18n.available_locales = [:de, 'de-CH', :en]
+      I18n.with_locale('de-CH') { example.run }
+      I18n.available_locales = available_locales_backup
     end
 
     describe '.translate' do
@@ -136,18 +132,23 @@ describe Qbrick::Translatable do
       end
 
       context 'when changing the locale' do
-        before do
-          I18n.locale = :de
-        end
+        # outer describe block encapsulates with 'with_locale' and will set correct locale again!
+        before(:each) { I18n.locale = :de }
 
         it 'delegates the getter to current locale' do
+          locale_backup = I18n.locale
+          I18n.locale = :de
           expect(model).to receive(:name_de).and_return('Johannes')
           expect(model.name).to eq('Johannes')
+          I18n.locale = locale_backup
         end
 
         it 'delegates the getter to current locale' do
+          locale_backup = I18n.locale
+          I18n.locale = :de
           expect(model).to receive(:name_de=).with('Johannes')
           model.name = 'Johannes'
+          I18n.locale = locale_backup
         end
       end
     end