kuhsaft 2.4.3 → 2.5.0

data/spec/models/asset_brick_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Kuhsaft::AssetBrick do
+describe Kuhsaft::AssetBrick, type: :model do
 
   let :asset_brick do
     Kuhsaft::AssetBrick.new
@@ -13,33 +13,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(Kuhsaft::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('kuhsaft-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,6 +1,6 @@
 require 'spec_helper'
 
-describe Kuhsaft::Asset do
+describe Kuhsaft::Asset, type: :model do
 
   let :asset do
     create(:asset)
@@ -8,7 +8,7 @@ describe Kuhsaft::Asset do
 
   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.store! File.open(Kuhsaft::Engine.root.join('spec/dummy/app/assets/images/spec-image.png'))
     u
   end
 
@@ -21,21 +21,21 @@ describe Kuhsaft::Asset do
   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).to have_permissions(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

data/spec/models/brick_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe Kuhsaft::Brick do
+describe Kuhsaft::Brick, type: :model do
   let :brick do
     Kuhsaft::Brick.new
   end
 
   describe '#valid?' do
     it 'sets a default position' do
-      brick.should_receive(:set_position)
+      expect(brick).to receive(:set_position)
       brick.valid?
     end
   end
@@ -16,7 +16,7 @@ describe Kuhsaft::Brick do
     context 'witout a position' do
       it 'sets a default' do
         brick.set_position
-        brick.position.should be(1)
+        expect(brick.position).to be(1)
       end
     end
 
@@ -30,70 +30,70 @@ describe Kuhsaft::Brick do
 
   describe '#brick_list_type' do
     it 'returns Kuhsaft::Brick' do
-      brick.brick_list_type.should == 'Kuhsaft::Brick'
+      expect(brick.brick_list_type).to eq('Kuhsaft::Brick')
     end
   end
 
   describe '#parents' do
     it 'returns the chain of parents' do
       item1, item2, item3 = double, double, Kuhsaft::Brick.new
-      item2.stub(:brick_list).and_return(item1)
-      item3.stub(:brick_list).and_return(item2)
-      item3.parents.should == [item1, item2]
+      allow(item2).to receive(:brick_list).and_return(item1)
+      allow(item3).to receive(:brick_list).and_return(item2)
+      expect(item3.parents).to eq([item1, item2])
     end
   end
 
   describe '#to_edit_partial_path' do
     it 'returns the path to the form partial' do
-      Kuhsaft::TextBrick.new.to_edit_partial_path.should == 'kuhsaft/text_bricks/text_brick/edit'
+      expect(Kuhsaft::TextBrick.new.to_edit_partial_path).to eq('kuhsaft/text_bricks/text_brick/edit')
     end
   end
 
   describe '#has_siblings?' do
     it 'returns false if the brick has no siblings' do
       brick = Kuhsaft::Brick.new
-      brick.has_siblings?.should be_false
+      expect(brick.has_siblings?).to be_falsey
     end
 
     it 'returns true if the brick has siblings' do
       item1, item2, item3 = double, double, Kuhsaft::Brick.new
-      item1.stub(:bricks).and_return([item2, item3])
-      item2.stub(:brick_list).and_return(item1)
-      item3.stub(:brick_list).and_return(item1)
-      item3.has_siblings?.should be_true
+      allow(item1).to receive(:bricks).and_return([item2, item3])
+      allow(item2).to receive(:brick_list).and_return(item1)
+      allow(item3).to receive(:brick_list).and_return(item1)
+      expect(item3.has_siblings?).to be_truthy
     end
   end
 
   describe '#to_edit_childs_partial_path' do
     it 'returns the path to the form partial' do
-      Kuhsaft::TextBrick.new.to_edit_childs_partial_path.should == 'kuhsaft/text_bricks/text_brick/childs'
+      expect(Kuhsaft::TextBrick.new.to_edit_childs_partial_path).to eq('kuhsaft/text_bricks/text_brick/childs')
     end
   end
 
   describe '#bricks' do
     it 'can not have childs by default' do
-      brick.should_not respond_to(:bricks)
+      expect(brick).not_to respond_to(:bricks)
     end
   end
 
   describe '#to_style_class' do
     it 'returns a css classname' do
-      Kuhsaft::TextBrick.new.to_style_class.should == 'kuhsaft-text-brick'
+      expect(Kuhsaft::TextBrick.new.to_style_class).to eq('kuhsaft-text-brick')
     end
   end
 
   describe '#to_style_id' do
     it 'returns a unique DOM id' do
       brick = Kuhsaft::TextBrick.new
-      brick.stub(:id).and_return(104)
-      brick.to_style_id.should == 'kuhsaft-text-brick-104'
+      allow(brick).to receive(:id).and_return(104)
+      expect(brick.to_style_id).to eq('kuhsaft-text-brick-104')
     end
   end
 
   describe '#backend_label' do
     it 'returns the name of the brick' do
       brick =  Kuhsaft::TextBrick.new
-      brick.backend_label.should == 'Text'
+      expect(brick.backend_label).to eq('Text')
     end
 
     context 'with the parenthesis option given' do
@@ -104,7 +104,7 @@ describe Kuhsaft::Brick do
 
   describe '#uploader?' do
     it 'returns false' do
-      brick.uploader?.should be_false
+      expect(brick.uploader?).to be_falsey
     end
   end
 
@@ -124,8 +124,8 @@ describe Kuhsaft::Brick do
       end
 
       it 'updates fulltext on bricklist after saving a single brick' do
-        brick.brick_list.should_receive(:update_fulltext)
-        brick.brick_list.should_receive(:save!)
+        expect(brick.brick_list).to receive(:update_fulltext)
+        expect(brick.brick_list).to receive(:save!)
         brick.text = 'foobar'
         brick.save
       end

data/spec/models/brick_type_filter_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Kuhsaft::BrickTypeFilter do
+describe Kuhsaft::BrickTypeFilter, type: :model do
   let :brick_list do
     Kuhsaft::Page.new
   end
@@ -12,21 +12,21 @@ describe Kuhsaft::BrickTypeFilter do
   describe '#empty?' do
     context 'when the user cant add childs' do
       before do
-        brick_list.stub(:user_can_add_childs?).and_return(false)
+        allow(brick_list).to receive(:user_can_add_childs?).and_return(false)
       end
 
       it 'returns true' do
-        brick_type_filter.empty?.should be_true
+        expect(brick_type_filter.empty?).to be_truthy
       end
     end
 
     context 'when there are no bricks to be added' do
       before do
-        brick_type_filter.stub(:allowed).and_return([])
+        allow(brick_type_filter).to receive(:allowed).and_return([])
       end
 
       it 'returns true' do
-        brick_type_filter.empty?.should be_true
+        expect(brick_type_filter.empty?).to be_truthy
       end
     end
   end
@@ -34,28 +34,28 @@ describe Kuhsaft::BrickTypeFilter do
   describe '#allowed' do
     context 'when no brick types are registered' do
       it 'returns an empty array' do
-        Kuhsaft::BrickType.stub_chain(:count, :zero?).and_return(true)
-        brick_type_filter.allowed.should be_empty
+        allow(Kuhsaft::BrickType).to receive_message_chain(:count, :zero?).and_return(true)
+        expect(brick_type_filter.allowed).to be_empty
       end
     end
 
     context 'when brick types are registered' do
       before do
-        Kuhsaft::BrickType.stub_chain(:enabled, :count, :zero?).and_return(false)
+        allow(Kuhsaft::BrickType).to receive_message_chain(:enabled, :count, :zero?).and_return(false)
       end
 
       context 'when there are no constraints' do
         it 'returns all enabled brick types' do
-          brick_list.stub(:allowed_brick_types).and_return([])
-          Kuhsaft::BrickType.should_receive(:enabled)
+          allow(brick_list).to receive(:allowed_brick_types).and_return([])
+          expect(Kuhsaft::BrickType).to receive(:enabled)
           brick_type_filter.allowed
         end
       end
 
       context 'when there are constraints' do
         it 'constrains the enabled types' do
-          brick_list.stub(:allowed_brick_types).and_return(['Kuhsaft::TextBrick'])
-          Kuhsaft::BrickType.enabled.should_receive(:constrained).with(['Kuhsaft::TextBrick'])
+          allow(brick_list).to receive(:allowed_brick_types).and_return(['Kuhsaft::TextBrick'])
+          expect(Kuhsaft::BrickType.enabled).to receive(:constrained).with(['Kuhsaft::TextBrick'])
           brick_type_filter.allowed
         end
       end

data/spec/models/column_brick_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Kuhsaft::ColumnBrick do
+describe Kuhsaft::ColumnBrick, type: :model do
 
   let :column_brick do
     Kuhsaft::ColumnBrick.new
@@ -8,25 +8,25 @@ describe Kuhsaft::ColumnBrick do
 
   describe '#user_can_delete?' do
     it 'returns false' do
-      column_brick.user_can_delete?.should be_false
+      expect(column_brick.user_can_delete?).to be_falsey
     end
   end
 
   describe '#user_can_save' do
     it 'returns false' do
-      column_brick.user_can_save?.should be_false
+      expect(column_brick.user_can_save?).to be_falsey
     end
   end
 
   describe '#renders_own_childs?' do
     it 'returns false' do
-      column_brick.renders_own_childs?.should be_false
+      expect(column_brick.renders_own_childs?).to be_falsey
     end
   end
 
   describe '#bricks' do
     it 'can have childs' do
-      column_brick.should respond_to(:bricks)
+      expect(column_brick).to respond_to(:bricks)
     end
   end
 end

data/spec/models/image_brick_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Kuhsaft::ImageBrick do
+describe Kuhsaft::ImageBrick, type: :model do
 
   let :image_brick do
     Kuhsaft::ImageBrick.new
@@ -13,7 +13,7 @@ describe Kuhsaft::ImageBrick do
 
     context 'without an #image' do
       it 'has en error' do
-        image_brick.should have(1).error_on(:image)
+        expect(image_brick.errors[:image].size).to eq(1)
       end
     end
   end
@@ -21,9 +21,9 @@ describe Kuhsaft::ImageBrick do
   describe '#save' do
     context 'when changing the image size' do
       it 'regenerates the image version' do
-        image_brick.stub(:image_size_changed?).and_return(true)
-        image_brick.stub(:image_present?).and_return(true)
-        image_brick.image.should_receive(:recreate_versions!)
+        allow(image_brick).to receive(:image_size_changed?).and_return(true)
+        allow(image_brick).to receive(:image_present?).and_return(true)
+        expect(image_brick.image).to receive(:recreate_versions!)
         image_brick.resize_image_if_size_changed
       end
     end
@@ -31,19 +31,19 @@ describe Kuhsaft::ImageBrick do
 
   describe '#bricks' do
     it 'can not have childs' do
-      image_brick.should_not respond_to(:bricks)
+      expect(image_brick).not_to respond_to(:bricks)
     end
   end
 
   describe '#user_can_add_childs?' do
     it 'returns false' do
-      image_brick.user_can_add_childs?.should be_false
+      expect(image_brick.user_can_add_childs?).to be_falsey
     end
   end
 
   describe '#uploader?' do
     it 'returns true' do
-      image_brick.uploader?.should be_true
+      expect(image_brick.uploader?).to be_truthy
     end
   end
 end

data/spec/models/image_size_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
-describe Kuhsaft::ImageSize do
+describe Kuhsaft::ImageSize, type: :model do
   before do
     Kuhsaft::ImageSize.build_defaults!
   end
 
   describe '.build_defaults!' do
     it 'sets the default sizes' do
-      Kuhsaft::ImageSize.all.should == [Kuhsaft::ImageSize.gallery_size,
-                                        Kuhsaft::ImageSize.teaser_size]
+      expect(Kuhsaft::ImageSize.all).to eq([Kuhsaft::ImageSize.gallery_size,
+                                            Kuhsaft::ImageSize.teaser_size])
     end
   end
 
@@ -18,7 +18,7 @@ describe Kuhsaft::ImageSize do
     end
 
     it 'empties the list' do
-      Kuhsaft::ImageSize.all.should be_empty
+      expect(Kuhsaft::ImageSize.all).to be_empty
     end
   end
 
@@ -30,7 +30,7 @@ describe Kuhsaft::ImageSize do
 
   describe '.find_by_name' do
     it 'returns the size' do
-      Kuhsaft::ImageSize.find_by_name('gallery').should == Kuhsaft::ImageSize.gallery_size
+      expect(Kuhsaft::ImageSize.find_by_name('gallery')).to eq(Kuhsaft::ImageSize.gallery_size)
     end
   end
 end

data/spec/models/link_brick_spec.rb

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