qbrick 2.5.0.pre → 2.5.0

data/spec/lib/gridded_spec.rb

@@ -1,10 +1,9 @@
 require 'spec_helper'
 
-describe Kuhsaft::Gridded do
-
+describe Qbrick::Gridded do
   context 'included gridded module' do
     class GridClass
-      include Kuhsaft::Gridded
+      include Qbrick::Gridded
     end
 
     it 'returns an array for the gridded class' do
@@ -13,12 +12,12 @@ describe Kuhsaft::Gridded do
 
     it 'returns false on gridded? if no col count is set' do
       expect_any_instance_of(GridClass).to receive(:col_count).at_least(:once).and_return(0)
-      expect(GridClass.new.gridded?).to be_false
+      expect(GridClass.new.gridded?).to be_falsey
     end
 
     it 'returns true on gridded? if a col count is set' do
       expect_any_instance_of(GridClass).to receive(:col_count).at_least(:once).and_return(10)
-      expect(GridClass.new.gridded?).to be_true
+      expect(GridClass.new.gridded?).to be_truthy
     end
   end
 end

data/spec/lib/image_uploader_mounting_spec.rb

@@ -1,14 +1,13 @@
 require 'spec_helper'
 
-describe Kuhsaft::ImageUploaderMounting do
-
+describe Qbrick::ImageUploaderMounting do
   let :brick do
-    Kuhsaft::ImageBrick.new
+    Qbrick::ImageBrick.new
   end
 
   describe '#uploader_mounting' do
     it 'has a uploader mounted' do
-      brick.class.ancestors.include?(CarrierWave::Mount::Extension).should be_true
+      expect(brick.class.ancestors.include?(CarrierWave::Mount::Extension)).to be_truthy
     end
   end
 end

data/spec/lib/page_tree_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
-require_relative '../../lib/kuhsaft/page_tree'
-require_relative '../../app/models/kuhsaft/page'
+require_relative '../../lib/qbrick/page_tree'
+require_relative '../../app/models/qbrick/page'
 
 # TODO: THESE SPECS ONLY WORK WHEN THE FULL SUITE IS RUN. FIX THAT!
 
-module Kuhsaft
+module Qbrick
   describe PageTree do
     let(:page_tree) do
       {
@@ -29,9 +29,9 @@ module Kuhsaft
 
       it 'sets the correct parent attribute for the nodes' do
         PageTree.update(page_tree)
-        @page1.reload.parent_id.should be_nil
+        expect(@page1.reload.parent_id).to be_nil
         expect(@page2.reload.parent_id).to eq(1)
-        @page3.reload.parent_id.should be nil
+        expect(@page3.reload.parent_id).to be nil
       end
     end
   end

data/spec/lib/searchable_spec.rb

@@ -1,28 +1,27 @@
 require 'spec_helper'
 
-describe Kuhsaft::Searchable do
-
+describe Qbrick::Searchable do
   context 'with missing includes' do
-    it 'raises exteption when class does not include Kuhsaft::Bricklist' do
+    it 'raises exteption when class does not include Qbrick::Bricklist' do
       expect do
         class Foo
-          include Kuhsaft::Searchable
+          include Qbrick::Searchable
         end
-      end.to raise_error(/needs Kuhsaft::BrickList to be included/)
+      end.to raise_error(/needs Qbrick::BrickList to be included/)
     end
   end
 
   context 'with Bricklist included' do
     class SearchableDemo < ActiveRecord::Base
-      include Kuhsaft::BrickList
+      include Qbrick::BrickList
     end
 
     context 'without postgresql' do
       it 'initializes scope' do
         expect(ActiveRecord::Base.connection.instance_values).not_to eq('postgresql')
-        SearchableDemo.should_receive :scope
+        expect(SearchableDemo).to receive :scope
         SearchableDemo.class_eval do
-          include Kuhsaft::Searchable
+          include Qbrick::Searchable
         end
       end
     end

data/spec/lib/touch_placeholders_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
-require_relative '../../lib/kuhsaft/touch_placeholders'
-
-describe Kuhsaft::TouchPlaceholders do
+require_relative '../../lib/qbrick/touch_placeholders'
 
+describe Qbrick::TouchPlaceholders do
   before :all do
     m = ActiveRecord::Migration.new
     m.verbose = false
@@ -11,7 +10,7 @@ describe Kuhsaft::TouchPlaceholders do
     end
 
     class DummyModel < ActiveRecord::Base
-      include Kuhsaft::TouchPlaceholders
+      include Qbrick::TouchPlaceholders
     end
 
     @page = FactoryGirl.create(:page)
@@ -37,7 +36,7 @@ describe Kuhsaft::TouchPlaceholders do
   describe 'after_save_callback' do
     it 'looks for the bricks with affected templates and touches them' do
       DummyModel.class_eval { placeholder_templates 'foo' }
-      expect_any_instance_of(Kuhsaft::PlaceholderBrick).to receive(:touch)
+      expect_any_instance_of(Qbrick::PlaceholderBrick).to receive(:touch)
       DummyModel.create
     end
   end

data/spec/lib/translatable_spec.rb

@@ -1,9 +1,8 @@
 require 'spec_helper'
 
-describe Kuhsaft::Translatable do
-
+describe Qbrick::Translatable do
   class Demo
-    include Kuhsaft::Translatable
+    include Qbrick::Translatable
     translate :name
   end
 
@@ -40,23 +39,23 @@ describe Kuhsaft::Translatable do
 
     describe 'translated attributes' do
       it 'delegates the getter to the suffixed attribute' do
-        model.should_receive(:name_en).and_return('John')
-        model.name.should == 'John'
+        expect(model).to receive(:name_en).and_return('John')
+        expect(model.name).to eq('John')
       end
 
       it 'delegates the setter to the suffixed attribute' do
-        model.should_receive(:name_en=).with('Johnny')
+        expect(model).to receive(:name_en=).with('Johnny')
         model.name = 'Johnny'
       end
 
       context 'dynamic methods' do
         it 'delegates boolean accessors' do
-          model.should_receive(:name_en?)
+          expect(model).to receive(:name_en?)
           model.name?
         end
 
         it 'delegates simple dynamic finders' do
-          Demo.should_receive(:find_by_name_en).with('Max')
+          expect(Demo).to receive(:find_by_name_en).with('Max')
           Demo.find_by_name('Max')
         end
       end
@@ -67,12 +66,12 @@ describe Kuhsaft::Translatable do
         end
 
         it 'delegates the getter to current locale' do
-          model.should_receive(:name_de).and_return('Johannes')
-          model.name.should == 'Johannes'
+          expect(model).to receive(:name_de).and_return('Johannes')
+          expect(model.name).to eq('Johannes')
         end
 
         it 'delegates the getter to current locale' do
-          model.should_receive(:name_de=).with('Johannes')
+          expect(model).to receive(:name_de=).with('Johannes')
           model.name = 'Johannes'
         end
       end
@@ -81,12 +80,13 @@ describe Kuhsaft::Translatable do
 
   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 = [:en]
+      I18n.available_locales = @locales
       I18n.locale = :en
     end
 
@@ -114,23 +114,23 @@ describe Kuhsaft::Translatable do
 
     describe 'translated attributes' do
       it 'delegates the getter to the suffixed attribute' do
-        model.should_receive(:name_de_ch).and_return('John')
-        model.name.should == 'John'
+        expect(model).to receive(:name_de_ch).and_return('John')
+        expect(model.name).to eq('John')
       end
 
       it 'delegates the setter to the suffixed attribute' do
-        model.should_receive(:name_de_ch=).with('Johnny')
+        expect(model).to receive(:name_de_ch=).with('Johnny')
         model.name = 'Johnny'
       end
 
       context 'dynamic methods' do
         it 'delegates boolean accessors' do
-          model.should_receive(:name_de_ch?)
+          expect(model).to receive(:name_de_ch?)
           model.name?
         end
 
         it 'delegates simple dynamic finders' do
-          Demo.should_receive(:find_by_name_de_ch).with('Max')
+          expect(Demo).to receive(:find_by_name_de_ch).with('Max')
           Demo.find_by_name('Max')
         end
       end
@@ -141,12 +141,12 @@ describe Kuhsaft::Translatable do
         end
 
         it 'delegates the getter to current locale' do
-          model.should_receive(:name_de).and_return('Johannes')
-          model.name.should == 'Johannes'
+          expect(model).to receive(:name_de).and_return('Johannes')
+          expect(model.name).to eq('Johannes')
         end
 
         it 'delegates the getter to current locale' do
-          model.should_receive(:name_de=).with('Johannes')
+          expect(model).to receive(:name_de=).with('Johannes')
           model.name = 'Johannes'
         end
       end

data/spec/models/accordion_brick_spec.rb

@@ -1,38 +1,37 @@
 require 'spec_helper'
 
-describe Kuhsaft::AccordionBrick do
-
+describe Qbrick::AccordionBrick, type: :model do
   let :accordion_brick do
-    Kuhsaft::AccordionBrick.new
+    Qbrick::AccordionBrick.new
   end
 
   describe '#user_can_delete?' do
     it 'returns true' do
-      accordion_brick.user_can_delete?.should be_true
+      expect(accordion_brick.user_can_delete?).to be_truthy
     end
   end
 
   describe '#renders_own_childs?' do
     it 'returns false' do
-      accordion_brick.renders_own_childs?.should be_false
+      expect(accordion_brick.renders_own_childs?).to be_falsey
     end
   end
 
   describe '#bricks' do
     it 'can have childs' do
-      accordion_brick.should respond_to(:bricks)
+      expect(accordion_brick).to respond_to(:bricks)
     end
   end
 
   describe '#to_style_class' do
     it 'includes the bootstrap classname' do
-      accordion_brick.to_style_class.should == 'kuhsaft-accordion-brick accordion'
+      expect(accordion_brick.to_style_class).to eq('qbrick-accordion-brick accordion')
     end
   end
 
   describe '#allowed_brick_types' do
     it 'only allows AccordionItems' do
-      accordion_brick.allowed_brick_types.should == %w(Kuhsaft::AccordionItemBrick)
+      expect(accordion_brick.allowed_brick_types).to eq(%w(Qbrick::AccordionItemBrick))
     end
   end
 end

data/spec/models/accordion_item_brick_spec.rb

@@ -1,9 +1,8 @@
 require 'spec_helper'
 
-describe Kuhsaft::AccordionItemBrick do
-
+describe Qbrick::AccordionItemBrick, type: :model do
   let :accordion_item_brick do
-    Kuhsaft::AccordionItemBrick.new
+    Qbrick::AccordionItemBrick.new
   end
 
   describe '#valid' do
@@ -13,38 +12,38 @@ describe Kuhsaft::AccordionItemBrick do
 
     context 'without a #caption' do
       it 'has en error' do
-        accordion_item_brick.should have(1).error_on(:caption)
+        expect(accordion_item_brick.errors[:caption].count).to eq(1)
       end
     end
   end
 
   describe '#user_can_delete?' do
     it 'returns true' do
-      accordion_item_brick.user_can_delete?.should be_true
+      expect(accordion_item_brick.user_can_delete?).to be_truthy
     end
   end
 
   describe '#user_can_save' do
     it 'returns true' do
-      accordion_item_brick.user_can_save?.should == true
+      expect(accordion_item_brick.user_can_save?).to eq(true)
     end
   end
 
   describe '#renders_own_childs?' do
     it 'returns false' do
-      accordion_item_brick.renders_own_childs?.should be_false
+      expect(accordion_item_brick.renders_own_childs?).to be_falsey
     end
   end
 
   describe '#bricks' do
     it 'can have childs' do
-      accordion_item_brick.should respond_to(:bricks)
+      expect(accordion_item_brick).to respond_to(:bricks)
     end
   end
 
   describe '#to_style_class' do
     it 'includes the bootstrap classname' do
-      accordion_item_brick.to_style_class.should == 'kuhsaft-accordion-item-brick accordion-group'
+      expect(accordion_item_brick.to_style_class).to eq('qbrick-accordion-item-brick accordion-group')
     end
   end
 end

data/spec/models/anchor_brick_spec.rb

@@ -1,26 +1,25 @@
 require 'spec_helper'
 
-describe Kuhsaft::AnchorBrick do
-
+describe Qbrick::AnchorBrick, type: :model do
   let :anchor_brick do
-    Kuhsaft::AnchorBrick.new(caption: 'test-anchor')
+    Qbrick::AnchorBrick.new(caption: 'test-anchor')
   end
 
   describe '#bricks' do
     it 'can not have childs' do
-      anchor_brick.should_not respond_to(:bricks)
+      expect(anchor_brick).not_to respond_to(:bricks)
     end
   end
 
   describe '#user_can_add_childs?' do
     it 'returns false' do
-      anchor_brick.user_can_add_childs?.should be_false
+      expect(anchor_brick.user_can_add_childs?).to be_falsey
     end
   end
 
   describe '#to_id' do
     it 'returns a parameterized id' do
-      anchor_brick.to_id.should == 'anchor-test-anchor'
+      expect(anchor_brick.to_id).to eq('anchor-test-anchor')
     end
   end
 end

data/spec/models/asset_brick_spec.rb

@@ -1,9 +1,8 @@
 require 'spec_helper'
 
-describe Kuhsaft::AssetBrick do
-
+describe Qbrick::AssetBrick, type: :model do
   let :asset_brick do
-    Kuhsaft::AssetBrick.new
+    Qbrick::AssetBrick.new
   end
 
   describe '#valid' do
@@ -13,33 +12,33 @@ describe Kuhsaft::AssetBrick do
 
     context 'without a #caption' do
       it 'has an error' do
-        asset_brick.should have(1).error_on(:caption)
+        expect(asset_brick.errors[:caption].count).to eq(1)
       end
     end
   end
 
   describe '#bricks' do
     it 'can not have childs' do
-      asset_brick.should_not respond_to(:bricks)
+      expect(asset_brick).not_to respond_to(:bricks)
     end
   end
 
   describe '.styles' do
     it 'returns the available link styles' do
-      Kuhsaft::AssetBrick.styles.should == %w(pdf word excel button)
+      expect(Qbrick::AssetBrick.styles).to eq(%w(pdf word excel button))
     end
   end
 
   describe '#to_style_class' do
     it 'includes the link style' do
-      asset_brick.stub(:link_style).and_return('pdf')
-      asset_brick.to_style_class.should == 'kuhsaft-asset-brick pdf'
+      allow(asset_brick).to receive(:link_style).and_return('pdf')
+      expect(asset_brick.to_style_class).to eq('qbrick-asset-brick pdf')
     end
   end
 
   describe '#user_can_add_childs?' do
     it 'returns false' do
-      asset_brick.user_can_add_childs?.should be_false
+      expect(asset_brick.user_can_add_childs?).to be_falsey
     end
   end
 end

data/spec/models/asset_spec.rb

@@ -1,41 +1,39 @@
 require 'spec_helper'
 
-describe Kuhsaft::Asset do
-
+describe Qbrick::Asset, type: :model do
   let :asset do
     create(:asset)
   end
 
   let :uploader do
-    u = Kuhsaft::AssetUploader.new(asset, :file)
-    u.store!(File.open(File.join(Kuhsaft::Engine.root, 'spec', 'dummy', 'app', 'assets', 'images', 'spec-image.png')))
+    u = Qbrick::AssetUploader.new(asset, :file)
+    u.store! File.open(Qbrick::Engine.root.join('spec/dummy/app/assets/images/spec-image.png'))
     u
   end
 
   before do
-    Kuhsaft::AssetUploader.enable_processing = true
+    Qbrick::AssetUploader.enable_processing = true
   end
 
   after do
-    Kuhsaft::AssetUploader.enable_processing = false
+    Qbrick::AssetUploader.enable_processing = false
   end
 
   it 'has a thumbnail' do
-    uploader.should respond_to(:thumb)
+    expect(uploader).to respond_to(:thumb)
   end
 
   it 'makes the image readable only to the owner and not executable' do
-    pending 'how and where do we ensure permissions?'
-    uploader.should have_permissions(0600)
+    expect(uploader.permissions).to eq(0600)
   end
 
   describe '#file_type' do
     it 'has a file_type' do
-      asset.should respond_to(:file_type)
+      expect(asset).to respond_to(:file_type)
     end
 
     it 'is symbolized' do
-      asset.file_type.should be_a(Symbol)
+      expect(asset.file_type).to be_a(Symbol)
     end
   end
 end