alchemy_cms 3.2.1 → 3.3.0.rc1

data/spec/models/{picture_spec.rb → alchemy/picture_spec.rb}

@@ -3,13 +3,12 @@ require 'spec_helper'
 
 module Alchemy
   describe Picture do
-
     it_behaves_like "has image transformations" do
-      let(:picture) { FactoryGirl.build_stubbed(:picture) }
+      let(:picture) { build_stubbed(:alchemy_picture) }
     end
 
     let :image_file do
-      File.new(File.expand_path('../../fixtures/image.png', __FILE__))
+      File.new(File.expand_path('../../../fixtures/image.png', __FILE__))
     end
 
     let(:picture) { Picture.new }
@@ -25,33 +24,50 @@ module Alchemy
     end
 
     it "is valid with capitalized image file extension" do
-      image_file = File.new(File.expand_path('../../fixtures/image2.PNG', __FILE__))
+      image_file = File.new(File.expand_path('../../../fixtures/image2.PNG', __FILE__))
       picture = Picture.new(image_file: image_file)
       expect(picture).to be_valid
     end
 
     it "is valid with jpeg image file extension" do
-      image_file = File.new(File.expand_path('../../fixtures/image3.jpeg', __FILE__))
+      image_file = File.new(File.expand_path('../../../fixtures/image3.jpeg', __FILE__))
       picture = Picture.new(image_file: image_file)
       expect(picture).to be_valid
     end
 
     context 'with enabled preprocess_image_resize config option' do
       let(:image_file) do
-        File.new(File.expand_path('../../fixtures/80x60.png', __FILE__))
+        File.new(File.expand_path('../../../fixtures/80x60.png', __FILE__))
       end
 
-      before do
-        allow(Config).to receive(:get) do |arg|
-          if arg == :preprocess_image_resize
-            '10x10'
+      context 'with > geometry string' do
+        before do
+          allow(Config).to receive(:get) do |arg|
+            if arg == :preprocess_image_resize
+              '10x10>'
+            end
           end
         end
+
+        it "it resizes the image after upload" do
+          picture = Picture.new(image_file: image_file)
+          expect(picture.image_file.data[0x10..0x18].unpack('NN')).to eq([10, 8])
+        end
       end
 
-      it "it resizes the image after upload" do
-        picture = Picture.new(image_file: image_file)
-        expect(picture.image_file.data[0x10..0x18].unpack('NN')).to eq([10, 8])
+      context 'without > geometry string' do
+        before do
+          allow(Config).to receive(:get) do |arg|
+            if arg == :preprocess_image_resize
+              '10x10'
+            end
+          end
+        end
+
+        it "it resizes the image after upload" do
+          picture = Picture.new(image_file: image_file)
+          expect(picture.image_file.data[0x10..0x18].unpack('NN')).to eq([10, 8])
+        end
       end
     end
 
@@ -126,8 +142,68 @@ module Alchemy
       end
     end
 
+    describe ".search_by" do
+      subject(:search_by) { Picture.search_by(params, query, per_page) }
+
+      let(:pictures) { Picture.all }
+      let(:params) { ActionController::Parameters.new }
+      let(:query) { double(result: pictures) }
+      let(:per_page) { nil }
+
+      it 'orders the result by name' do
+        expect(pictures).to receive(:order).with(:name)
+        search_by
+      end
+
+      context "with per_page given" do
+        let(:per_page) { 10 }
+
+        context "without page parameter given" do
+          it "paginates the records" do
+            expect(pictures).to receive(:page).with(1).and_call_original
+            search_by
+          end
+        end
+
+        context "with page parameter given" do
+          let(:params) do
+            ActionController::Parameters.new(page: 2)
+          end
+
+          it "paginates the records" do
+            expect(pictures).to receive(:page).with(2).and_call_original
+            search_by
+          end
+        end
+      end
+
+      context "when params[:filter] is set" do
+        let(:params) do
+          ActionController::Parameters.new(filter: 'recent')
+        end
+
+        it "filters the pictures collection by the given filter string" do
+          expect(pictures).to \
+            receive(:filtered_by).with(params['filter']).and_call_original
+          search_by
+        end
+      end
+
+      context "when params[:tagged_with] is set" do
+        let(:params) do
+          ActionController::Parameters.new(tagged_with: 'kitten')
+        end
+
+        it "filters the records by tags" do
+          expect(pictures).to \
+            receive(:tagged_with).with(params['tagged_with']).and_call_original
+          search_by
+        end
+      end
+    end
+
     describe '.filtered_by' do
-      let(:picture) { FactoryGirl.build_stubbed(:picture) }
+      let(:picture) { build_stubbed(:alchemy_picture) }
 
       context "with 'recent' as argument" do
         it 'should call the .recent scope' do
@@ -168,17 +244,17 @@ module Alchemy
         expect(Picture.last_upload).to include(same_upload)
         expect(Picture.last_upload).not_to include(other_upload)
 
-        [other_upload, same_upload, most_recent].each { |p| p.destroy }
+        [other_upload, same_upload, most_recent].each(&:destroy)
       end
     end
 
     describe '.recent' do
       before do
-        now = Time.now
+        now = Time.current
         @recent = Picture.create!(image_file: image_file)
         @old_picture = Picture.create!(image_file: image_file)
-        @recent.update_column(:created_at, now-23.hours)
-        @old_picture.update_column(:created_at, now-10.days)
+        @recent.update_column(:created_at, now - 23.hours)
+        @old_picture.update_column(:created_at, now - 10.days)
       end
 
       it "should return all pictures that have been created in the last 24 hours" do
@@ -193,7 +269,7 @@ module Alchemy
     describe '#destroy' do
       context "a picture that is assigned in an essence" do
         let(:essence_picture) { EssencePicture.create }
-        let(:picture) { FactoryGirl.create :picture }
+        let(:picture) { create :alchemy_picture }
 
         before do
           essence_picture.update_attributes(picture_id: picture.id)
@@ -208,7 +284,7 @@ module Alchemy
     describe "#image_file_dimensions" do
       it "should return the width and height in the format of '1024x768'" do
         picture.image_file = image_file
-        expect(picture.image_file_dimensions).to eq('1 x 1')
+        expect(picture.image_file_dimensions).to eq('1x1')
       end
     end
 
@@ -240,14 +316,14 @@ module Alchemy
     describe '#urlname' do
       subject { picture.urlname }
 
-      let(:picture) { build_stubbed(:picture, name: 'Cute kittens.jpg') }
+      let(:picture) { build_stubbed(:alchemy_picture, name: 'Cute kittens.jpg') }
 
       it "returns a uri escaped name" do
         is_expected.to eq('Cute+kittens')
       end
 
       context 'with blank name' do
-        let(:picture) { build_stubbed(:picture, name: '') }
+        let(:picture) { build_stubbed(:alchemy_picture, name: '') }
 
         it "returns generic name" do
           is_expected.to eq("image_#{picture.id}")
@@ -258,7 +334,7 @@ module Alchemy
     describe '#to_jq_upload' do
       subject { picture.to_jq_upload }
 
-      let(:picture) { build_stubbed(:picture, image_file_name: 'cute-kittens.jpg', image_file_size: 1024) }
+      let(:picture) { build_stubbed(:alchemy_picture, image_file_name: 'cute-kittens.jpg', image_file_size: 1024) }
 
       it "returns a hash containing data for jquery fileuploader" do
         is_expected.to be_an_instance_of(Hash)
@@ -267,7 +343,7 @@ module Alchemy
       end
 
       context 'with error' do
-        let(:picture) { build_stubbed(:picture) }
+        let(:picture) { build_stubbed(:alchemy_picture) }
 
         before do
           expect(picture).to receive(:errors).and_return({image_file: %w(stupid_cats)})
@@ -283,7 +359,7 @@ module Alchemy
     describe '#restricted?' do
       subject { picture.restricted? }
 
-      let(:picture) { build_stubbed(:picture) }
+      let(:picture) { build_stubbed(:alchemy_picture) }
 
       context 'is assigned on pages' do
         context 'that are all restricted' do
@@ -318,12 +394,24 @@ module Alchemy
       end
     end
 
-    describe '.find_paginated' do
-      subject { Picture.find_paginated({query: 'kitten'}, 5) }
+    context 'navigating records' do
+      let!(:picture1) { create(:alchemy_picture, name: 'abc') }
+      let!(:picture2) { create(:alchemy_picture, name: 'def') }
+
+      describe "#previous" do
+        subject { picture2.previous }
 
-      it "finds pages by name" do
-        expect(Picture).to receive(:named).with('kitten').and_return(Picture.none)
-        subject
+        it "returns the previous record by name" do
+          is_expected.to eq(picture1)
+        end
+      end
+
+      describe "#next" do
+        subject { picture1.next }
+
+        it "returns the next record by name" do
+          is_expected.to eq(picture2)
+        end
       end
     end
   end

data/spec/models/{site_spec.rb → alchemy/site_spec.rb}

@@ -2,11 +2,13 @@ require 'spec_helper'
 
 module Alchemy
   describe Site do
-    let(:site) { FactoryGirl.create(:site) }
-    let(:another_site) { FactoryGirl.create(:site, name: 'Another Site', host: 'another.com') }
+    let(:site) { create(:alchemy_site) }
+    let(:another_site) { create(:alchemy_site, name: 'Another Site', host: 'another.com') }
 
     describe 'new instances' do
-      subject { FactoryGirl.build(:site) }
+      subject { build(:alchemy_site, host: 'bla.com') }
+
+      before { Site.current = subject }
 
       it 'should start out with no languages' do
         expect(subject.languages).to be_empty
@@ -16,13 +18,13 @@ module Alchemy
         context 'when it has no languages yet' do
           it 'should automatically create a default language' do
             subject.save!
-            expect(subject.languages.length).to eq(1) # using count returns 0, although the resulting array has a length of 1 / O.o
+            expect(subject.languages.count).to eq(1)
             expect(subject.languages.first).to be_default
           end
         end
 
         context 'when it already has a language' do
-          let(:language) { FactoryGirl.build(:language, site: nil) }
+          let(:language) { build(:alchemy_language, site: nil) }
           before { subject.languages << language }
 
           it 'should not create any additional languages' do
@@ -40,7 +42,7 @@ module Alchemy
       # But let's add some more:
       #
       let(:default_site)    { Site.default }
-      let!(:magiclabs_site) { FactoryGirl.create(:site, host: 'www.magiclabs.de', aliases: 'magiclabs.de magiclabs.com www.magiclabs.com') }
+      let!(:magiclabs_site) { create(:alchemy_site, host: 'www.magiclabs.de', aliases: 'magiclabs.de magiclabs.com www.magiclabs.com') }
 
       subject { Site.find_for_host(host) }
 
@@ -96,77 +98,11 @@ module Alchemy
       end
     end
 
-    describe '.layout_definitions' do
-      # To prevent memoization across specs
-      before { Site.instance_variable_set("@layout_definitions", nil) }
-
-      subject { Site.layout_definitions }
-
-      context "with file present" do
-        let(:definitions) { [{'name' => 'lala'}] }
-        before { expect(YAML).to receive(:load_file).and_return(definitions) }
-        it { is_expected.to eq(definitions) }
-      end
-
-      context "with empty file" do
-        before { expect(YAML).to receive(:load_file).and_return(false) }
-        it { is_expected.to eq([]) }
-      end
-
-      context "with no file present" do
-        it { is_expected.to eq([]) }
-      end
-    end
-
-    describe '.layout_definitions' do
+    describe '.definitions' do
       # To prevent memoization across specs
-      before { Site.instance_variable_set("@layout_definitions", nil) }
+      before { Site.instance_variable_set("@definitions", nil) }
 
-      subject { Site.layout_definitions }
-
-      context "with file present" do
-        let(:definitions) { [{'name' => 'lala'}] }
-        before { expect(YAML).to receive(:load_file).and_return(definitions) }
-        it { is_expected.to eq(definitions) }
-      end
-
-      context "with empty file" do
-        before { expect(YAML).to receive(:load_file).and_return(false) }
-        it { is_expected.to eq([]) }
-      end
-
-      context "with no file present" do
-        it { is_expected.to eq([]) }
-      end
-    end
-
-    describe '.layout_definitions' do
-      # To prevent memoization across specs
-      before { Site.instance_variable_set("@layout_definitions", nil) }
-
-      subject { Site.layout_definitions }
-
-      context "with file present" do
-        let(:definitions) { [{'name' => 'lala'}] }
-        before { expect(YAML).to receive(:load_file).and_return(definitions) }
-        it { is_expected.to eq(definitions) }
-      end
-
-      context "with empty file" do
-        before { expect(YAML).to receive(:load_file).and_return(false) }
-        it { is_expected.to eq([]) }
-      end
-
-      context "with no file present" do
-        it { is_expected.to eq([]) }
-      end
-    end
-
-    describe '.layout_definitions' do
-      # To prevent memoization across specs
-      before { Site.instance_variable_set("@layout_definitions", nil) }
-
-      subject { Site.layout_definitions }
+      subject { Site.definitions }
 
       context "with file present" do
         let(:definitions) { [{'name' => 'lala'}] }
@@ -204,30 +140,29 @@ module Alchemy
     end
 
     describe '#to_partial_path' do
-      let(:site) {Site.new(name: 'My custom site')}
+      let(:site) { Site.new(name: 'My custom site') }
 
       it "returns the path to partial" do
         expect(site.to_partial_path).to eq("alchemy/site_layouts/my_custom_site")
       end
     end
 
-    describe '#layout_partial_name' do
-      let(:site) {Site.new(name: 'My custom site')}
+    describe '#partial_name' do
+      let(:site) { Site.new(name: 'My custom site') }
 
       it "returns the name for layout partial" do
-        expect(site.layout_partial_name).to eq("my_custom_site")
+        expect(site.partial_name).to eq("my_custom_site")
       end
     end
 
-    describe '#layout_definition' do
-      let(:site) {Site.new(name: 'My custom site')}
+    describe '#definition' do
+      let(:site) { Site.new(name: 'My custom site') }
       let(:definitions) { [{'name' => 'my_custom_site', 'page_layouts' => %w(standard)}] }
 
       it "returns layout definition from site_layouts.yml file" do
-        allow(Site).to receive(:layout_definitions).and_return(definitions)
-        expect(site.layout_definition).to eq(definitions.first)
+        allow(Site).to receive(:definitions).and_return(definitions)
+        expect(site.definition).to eq(definitions.first)
       end
     end
-
   end
 end

data/spec/models/{tag_spec.rb → alchemy/tag_spec.rb}

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 module Alchemy
   describe Tag do
-
     describe '.replace' do
       let(:picture) { Picture.new }
       let(:element) { Element.new }
@@ -26,6 +25,5 @@ module Alchemy
         expect(element.tag_list).to eq(['green'])
       end
     end
-
   end
-end
+end

data/spec/models/dummy_model_spec.rb

@@ -1,10 +1,9 @@
 require 'spec_helper'
 
 describe 'A User-defined Essence' do
-
   describe DummyModel do
     it_behaves_like "an essence" do
-      let(:essence)          { DummyModel.new  }
+      let(:essence)          { DummyModel.new }
       let(:ingredient_value) { "Some String" }
     end
   end

data/spec/requests/alchemy/admin/resources_requests_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+RSpec.describe 'Resource requests' do
+  describe 'csv export' do
+    it 'returns valid csv file' do
+      get '/admin/events.csv'
+      expect(response.content_type).to eq(:csv)
+      expect(response.body).to include(';')
+    end
+
+    it 'includes id column' do
+      event = create(:event)
+      get '/admin/events.csv'
+      csv = CSV.parse(response.body, col_sep: ";")
+      expect(csv[0][0]).to eq('Id')
+      expect(csv[1][0]).to eq(event.id.to_s)
+    end
+
+    it 'body does not truncate long text columns' do
+      create(:event, description: '*' * 51)
+      get '/admin/events.csv'
+      csv = CSV.parse(response.body, col_sep: ";")
+      expect(csv[1][7]).to_not include('...')
+    end
+  end
+end