alchemy_cms 2.6.3 → 2.7.0

data/spec/controllers/admin/clipboard_controller_spec.rb

@@ -8,7 +8,7 @@ module Alchemy
     let(:another_element) { FactoryGirl.create(:element, :page => public_page) }
 
     before do
-      sign_in :user, FactoryGirl.create(:admin_user)
+      sign_in(admin_user)
       session[:clipboard] = Clipboard.new
     end
 

data/spec/controllers/admin/contents_controller_spec.rb

@@ -1,51 +1,42 @@
 require 'spec_helper'
 
 describe Alchemy::Admin::ContentsController do
+  before { sign_in(admin_user) }
 
-  before(:each) do
-    sign_in :user, FactoryGirl.create(:admin_user)
-  end
+  let(:element) { FactoryGirl.create(:element, create_contents_after_create: true) }
 
   describe '#create' do
+    let(:element) { FactoryGirl.create(:element, name: 'headline') }
 
-    let(:element) { FactoryGirl.create(:element, :name => 'headline') }
-
-    it "should create a content via ajax post" do
-      length_before = element.contents.length
-      post :create, {:content => {:element_id => element.id, :name => 'headline'}, :format => :js}
-      element.contents.reload
-      element.contents.length.should == length_before + 1
+    it "creates a content from name" do
+      expect {
+        xhr :post, :create, {content: {element_id: element.id, name: 'headline'}}
+      }.to change{element.contents.count}.by(1)
     end
 
+    it "creates a content from essence_type" do
+      expect {
+        xhr :post, :create, {content: {element_id: element.id, essence_type: 'EssencePicture'}}
+      }.to change{element.contents.count}.by(1)
+    end
   end
 
   describe '#update' do
-
     it "should update a content via ajax" do
-      @element = FactoryGirl.create(:element, :create_contents_after_create => true)
-      post :update, {:id => @element.contents.find_by_name('intro').id, :content => {:body => 'Peters Petshop'}, :format => :js}
-      @element.ingredient('intro').should == "Peters Petshop"
+      xhr :post, :update, {id: element.contents.find_by_name('intro').id, content: {body: 'Peters Petshop'}}
+      element.ingredient('intro').should == "Peters Petshop"
     end
-
   end
 
   describe "#order" do
-
     context "with content_ids in params" do
-
-      before(:each) do
-        @element = FactoryGirl.create(:element, :create_contents_after_create => true)
-      end
-
       it "should reorder the contents" do
-        content_ids = @element.contents.essence_texts.collect(&:id)
-        post :order, {:content_ids => content_ids.reverse, :format => :js}
+        content_ids = element.contents.essence_texts.collect(&:id)
+        xhr :post, :order, {content_ids: content_ids.reverse}
         response.status.should == 200
-        @element.contents.essence_texts.collect(&:id).should == content_ids.reverse
+        element.contents.essence_texts.collect(&:id).should == content_ids.reverse
       end
-
     end
-
   end
 
 end

data/spec/controllers/admin/dashboard_controller_spec.rb

@@ -0,0 +1,121 @@
+require 'spec_helper'
+
+module Alchemy
+  describe Admin::DashboardController do
+
+    before do
+      sign_in(admin_user)
+    end
+
+    describe '#index' do
+      before do
+        Page.stub_chain(:from_current_site, :all_last_edited_from).and_return([])
+        Page.stub_chain(:from_current_site, :all_locked).and_return([])
+        User.stub!(:logged_in).and_return([controller.current_user])
+        controller.current_user.stub!(:sign_in_count).and_return(5)
+      end
+
+      it "should assign @last_edited_pages" do
+        get :index
+        expect(assigns(:last_edited_pages)).to eq([])
+      end
+
+      it "should assign @locked_pages" do
+        get :index
+        expect(assigns(:locked_pages)).to eq([])
+      end
+
+      it "should assign @online_users" do
+        get :index
+        expect(assigns(:online_users)).to eq([])
+      end
+
+      it "should assign @first_time" do
+        get :index
+        expect(assigns(:first_time)).to eq(false)
+      end
+
+      it "should assign @sites" do
+        get :index
+        expect(assigns(:sites)).to eq(Site.scoped)
+      end
+    end
+    
+    describe '#info' do
+      it "should assign @alchemy_version with the current Alchemy version" do
+        get :info
+        expect(assigns(:alchemy_version)).to eq(Alchemy.version)
+      end
+    end
+
+    describe '#update_check' do
+
+      context "if current Alchemy version equals the latest released version or it is newer" do
+        before do
+          controller.stub!(:latest_alchemy_version).and_return('2.6')
+          Alchemy.stub!(:version).and_return("2.6")
+        end
+
+        it "should render 'false'" do
+          get :update_check
+          expect(response.body).to eq('false')
+        end
+      end
+
+      context "if current Alchemy version is older than latest released version" do
+        before do
+          controller.stub!(:latest_alchemy_version).and_return('2.6')
+          Alchemy.stub!(:version).and_return("2.5")
+        end
+
+        it "should render 'true'" do
+          get :update_check
+          expect(response.body).to eq('true')
+        end
+      end
+
+      context "requesting rubygems.org" do
+        before do
+          Net::HTTP.any_instance.stub(:request).and_return(
+            OpenStruct.new({code: '200', body: '[{"number": "2.6"}, {"number": "2.5"}]'})
+          )
+          Alchemy.stub!(:version).and_return("2.6")
+        end
+
+        it "should have response code of 200" do
+          get :update_check
+          expect(response.code).to eq('200')
+        end
+      end
+
+      context "requesting github.com" do
+        before do
+          controller.stub!(:query_rubygems).and_return(OpenStruct.new({code: '503'}))
+          Net::HTTP.any_instance.stub(:request).and_return(
+            OpenStruct.new({code: '200', body: '[{"name": "2.6"}, {"name": "2.5"}]'})
+          )
+        end
+
+        it "should have response code of 200" do
+          get :update_check
+          expect(response.code).to eq('200')
+        end
+      end
+
+      context "rubygems.org and github.com are unavailable" do
+        before do
+          Net::HTTP.any_instance.stub(:request).and_return(
+            OpenStruct.new({code: '503'})
+          )
+        end
+
+        it "should have status code 503" do
+          get :update_check
+          expect(response.code).to eq('503')
+        end
+      end
+
+    end
+
+  end
+end

data/spec/controllers/admin/elements_controller_spec.rb

@@ -4,7 +4,7 @@ module Alchemy
   describe Admin::ElementsController do
 
     before(:each) do
-      sign_in :user, FactoryGirl.create(:admin_user)
+      sign_in(admin_user)
     end
 
     let(:alchemy_page) { FactoryGirl.create(:page, :urlname => 'lulu') }

data/spec/controllers/admin/essence_files_controller_spec.rb

@@ -0,0 +1,67 @@
+require "spec_helper"
+
+module Alchemy
+  describe Admin::EssenceFilesController do
+
+    before do
+      sign_in(admin_user)
+    end
+
+    let(:content) { mock_model('Content', essence: essence_file) }
+    let(:essence_file) { mock_model('EssenceFile', :attachment= => nil) }
+    let(:attachment) { mock_model('Attachment') }
+    
+    describe '#edit' do
+      before do
+        Content.stub!(:find).with(content.id.to_s).and_return(content)
+      end
+
+      it "should assign @content with the Content found by id" do
+        get :edit, id: content.id
+        expect(assigns(:content)).to eq(content)
+      end
+
+      it "should assign @essence_file with content's essence" do
+        get :edit, id: content.id
+        expect(assigns(:essence_file)).to eq(content.essence)
+      end
+
+      context 'xhr request' do
+        it "should not render a layout" do
+          xhr :get, :edit, id: content.id
+          expect(@layouts).to be_empty
+        end
+      end
+    end
+
+    describe '#update' do
+      before do
+        EssenceFile.stub!(:find).with(essence_file.id.to_s).and_return(essence_file)
+      end
+
+      it "should update the attributes of essence_file" do
+        essence_file.should_receive(:update_attributes).and_return(true)
+        xhr :put, :update, id: essence_file.id
+      end
+    end
+
+    describe '#assign' do
+      before do
+        Content.stub!(:find_by_id).with(content.id.to_s).and_return(content)
+        Attachment.stub!(:find_by_id).and_return(attachment)
+      end
+
+      it "should assign @attachment with the Attachment found by attachment_id" do
+        xhr :put, :assign, id: content.id, attachment_id: attachment.id
+        expect(assigns(:attachment)).to eq(attachment)
+      end
+
+      it "should assign @content.essence.attachment with the attachment found by id" do
+        content.essence.should_receive(:attachment=).with(attachment)
+        xhr :put, :assign, id: content.id, attachment_id: attachment.id
+      end
+
+    end
+
+  end
+end

data/spec/controllers/admin/essence_pictures_controller_spec.rb

@@ -0,0 +1,161 @@
+require 'spec_helper'
+
+module Alchemy
+  describe Admin::EssencePicturesController do
+    before { sign_in(admin_user) }
+
+    let(:essence) { EssencePicture.new }
+    let(:content) { Content.new }
+    let(:picture) { Picture.new }
+
+    describe '#edit' do
+      before do
+        EssencePicture.should_receive(:find).and_return(essence)
+        Content.should_receive(:find).and_return(content)
+      end
+
+      it 'should assign @essence_picture and @content instance variables' do
+        post :edit, id: 1, content_id: 1
+        expect(assigns(:essence_picture)).to be_a(EssencePicture)
+        expect(assigns(:content)).to be_a(Content)
+      end
+    end
+
+    describe '#crop' do
+      before do
+        EssencePicture.should_receive(:find).and_return(essence)
+      end
+
+      context 'with no picture assigned' do
+        before { essence.should_receive(:picture).and_return(nil) }
+
+        it "renders error message" do
+          get :crop, id: 1
+          expect(assigns(:no_image_notice)).to eq(Alchemy::I18n.t(:no_image_for_cropper_found))
+        end
+      end
+
+      context 'with picture assigned' do
+        let(:default_mask) { {'x1' => '0', 'y1' => '0', 'x2' => '100', 'y2' => '100'} }
+
+        before do
+          picture.image_file_width = 300
+          picture.image_file_height = 250
+          essence.should_receive(:picture).and_return(picture)
+        end
+
+        context 'with no render_size present in essence' do
+          before do
+            essence.should_receive(:render_size).and_return(nil)
+          end
+
+          context 'with sizes in params' do
+            it "sets sizes to given values" do
+              get :crop, id: 1, options: {image_size: '300x250'}
+              expect(assigns(:size_x)).to eq('300')
+              expect(assigns(:size_y)).to eq('250')
+            end
+          end
+
+          context 'with no sizes in params' do
+            it "sets sizes to zero" do
+              get :crop, id: 1
+              expect(assigns(:size_x)).to eq(0)
+              expect(assigns(:size_y)).to eq(0)
+            end
+          end
+        end
+
+        context 'with render_size present in essence' do
+          before do
+            essence.stub(:render_size).and_return('30x25')
+          end
+
+          it "sets sizes from these values" do
+            get :crop, id: 1
+            expect(assigns(:size_x)).to eq('30')
+            expect(assigns(:size_y)).to eq('25')
+          end
+        end
+
+        context 'no crop sizes present in essence' do
+          before do
+            essence.stub(:crop_from).and_return(nil)
+            essence.stub(:crop_size).and_return(nil)
+            picture.should_receive(:default_mask).and_return(default_mask)
+          end
+
+          it "assigns default mask boxes" do
+            get :crop, id: 1
+            expect(assigns(:initial_box)).to eq(default_mask)
+            expect(assigns(:default_box)).to eq(default_mask)
+          end
+        end
+
+        context 'crop sizes present in essence' do
+          let(:mask) { {'x1' => '0', 'y1' => '0', 'x2' => '120', 'y2' => '160'} }
+
+          before do
+            essence.stub(:crop_from).and_return('0x0')
+            essence.stub(:crop_size).and_return('120x160')
+            picture.should_receive(:default_mask).and_return(default_mask)
+          end
+
+          it "assigns cropping boxes" do
+            essence.should_receive(:cropping_mask).and_return(mask)
+            get :crop, id: 1
+            expect(assigns(:initial_box)).to eq(mask)
+            expect(assigns(:default_box)).to eq(default_mask)
+          end
+        end
+
+        context 'with fixed_ratio set to false' do
+          it "sets ratio to false" do
+            get :crop, id: 1, options: {fixed_ratio: false}
+            expect(assigns(:ratio)).to eq(false)
+          end
+        end
+
+        context 'with no fixed_ratio set in params' do
+          it "sets a fixed ratio from sizes" do
+            get :crop, id: 1, options: {image_size: '80x60'}
+            expect(assigns(:ratio)).to eq(80.0/60.0)
+          end
+        end
+
+        context 'with size_y set to zero' do
+          it "sets ratio to 1" do
+            get :crop, id: 1
+            expect(assigns(:ratio)).to eq(1)
+          end
+        end
+      end
+    end
+
+    describe '#update' do
+      before do
+        EssencePicture.should_receive(:find).and_return(essence)
+        Content.should_receive(:find).and_return(content)
+      end
+
+      it "updates the essence attributes" do
+        essence.should_receive(:update_attributes).and_return(true)
+        xhr :put, :update, id: 1, essence_picture: {render_size: '1x1'}
+      end
+    end
+
+    describe '#assign' do
+      before do
+        Content.should_receive(:find).and_return(content)
+        Content.any_instance.stub(:essence).and_return(essence)
+        Picture.should_receive(:find_by_id).and_return(picture)
+      end
+
+      it "should assign a Picture" do
+        xhr :put, :assign, content_id: '1', picture_id: '1'
+        expect(assigns(:content).essence.picture).to eq(picture)
+      end
+    end
+
+  end
+end

data/spec/controllers/admin/languages_controller_spec.rb

@@ -6,7 +6,7 @@ end
 describe Alchemy::Admin::LanguagesController do
 
   before do
-    sign_in :user, FactoryGirl.create(:admin_user)
+    sign_in(admin_user)
   end
 
   describe "new" do