alchemy_cms 2.3.2 → 2.4.beta2

data/spec/dummy/db/migrate/20121026104128_create_events.rb

@@ -0,0 +1,19 @@
+class CreateEvents < ActiveRecord::Migration
+
+  def change
+    create_table "events" do |t|
+      t.string   "name"
+      t.string   "hidden_name"
+      t.datetime "starts_at"
+      t.datetime "ends_at"
+      t.text     "description"
+      t.decimal  "entrance_fee", :precision => 6, :scale => 2
+      t.boolean  "published"
+      t.integer  "location_id"
+      t.integer  "organizer_id"
+      t.datetime "created_at",                                 :null => false
+      t.datetime "updated_at",                                 :null => false
+    end
+  end
+
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120831135441) do
+ActiveRecord::Schema.define(:version => 20121026104128) do
 
   create_table "alchemy_attachments", :force => true do |t|
     t.string   "name"

data/spec/factories.rb

@@ -5,7 +5,6 @@ FactoryGirl.define do
     login "jdoe"
     password 's3cr3t'
     password_confirmation 's3cr3t'
-    language 'en'
 
     factory :admin_user do
       role "admin"

data/spec/helpers/base_helper_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+module Alchemy
+  describe BaseHelper do
+
+    describe "#render_message" do
+
+      context "if no argument is passed" do
+        it "should render a div with an info icon and the given content" do
+          helper.render_message{ content_tag(:p, "my notice") }.should match(/<div class="info message"><span class="icon info"><\/span><p>my notice/)
+        end
+      end
+
+      context "if an argument is passed" do
+        it "should render the passed argument as the css classname for the icon container" do
+          helper.render_message(:error){ content_tag(:p, "my notice") }.should match(/<div class="error message"><span class="icon error">/)
+        end
+      end
+
+    end
+
+    describe "#configuration" do
+      it "should return certain configuration options" do
+        Config.stub!(:show).and_return({"some_option" => true})
+        helper.configuration(:some_option).should == true
+      end
+    end
+
+    describe "#multi_language?" do
+
+      context "if more than one published language exists" do
+        it "should return true" do
+          Alchemy::Language.stub_chain(:published, :count).and_return(2)
+          helper.multi_language?.should == true
+        end
+      end
+
+      context "if less than two published languages exists" do
+        it "should return false" do
+          Alchemy::Language.stub_chain(:published, :count).and_return(1)
+          helper.multi_language?.should == false
+        end
+      end
+
+    end
+
+  end
+end

data/spec/helpers/elements_helper_spec.rb

@@ -128,10 +128,21 @@ describe Alchemy::ElementsHelper do
     end
 
     context "with option fallback" do
+      before do
+        @another_page = FactoryGirl.create(:public_page, :name => 'Another Page', :page_layout => 'news')
+        @another_element_1 = FactoryGirl.create(:element, :page => @another_page, :name => 'news')
+      end
+
       it "should render the fallback element, when no element with the given name is found" do
-        @page.elements.delete_all
-        @another_element_1 = FactoryGirl.create(:element, :page => @page)
-        helper.render_elements(:fallback => {:for => 'foo', :with => @another_element_1.name, :from => @page.page_layout}).should match(/id="#{@another_element_1.name}_#{@another_element_1.id}"/)
+        helper.render_elements(
+          :fallback => {:for => 'higgs', :with => 'news', :from => 'news'}
+        ).should match(/id="news_#{@another_element_1.id}"/)
+      end
+
+      it "should also take a page object as fallback from" do
+        helper.render_elements(
+          :fallback => {:for => 'higgs', :with => 'news', :from => @another_page}
+        ).should match(/id="news_#{@another_element_1.id}"/)
       end
     end
 

data/spec/helpers/url_helper_spec.rb

@@ -123,12 +123,12 @@ module Alchemy
 
     describe 'picture path helpers' do
 
-      let(:picture) { mock_model(Picture, :urlname => 'cute_kitten', :id => 42) }
+      let(:picture) { stub_model(Picture, :urlname => 'cute_kitten', :id => 42) }
 
       describe '#show_alchemy_picture_path' do
 
         it "should return the correct relative path string" do
-          helper.show_alchemy_picture_path(picture).should == "/alchemy/pictures/42/show/cute_kitten.jpg"
+          helper.show_alchemy_picture_path(picture).should =~ Regexp.new("/alchemy/pictures/42/show/cute_kitten.jpg")
         end
 
       end
@@ -136,7 +136,7 @@ module Alchemy
       describe '#show_alchemy_picture_url' do
 
         it "should return the correct url string" do
-          helper.show_alchemy_picture_url(picture).should == "http://#{helper.request.host}/alchemy/pictures/42/show/cute_kitten.jpg"
+          helper.show_alchemy_picture_url(picture).should =~ Regexp.new("http://#{helper.request.host}/alchemy/pictures/42/show/cute_kitten.jpg")
         end
 
       end
@@ -147,6 +147,11 @@ module Alchemy
           helper.show_picture_path_params(picture).should include(:name => 'cute_kitten', :format => 'jpg')
         end
 
+        it "should include the secure hash parameter" do
+          helper.show_picture_path_params(picture).keys.should include(:sh)
+          helper.show_picture_path_params(picture)[:sh].should_not be_empty
+        end
+
         context "with additional params" do
 
           it "should include these params" do

data/spec/integration/picture_security_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe 'Picture renderung security', :js => true do
+
+  let(:picture) { Alchemy::Picture.create(:image_file => File.new(File.expand_path('../../support/image.png', __FILE__))) }
+
+  # Prevent the signup view from being rendered.
+  before { Alchemy::User.stub!(:count).and_return 1 }
+
+  context "passing no security token" do
+
+    it 'should return a bad request (400)' do
+      visit "/alchemy/pictures/#{picture.id}/show/image.png"
+      page.status_code.should == 400
+    end
+
+  end
+
+  context "passing correct security token" do
+
+    before do
+      visit "/alchemy/pictures/#{picture.id}/show/image.png?sh=#{picture.security_token}"
+    end
+
+    it 'should return image' do
+      page.body.should match(/img/)
+    end
+
+    it 'should return status ok (200)' do
+      page.status_code.should == 200
+    end
+
+  end
+
+end

data/spec/integration/translation_integration_spec.rb

@@ -4,34 +4,33 @@ describe "Translation integration" do
 
   context "in admin backend" do
 
-    it "should be possible to set the locale of the admin backend via params" do
+    before do
       authorize_as_admin
+    end
+
+    it "should be possible to set the locale of the admin backend via params" do
       visit admin_dashboard_path(:locale => :de)
       page.should have_content('Willkommen')
     end
 
     it "should store the current locale in the session" do
-      authorize_as_admin
       visit admin_dashboard_path(:locale => :de)
       visit admin_dashboard_path
       page.should have_content('Willkommen')
     end
 
     it "should be possible to change the current locale in the session" do
-      authorize_as_admin
       visit admin_dashboard_path(:locale => :de)
       visit admin_dashboard_path(:locale => :en)
       page.should have_content('Welcome')
     end
 
     it "should not be possible to switch the locale of the admin backend to an unknown locale" do
-      authorize_as_admin
       visit admin_dashboard_path(:locale => :ko)
       page.should have_content('Welcome')
     end
 
     it "should use the current users language setting if no other parameter is given" do
-      authorize_as_admin(locale = nil)
       Alchemy::User.first.update_attributes(:language => :de)
       visit admin_dashboard_path
       page.should have_content('Willkommen')
@@ -42,6 +41,8 @@ describe "Translation integration" do
   context "with translated header" do
 
     before do
+      # Hack my hack.... OMG
+      Rails.stub(:env).and_return('foo')
       Capybara.current_driver = :rack_test_translated_header
     end
 

data/spec/models/element_spec.rb

@@ -6,26 +6,26 @@ module Alchemy
     describe '#new_from_scratch' do
 
       it "should initialize an element by name from scratch" do
-        el = Element.new_from_scratch({'name' => 'article'})
+        el = Element.new_from_scratch({:name => 'article'})
         el.should be_valid
       end
 
       it "should raise an error if the given name is not defined in the elements.yml" do
-        expect { Element.new_from_scratch({'name' => 'foobar'}) }.to raise_error
+        expect { Element.new_from_scratch({:name => 'foobar'}) }.to raise_error
       end
 
       it "should take the first part of an given name containing a hash (#)" do
-        el = Element.new_from_scratch({'name' => 'article#header'})
+        el = Element.new_from_scratch({:name => 'article#header'})
         el.name.should == "article"
       end
 
       it "should merge given attributes into defined ones" do
-        el = Element.new_from_scratch({'name' => 'article', 'page_id' => 1})
+        el = Element.new_from_scratch({:name => 'article', :page_id => 1})
         el.page_id.should == 1
       end
 
       it "should not have forbidden attributes from definition" do
-        el = Element.new_from_scratch({'name' => 'article'})
+        el = Element.new_from_scratch({:name => 'article'})
         el.contents.should == []
       end
 

data/spec/models/page_layout_spec.rb

@@ -3,28 +3,22 @@ require 'spec_helper'
 module Alchemy
   describe PageLayout do
 
-    context "method get_layouts" do
+    describe ".all" do
 
-      it "should generally return page_layouts, nothing else!" do
-        PageLayout.read_layouts_file.should be_instance_of(Array)
+      it "should return all page_layouts" do
+        layouts = PageLayout.all
+        layouts.should be_instance_of(Array)
+        layouts.collect { |l| l['name'] }.should include('standard')
       end
 
     end
 
-    context "with custom page layouts" do
+    describe '.layouts_with_own_for_select' do
 
-      it "should return the users page_layouts if exists in the application" do
-        @config_path = Rails.root.join("config/alchemy")
-        FileUtils.mv(File.join(@config_path, 'page_layouts.yml'), File.join(@config_path, 'page_layouts.bak'))
-        layouts_file = File.join(@config_path, 'page_layouts.yml')
-        File.open(layouts_file, 'w') do |page_layouts|
-          page_layouts.puts "- name: testlayout\n  elements:"
-        end
-        PageLayout.read_layouts_file.first.values.should include("testlayout")
-      end
-
-      after(:each) do
-        FileUtils.mv(File.join(@config_path, 'page_layouts.bak'), File.join(@config_path, 'page_layouts.yml'))
+      it "should not hold a layout twice" do
+        layouts = PageLayout.layouts_with_own_for_select('standard', 1, false)
+        layouts = layouts.collect(&:last)
+        layouts.select { |l| l == "standard" }.length.should == 1
       end
 
     end

data/spec/models/page_spec.rb

@@ -252,10 +252,10 @@ module Alchemy
       end
     end
 
-    context ".accessible" do
+    context ".not_restricted" do
       it "should return 2 accessible pages" do
         FactoryGirl.create(:public_page, :name => 'First Public Child', :restricted => true, :parent_id => language_root.id, :language => language)
-        Page.accessible.should have(2).pages
+        Page.not_restricted.should have(2).pages
       end
     end
 
@@ -445,6 +445,12 @@ module Alchemy
           @page.elements.should_not be_empty
         end
 
+        it "should not autogenerate elements that are already on the page" do
+          @page.elements << FactoryGirl.create(:element, :name => 'header')
+          @page.save
+          @page.elements.select { |e| e.name == 'header' }.length.should == 1
+        end
+
         context "with cells" do
 
           before do
@@ -531,6 +537,23 @@ module Alchemy
 
       end
 
+      context "after changing the page layout" do
+
+        let(:news_element) { FactoryGirl.create(:element, :name => 'news') }
+
+        it "all elements not allowed on this page should be trashed" do
+          news_page.elements << news_element
+          news_page.update_attributes :page_layout => 'standard'
+          news_page.elements.trashed.should include(news_element)
+        end
+
+        it "should autogenerate elements" do
+          news_page.update_attributes :page_layout => 'standard'
+          news_page.elements.available.collect(&:name).should include('header')
+        end
+
+      end
+
     end
 
     describe '#fold' do

data/spec/models/picture_spec.rb

@@ -61,7 +61,29 @@ module Alchemy
 
     end
 
-    describe '#self.last_upload' do
+    describe '#security_token' do
+
+      before do
+        @pic = stub_model(Picture, :id => 1)
+      end
+
+      it "should return a sha1 hash" do
+        @pic.security_token.should match(/\b([a-f0-9]{16})\b/)
+      end
+
+      it "should return a 16 chars long hash" do
+        @pic.security_token.length == 16
+      end
+
+      it "should convert crop true value into string" do
+        p = [@pic.id, nil, 'crop', nil, nil, Rails.configuration.secret_token].join('-')
+        digest = Digest::SHA1.hexdigest(p)[0..15]
+        @pic.security_token(:crop => true).should == digest
+      end
+
+    end
+
+    describe '.last_upload' do
 
       it "should return all pictures that have the same upload-hash as the most recent picture" do
         other_upload = Picture.create!(:image_file => image_file, :upload_hash => '456')
@@ -77,7 +99,7 @@ module Alchemy
 
     end
 
-    describe '#self.recent' do
+    describe '.recent' do
 
       before(:all) do
         now = Time.now

data/spec/routing_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "The Routing", :type => :routing do
 
-  before { @routes = Alchemy::Engine.routes }
+  before(:each) { @routes = Alchemy::Engine.routes }
 
   context "for downloads" do
 
@@ -10,44 +10,44 @@ describe "The Routing", :type => :routing do
       {
         :get => "/attachment/32/download/Presseveranstaltung.pdf"
       }.should route_to(
-        :controller => "alchemy/attachments",
-        :action => "download",
-        :id => "32",
-        :name => "Presseveranstaltung",
-        :format => "pdf"
-      )
+                 :controller => "alchemy/attachments",
+                 :action => "download",
+                 :id => "32",
+                 :name => "Presseveranstaltung",
+                 :format => "pdf"
+               )
     end
 
     it "should have a route for legacy Alchemy 1.x downloads" do
       {
         :get => "/attachment/32/download?name=Presseveranstaltung.pdf"
       }.should route_to(
-        :controller => "alchemy/attachments",
-        :action => "download",
-        :id => "32"
-      )
+                 :controller => "alchemy/attachments",
+                 :action => "download",
+                 :id => "32"
+               )
     end
 
     it "should have a route for legacy washAPP downloads" do
       {
         :get => "/wa_files/download/11"
       }.should route_to(
-        :controller => "alchemy/attachments",
-        :action => "download",
-        :id => "11"
-      )
+                 :controller => "alchemy/attachments",
+                 :action => "download",
+                 :id => "11"
+               )
     end
 
     it "should have a route for legacy WebMate downloads" do
       {
         :get => "/uploads/files/0000/0028/Pressetext.pdf"
       }.should route_to(
-        :controller => "alchemy/attachments",
-        :action => "download",
-        :id => "0028",
-        :name => "Pressetext",
-        :suffix => "pdf"
-      )
+                 :controller => "alchemy/attachments",
+                 :action => "download",
+                 :id => "0028",
+                 :name => "Pressetext",
+                 :suffix => "pdf"
+               )
     end
 
   end
@@ -60,11 +60,11 @@ describe "The Routing", :type => :routing do
         {
           :get => "/products/my-product"
         }.should route_to(
-          :controller => "alchemy/pages",
-          :action => "show",
-          :level1 => "products",
-          :urlname => "my-product"
-        )
+                   :controller => "alchemy/pages",
+                   :action => "show",
+                   :level1 => "products",
+                   :urlname => "my-product"
+                 )
       end
 
       context "and language" do
@@ -73,12 +73,12 @@ describe "The Routing", :type => :routing do
           {
             :get => "/de/products/my-product"
           }.should route_to(
-            :controller => "alchemy/pages",
-            :action => "show",
-            :level1 => "products",
-            :urlname => "my-product",
-            :lang => "de"
-          )
+                     :controller => "alchemy/pages",
+                     :action => "show",
+                     :level1 => "products",
+                     :urlname => "my-product",
+                     :lang => "de"
+                   )
         end
 
       end
@@ -91,12 +91,12 @@ describe "The Routing", :type => :routing do
         {
           :get => "/catalog/products/my-product"
         }.should route_to(
-          :controller => "alchemy/pages",
-          :action => "show",
-          :level1 => "catalog",
-          :level2 => "products",
-          :urlname => "my-product"
-        )
+                   :controller => "alchemy/pages",
+                   :action => "show",
+                   :level1 => "catalog",
+                   :level2 => "products",
+                   :urlname => "my-product"
+                 )
       end
 
       context "and language" do
@@ -105,13 +105,13 @@ describe "The Routing", :type => :routing do
           {
             :get => "/de/catalog/products/my-product"
           }.should route_to(
-            :controller => "alchemy/pages",
-            :action => "show",
-            :level1 => "catalog",
-            :level2 => "products",
-            :urlname => "my-product",
-            :lang => "de"
-          )
+                     :controller => "alchemy/pages",
+                     :action => "show",
+                     :level1 => "catalog",
+                     :level2 => "products",
+                     :urlname => "my-product",
+                     :lang => "de"
+                   )
         end
 
       end
@@ -124,13 +124,13 @@ describe "The Routing", :type => :routing do
         {
           :get => "/2011/12/08/my-post"
         }.should route_to(
-          :controller => "alchemy/pages",
-          :action => "show",
-          :level1 => "2011",
-          :level2 => "12",
-          :level3 => "08",
-          :urlname => "my-post"
-        )
+                   :controller => "alchemy/pages",
+                   :action => "show",
+                   :level1 => "2011",
+                   :level2 => "12",
+                   :level3 => "08",
+                   :urlname => "my-post"
+                 )
       end
 
       context "and language" do
@@ -139,14 +139,14 @@ describe "The Routing", :type => :routing do
           {
             :get => "/de/2011/12/08/my-post"
           }.should route_to(
-            :controller => "alchemy/pages",
-            :action => "show",
-            :level1 => "2011",
-            :level2 => "12",
-            :level3 => "08",
-            :urlname => "my-post",
-            :lang => "de"
-          )
+                     :controller => "alchemy/pages",
+                     :action => "show",
+                     :level1 => "2011",
+                     :level2 => "12",
+                     :level3 => "08",
+                     :urlname => "my-post",
+                     :lang => "de"
+                   )
         end
 
       end
@@ -161,97 +161,97 @@ describe "The Routing", :type => :routing do
       {
         :get => "/pictures/3/show/900x300/kitten.jpg"
       }.should route_to(
-        :controller => "alchemy/pictures",
-        :action => "show",
-        :id => "3",
-        :size => "900x300",
-        :name => "kitten",
-        :format => "jpg"
-      )
+                 :controller => "alchemy/pictures",
+                 :action => "show",
+                 :id => "3",
+                 :size => "900x300",
+                 :name => "kitten",
+                 :format => "jpg"
+               )
     end
 
     it "should route to cropped show action" do
       {
         :get => "/pictures/3/show/900x300/crop/kitten.jpg"
       }.should route_to(
-        :controller => "alchemy/pictures",
-        :action => "show",
-        :id => "3",
-        :size => "900x300",
-        :crop => "crop",
-        :name => "kitten",
-        :format => "jpg"
-      )
+                 :controller => "alchemy/pictures",
+                 :action => "show",
+                 :id => "3",
+                 :size => "900x300",
+                 :crop => "crop",
+                 :name => "kitten",
+                 :format => "jpg"
+               )
     end
 
     it "should route to cropped mask show action" do
       get(
         "/pictures/3/show/300x300/crop/200x50/100x100/kitten.jpg"
       ).should route_to(
-        :controller => "alchemy/pictures",
-        :action => "show",
-        :id => "3",
-        :size => "300x300",
-        :crop => "crop",
-        :crop_from => "200x50",
-        :crop_size => "100x100",
-        :name => "kitten",
-        :format => "jpg"
-      )
+                 :controller => "alchemy/pictures",
+                 :action => "show",
+                 :id => "3",
+                 :size => "300x300",
+                 :crop => "crop",
+                 :crop_from => "200x50",
+                 :crop_size => "100x100",
+                 :name => "kitten",
+                 :format => "jpg"
+               )
     end
 
     it "should route to thumbnail action" do
       get(
         "/pictures/3/thumbnails/small/kitten.jpg"
       ).should route_to(
-        :controller => "alchemy/pictures",
-        :action => "thumbnail",
-        :id => "3",
-        :size => "small",
-        :name => "kitten",
-        :format => "jpg"
-      )
+                 :controller => "alchemy/pictures",
+                 :action => "thumbnail",
+                 :id => "3",
+                 :size => "small",
+                 :name => "kitten",
+                 :format => "jpg"
+               )
     end
 
     it "should route to cropped thumbnail action" do
       get(
         "/pictures/3/thumbnails/small/crop/kitten.jpg"
       ).should route_to(
-        :controller => "alchemy/pictures",
-        :action => "thumbnail",
-        :id => "3",
-        :crop => "crop",
-        :size => "small",
-        :name => "kitten",
-        :format => "jpg"
-      )
+                 :controller => "alchemy/pictures",
+                 :action => "thumbnail",
+                 :id => "3",
+                 :crop => "crop",
+                 :size => "small",
+                 :name => "kitten",
+                 :format => "jpg"
+               )
     end
 
     it "should route to cropped and masked thumbnail" do
       get(
         "/pictures/3/thumbnails/small/0x0/200x200/kitten.jpg"
       ).should route_to(
-        :controller => "alchemy/pictures",
-        :action => "thumbnail",
-        :id => "3",
-        :crop_from => "0x0",
-        :crop_size => "200x200",
-        :size => "small",
-        :name => "kitten",
-        :format => "jpg"
-      )
+                 :controller => "alchemy/pictures",
+                 :action => "thumbnail",
+                 :id => "3",
+                 :crop_from => "0x0",
+                 :crop_size => "200x200",
+                 :size => "small",
+                 :name => "kitten",
+                 :format => "jpg"
+               )
     end
 
     it "should route to zoomed picture" do
       get(
         "/pictures/3/zoom/kitten.jpg"
       ).should route_to(
-        :controller => "alchemy/pictures",
-        :action => "zoom",
-        :id => "3",
-        :name => "kitten",
-        :format => "jpg"
-      )
+                 :controller => "alchemy/pictures",
+                 :action => "zoom",
+                 :id => "3",
+                 :name => "kitten",
+                 :format => "jpg"
+               )
     end
 
   end