alchemy_cms 3.1.3 → 3.2.0.beta

data/spec/controllers/admin/pictures_controller_spec.rb

@@ -10,20 +10,20 @@ module Alchemy
     describe "#index" do
       it "should always paginate the records" do
         expect(Picture).to receive(:find_paginated)
-        get :index
+        alchemy_get :index
       end
 
       context "when params[:filter] is set" do
         it "should filter the pictures collection by the given filter string." do
           expect(Picture).to receive(:filtered_by).with('recent').and_return(Picture.all)
-          get :index, filter: 'recent'
+          alchemy_get :index, filter: 'recent'
         end
       end
 
       context "when params[:tagged_with] is set" do
         it "should filter the records by tags" do
           expect(Picture).to receive(:tagged_with).and_return(Picture.all)
-          get :index, tagged_with: "red"
+          alchemy_get :index, tagged_with: "red"
         end
       end
 
@@ -34,19 +34,19 @@ module Alchemy
           end
 
           it "for html requests it renders the archive_overlay partial" do
-            get :index, {element_id: 1}
+            alchemy_get :index, {element_id: 1}
             expect(response).to render_template(partial: '_archive_overlay')
           end
 
           it "for ajax requests it renders the archive_overlay template" do
-            xhr :get, :index, {element_id: 1}
+            alchemy_xhr :get, :index, {element_id: 1}
             expect(response).to render_template(:archive_overlay)
           end
         end
 
         context "is not set" do
           it "should render the default index view" do
-            get :index
+            alchemy_get :index
             expect(response).to render_template(:index)
           end
         end
@@ -54,7 +54,7 @@ module Alchemy
     end
 
     describe '#new' do
-      subject { get :new, params }
+      subject { alchemy_get :new, params }
 
       let(:params) { Hash.new }
 
@@ -93,7 +93,7 @@ module Alchemy
     end
 
     describe '#create' do
-      subject { post :create, params }
+      subject { alchemy_post :create, params }
 
       let(:params)  { {picture: {name: ''}} }
       let(:picture) { mock_model('Picture', humanized_name: 'Cute kittens', to_jq_upload: {}) }
@@ -166,20 +166,20 @@ module Alchemy
       before { expect(Picture).to receive(:where).and_return(pictures) }
 
       it 'assigns pictures instance variable' do
-        get :edit_multiple
+        alchemy_get :edit_multiple
         expect(assigns(:pictures)).to eq(pictures)
       end
 
       it 'assigns tags instance variable' do
-        get :edit_multiple
+        alchemy_get :edit_multiple
         expect(assigns(:tags)).to include('kitten')
       end
     end
 
     describe '#update' do
-      subject { put :update, picture: {name: ''} }
+      subject { alchemy_put :update, {id: 1, picture: {name: ''}} }
 
-      let(:picture) { mock_model('Picture', name: 'Cute kitten') }
+      let(:picture) { build_stubbed(:picture, name: 'Cute kitten') }
 
       before do
         expect(Picture).to receive(:find).and_return(picture)
@@ -226,13 +226,13 @@ module Alchemy
       end
 
       it "loads and assigns pictures" do
-        post :update_multiple
+        alchemy_post :update_multiple
         expect(assigns(:pictures)).to eq(pictures)
       end
     end
 
     describe "#delete_multiple" do
-      subject { delete :delete_multiple, picture_ids: picture_ids }
+      subject { alchemy_delete :delete_multiple, picture_ids: picture_ids }
 
       let(:deletable_picture)     { mock_model('Picture', name: 'pic of the pig', deletable?: true) }
       let(:not_deletable_picture) { mock_model('Picture', name: 'pic of the chick', deletable?: false) }
@@ -295,7 +295,7 @@ module Alchemy
     end
 
     describe '#destroy' do
-      let(:picture) { mock_model('Picture', name: 'Cute kitten') }
+      let(:picture) { build_stubbed(:picture, name: 'Cute kitten') }
 
       before do
         expect(Picture).to receive(:find).and_return(picture)
@@ -303,7 +303,7 @@ module Alchemy
 
       it "destroys the picture and sets and success message" do
         expect(picture).to receive(:destroy)
-        delete :destroy
+        alchemy_delete :destroy, id: picture.id
         expect(assigns(:picture)).to eq(picture)
         expect(flash[:notice]).not_to be_blank
       end
@@ -314,12 +314,12 @@ module Alchemy
         end
 
         it "shows error notice" do
-          delete :destroy
+          alchemy_delete :destroy, id: picture.id
           expect(flash[:error]).not_to be_blank
         end
 
         it "redirects to index" do
-          delete :destroy
+          alchemy_delete :destroy, id: picture.id
           expect(response).to redirect_to admin_pictures_path
         end
       end
@@ -328,7 +328,7 @@ module Alchemy
     describe '#flush' do
       it "removes the complete pictures cache" do
         expect(FileUtils).to receive(:rm_rf).with(Rails.root.join('public', '', 'pictures'))
-        xhr :post, :flush
+        alchemy_xhr :post, :flush
       end
     end
 

data/spec/controllers/admin/resources_controller_spec.rb

@@ -1,9 +1,9 @@
 require "spec_helper"
 
-class EventsController < Alchemy::Admin::ResourcesController
+class Admin::EventsController < Alchemy::Admin::ResourcesController
 end
 
-describe EventsController do
+describe Admin::EventsController do
   it "should include ResourcesHelper" do
     expect(controller.respond_to?(:resource_window_size)).to be_truthy
   end

data/spec/controllers/admin/trash_controller_spec.rb

@@ -14,13 +14,13 @@ module Alchemy
       }
 
       it "should hold trashed elements" do
-        get :index, :page_id => alchemy_page.id
+        alchemy_get :index, :page_id => alchemy_page.id
         expect(response.body).to have_selector("#element_#{element.id}.element_editor")
       end
 
       it "should not hold elements that are not trashed" do
         element = FactoryGirl.create(:element, :page => alchemy_page, :public => false)
-        get :index, :page_id => alchemy_page.id
+        alchemy_get :index, :page_id => alchemy_page.id
         expect(response.body).not_to have_selector("#element_#{element.id}.element_editor")
       end
 
@@ -34,7 +34,7 @@ module Alchemy
           end
 
           it "unique elements should be draggable" do
-            get :index, page_id: alchemy_page.id
+            alchemy_get :index, page_id: alchemy_page.id
             expect(response.body).to have_selector("#element_#{trashed.id}.element_editor.draggable")
           end
         end
@@ -49,7 +49,7 @@ module Alchemy
           end
 
           it "unique elements should not be draggable" do
-            get :index, page_id: page.id
+            alchemy_get :index, page_id: page.id
             expect(response.body).to have_selector("#element_#{trashed.id}.element_editor.not-draggable")
           end
         end
@@ -58,7 +58,7 @@ module Alchemy
       describe "#clear" do
         it "should destroy all containing elements" do
           expect(Element.trashed).not_to be_empty
-          xhr :post, :clear, page_id: alchemy_page.id
+          alchemy_xhr :post, :clear, page_id: alchemy_page.id
           expect(Element.trashed).to be_empty
         end
       end

data/spec/controllers/alchemy/admin/tags_controller_spec.rb

@@ -10,7 +10,7 @@ module Alchemy
           render_views
 
           it "does not create tag" do
-            post :create, tag: {name: ''}
+            alchemy_post :create, tag: {name: ''}
             expect(response.body).to have_content("can't be blank")
           end
         end
@@ -18,7 +18,7 @@ module Alchemy
         context 'with required params' do
           it "creates tag and redirects to tags view" do
             expect {
-              post :create, tag: {name: 'Foo'}
+              alchemy_post :create, tag: {name: 'Foo'}
             }.to change { ActsAsTaggableOn::Tag.count }.by(1)
             expect(response).to redirect_to admin_tags_path
           end
@@ -32,7 +32,7 @@ module Alchemy
         before { another_tag; tag }
 
         it "loads alls tags but not the one editing" do
-          get :edit, id: tag.id
+          alchemy_get :edit, id: tag.id
           expect(assigns(:tags)).to include(another_tag)
           expect(assigns(:tags)).not_to include(tag)
         end
@@ -42,7 +42,7 @@ module Alchemy
         let(:tag) { ActsAsTaggableOn::Tag.create(name: 'Sputz') }
 
         it "changes tags name" do
-          put :update, id: tag.id, tag: {name: 'Foo'}
+          alchemy_put :update, id: tag.id, tag: {name: 'Foo'}
           expect(response).to redirect_to(admin_tags_path)
           expect(tag.reload.name).to eq('Foo')
         end
@@ -53,7 +53,7 @@ module Alchemy
           it "replaces tag with other tag" do
             expect(Alchemy::Tag).to receive(:replace)
             expect_any_instance_of(ActsAsTaggableOn::Tag).to receive(:destroy)
-            put :update, id: tag.id, tag: {merge_to: another_tag.id}
+            alchemy_put :update, id: tag.id, tag: {merge_to: another_tag.id}
             expect(response).to redirect_to(admin_tags_path)
           end
         end

data/spec/controllers/alchemy/api/contents_controller_spec.rb

@@ -2,16 +2,33 @@ require 'spec_helper'
 
 module Alchemy
   describe Api::ContentsController do
+    # We need to be sure, that the timestamps are always the same,
+    # while comparing json objects
+    before do
+      allow_any_instance_of(Alchemy::Content).
+        to receive(:created_at).and_return(Time.now)
+      allow_any_instance_of(Alchemy::Content).
+        to receive(:updated_at).and_return(Time.now)
+      allow_any_instance_of(Alchemy::EssenceText).
+        to receive(:created_at).and_return(Time.now)
+      allow_any_instance_of(Alchemy::EssenceText).
+        to receive(:updated_at).and_return(Time.now)
+      allow_any_instance_of(Alchemy::EssenceRichtext).
+        to receive(:created_at).and_return(Time.now)
+      allow_any_instance_of(Alchemy::EssenceRichtext).
+        to receive(:updated_at).and_return(Time.now)
+    end
+
     describe '#index' do
       let!(:page)    { create(:page) }
       let!(:element) { create(:element, page: page) }
       let!(:content) { create(:content, element: element) }
 
       it "returns all public contents as json objects" do
-        get :index, format: :json
+        alchemy_get :index, format: :json
         expect(response.status).to eq(200)
         expect(response.content_type).to eq('application/json')
-        expect(response.body).to_not eq('{"contents":[]}')
+        expect(response.body).to eq("{\"contents\":[#{ContentSerializer.new(content).to_json}]}")
       end
 
       context 'with element_id' do
@@ -19,11 +36,19 @@ module Alchemy
         let!(:other_content) { create(:content, element: other_element) }
 
         it "returns only contents from this element" do
-          get :index, element_id: element.id, format: :json
+          alchemy_get :index, element_id: other_element.id, format: :json
           expect(response.status).to eq(200)
           expect(response.content_type).to eq('application/json')
-          expect(response.body).to_not eq('{"contents":[]}')
-          expect(response.body).to_not match(/element_id\"\:#{other_element.id}/)
+          expect(response.body).to eq("{\"contents\":[#{ContentSerializer.new(other_content).to_json}]}")
+        end
+      end
+
+      context 'with empty element_id' do
+        it "returns all contents" do
+          alchemy_get :index, element_id: element.id, format: :json
+          expect(response.status).to eq(200)
+          expect(response.content_type).to eq('application/json')
+          expect(response.body).to eq("{\"contents\":[#{ContentSerializer.new(content).to_json}]}")
         end
       end
     end
@@ -38,19 +63,21 @@ module Alchemy
           expect(Content).to receive(:find).and_return(content)
         end
 
-        it "responds to json" do
-          get :show, id: content.id, format: :json
+        it "returns content as json" do
+          alchemy_get :show, id: content.id, format: :json
           expect(response.status).to eq(200)
           expect(response.content_type).to eq('application/json')
+          expect(response.body).to eq(ContentSerializer.new(content).to_json)
         end
 
         context 'requesting an restricted content' do
           let(:page) { create(:page, restricted: true) }
 
           it "responds with 403" do
-            get :show, id: content.id, format: :json
+            alchemy_get :show, id: content.id, format: :json
             expect(response.content_type).to eq('application/json')
             expect(response.status).to eq(403)
+            expect(response.body).to eq('{"error":"Not authorized"}')
           end
         end
       end
@@ -61,11 +88,19 @@ module Alchemy
         let!(:content) { create(:content, element: element) }
 
         it 'returns the named content from element with given id.' do
-          get :show, element_id: element.id, name: content.name, format: :json
+          alchemy_get :show, element_id: element.id, name: content.name, format: :json
           expect(response.status).to eq(200)
           expect(response.content_type).to eq('application/json')
-          expect(response.body).to match(/element_id\"\:#{element.id}/)
-          expect(response.body).to match(/name\"\:\"#{content.name}\"/)
+          expect(response.body).to eq(ContentSerializer.new(content).to_json)
+        end
+      end
+
+      context 'with empty element_id or name param' do
+        it 'returns 404 error.' do
+          alchemy_get :show, element_id: '', name: '', format: :json
+          expect(response.status).to eq(404)
+          expect(response.content_type).to eq('application/json')
+          expect(response.body).to eq("{\"error\":\"Record not found\"}")
         end
       end
     end

data/spec/controllers/alchemy/api/elements_controller_spec.rb

@@ -2,28 +2,46 @@ require 'spec_helper'
 
 module Alchemy
   describe Api::ElementsController do
+    # We need to be sure, that the timestamps are always the same,
+    # while comparing json objects
+    before do
+      allow_any_instance_of(Alchemy::Element).
+        to receive(:created_at).and_return(Time.now)
+      allow_any_instance_of(Alchemy::Element).
+        to receive(:updated_at).and_return(Time.now)
+    end
+
     describe '#index' do
       let!(:page)    { create(:public_page) }
       let!(:element) { create(:element, page: page) }
 
       it "returns all public elements as json objects" do
-        get :index, format: :json
+        alchemy_get :index, format: :json
         expect(response.status).to eq(200)
         expect(response.content_type).to eq('application/json')
-        expect(response.body).to_not eq('{"elements":[]}')
+        expect(response.body).to_not eq('{"elements:[]"}')
+        expect(response.body).to eq("{\"elements\":[#{ElementSerializer.new(element).to_json}]}")
       end
 
       context 'with page_id param' do
         let!(:other_page)    { create(:public_page) }
         let!(:other_element) { create(:element, page: other_page) }
 
-        it "returns only elements from this element" do
-          get :index, page_id: other_page.id, format: :json
+        it "returns only elements from this page" do
+          alchemy_get :index, page_id: other_page.id, format: :json
+          expect(response.status).to eq(200)
+          expect(response.content_type).to eq('application/json')
+          expect(response.body).to eq("{\"elements\":[#{ElementSerializer.new(other_element).to_json}]}")
+        end
+      end
+
+      context 'with empty page_id param' do
+        it "returns all elements" do
+          alchemy_get :index, page_id: '', format: :json
           expect(response.status).to eq(200)
           expect(response.content_type).to eq('application/json')
-          expect(response.body).to_not eq('{"elements":[]}')
-          expect(response.body).to match(/page_id\"\:#{other_page.id}/)
-          expect(response.body).to_not match(/page_id\"\:#{page.id}/)
+          expect(response.body).to_not eq('{"elements:[]"}')
+          expect(response.body).to eq("{\"elements\":[#{ElementSerializer.new(element).to_json}]}")
         end
       end
 
@@ -31,12 +49,20 @@ module Alchemy
         let!(:other_element) { create(:element, page: page, name: 'news') }
 
         it "returns only elements named like this." do
-          get :index, named: 'news', format: :json
+          alchemy_get :index, named: 'news', format: :json
+          expect(response.status).to eq(200)
+          expect(response.content_type).to eq('application/json')
+          expect(response.body).to eq("{\"elements\":[#{ElementSerializer.new(other_element).to_json}]}")
+        end
+      end
+
+      context 'with empty named param' do
+        it "returns all elements" do
+          alchemy_get :index, named: '', format: :json
           expect(response.status).to eq(200)
           expect(response.content_type).to eq('application/json')
-          expect(response.body).to_not eq('{"elements":[]}')
-          expect(response.body).to match(/name\"\:\"#{other_element.name}\"/)
-          expect(response.body).to_not match(/name\"\:\"#{element.name}\"/)
+          expect(response.body).to_not eq('{"elements:[]"}')
+          expect(response.body).to eq("{\"elements\":[#{ElementSerializer.new(element).to_json}]}")
         end
       end
     end
@@ -49,19 +75,21 @@ module Alchemy
         expect(Element).to receive(:find).and_return(element)
       end
 
-      it "responds to json" do
-        get :show, id: element.id, format: :json
+      it "returns element as json" do
+        alchemy_get :show, id: element.id, format: :json
         expect(response.status).to eq(200)
         expect(response.content_type).to eq('application/json')
+        expect(response.body).to eq(ElementSerializer.new(element).to_json)
       end
 
       context 'requesting an restricted element' do
         let(:page) { build_stubbed(:page, restricted: true) }
 
         it "responds with 403" do
-          get :show, id: element.id, format: :json
+          alchemy_get :show, id: element.id, format: :json
           expect(response.content_type).to eq('application/json')
           expect(response.status).to eq(403)
+          expect(response.body).to eq('{"error":"Not authorized"}')
         end
       end
     end