alchemy_cms 2.6.3 → 2.7.0

data/spec/controllers/pictures_controller_spec.rb

@@ -57,7 +57,7 @@ module Alchemy
 
       context "as registered user" do
         before do
-          sign_in :user, FactoryGirl.create(:registered_user)
+          sign_in(registered_user)
         end
 
         it "should render the picture" do

data/spec/controllers/user_sessions_controller_spec.rb

@@ -3,17 +3,18 @@ require 'spec_helper'
 module Alchemy
   describe UserSessionsController do
 
-    let(:user)         { FactoryGirl.create(:admin_user) }
-    let(:alchemy_page) { FactoryGirl.create(:page) }
+    let(:user) { FactoryGirl.build_stubbed(:admin_user) }
 
-    before { sign_in :user, user }
+    before do
+      controller.stub!(:store_user_request_time)
+      sign_in(user)
+    end
 
-    describe "signout" do
+    describe "#destroy" do
       it "should unlock all pages" do
         @request.env["devise.mapping"] = Devise.mappings[:user]
-        alchemy_page.lock(user)
+        user.should_receive(:unlock_pages!)
         delete :destroy
-        user.locked_pages.should be_empty
       end
     end
 

data/spec/controllers/users_controller_spec.rb

@@ -33,10 +33,10 @@ module Alchemy
     describe '#create' do
       before { ActionMailer::Base.deliveries = [] }
 
-      context "with send_credentials set to true" do
+      context "with send_credentials set to '1'" do
         it "should send an email notification" do
           post :create, {
-            :user => FactoryGirl.attributes_for(:admin_user).merge(send_credentials: true)
+            :user => FactoryGirl.attributes_for(:admin_user).merge(send_credentials: '1')
           }
           ActionMailer::Base.deliveries.should_not be_empty
         end

data/spec/dummy/config/alchemy/cells.yml

@@ -0,0 +1,2 @@
+- name: right_column
+  elements: [search]

data/spec/dummy/config/application.rb

@@ -1,18 +1,29 @@
 require File.expand_path('../boot', __FILE__)
 
 # Pick the frameworks you want:
-require "active_record/railtie"
-require "action_controller/railtie"
-require "action_mailer/railtie"
-require "active_resource/railtie"
-require "sprockets/railtie"
-# require "rails/test_unit/railtie"
+if ENV['FAST_SPECS']
+  require "active_record/railtie"
+  require "action_controller/railtie"
+  require "action_mailer/railtie"
+  require "active_resource/railtie"
+  require "alchemy_cms"
+else
+  require "active_record/railtie"
+  require "action_controller/railtie"
+  require "action_mailer/railtie"
+  require "active_resource/railtie"
+  require "sprockets/railtie"
+end
 
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
-  Bundler.require(*Rails.groups(:assets => %w(development test)))
+  # Bundler.require(*Rails.groups(:assets => %w(development test)))
   # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
+  if ENV['FAST_SPECS']
+    Bundler.require(:test)
+  else
+    Bundler.require(:default, :assets, Rails.env)
+  end
 end
 
 module Dummy

data/spec/dummy/db/migrate/{20130214233001_alchemy_two_point_five.rb → 20130827094554_alchemy_two_point_six.rb}

@@ -1,27 +1,30 @@
-# This is a compressed migration for creating all Alchemy 2.5 tables at once.
+# This is a compressed migration for creating all Alchemy 2.6 tables at once.
 #
 # === Notice
 #
 # In order to upgrade from an old version of Alchemy, you have to run all migrations from
 # each version you missed up to the version you want to upgrade to, before running this migration.
 #
-class AlchemyTwoPointFive < ActiveRecord::Migration
+class AlchemyTwoPointSix < ActiveRecord::Migration
   def up
     # Do not run if Alchemy tables are already present
     return if table_exists?(:alchemy_pages)
 
     create_table "alchemy_attachments", :force => true do |t|
       t.string   "name"
-      t.string   "filename"
-      t.string   "content_type"
-      t.integer  "size"
+      t.string   "file_name"
+      t.string   "file_mime_type"
+      t.integer  "file_size"
       t.integer  "creator_id"
       t.integer  "updater_id"
       t.datetime "created_at",      :null => false
       t.datetime "updated_at",      :null => false
       t.text     "cached_tag_list"
+      t.string   "file_uid"
     end
 
+    add_index "alchemy_attachments", ["file_uid"], :name => "index_alchemy_attachments_on_file_uid"
+
     create_table "alchemy_cells", :force => true do |t|
       t.integer  "page_id"
       t.string   "name"
@@ -268,7 +271,7 @@ class AlchemyTwoPointFive < ActiveRecord::Migration
       t.string   "login"
       t.string   "email"
       t.string   "gender"
-      t.string   "role",                                  :default => "registered"
+      t.string   "roles",                                 :default => "registered"
       t.string   "language"
       t.string   "encrypted_password",     :limit => 128, :default => "",           :null => false
       t.string   "password_salt",          :limit => 128, :default => "",           :null => false
@@ -291,6 +294,26 @@ class AlchemyTwoPointFive < ActiveRecord::Migration
     add_index "alchemy_users", ["email"], :name => "index_alchemy_users_on_email", :unique => true
     add_index "alchemy_users", ["login"], :name => "index_alchemy_users_on_login", :unique => true
     add_index "alchemy_users", ["reset_password_token"], :name => "index_alchemy_users_on_reset_password_token", :unique => true
+    add_index "alchemy_users", ["roles"], :name => "index_alchemy_users_on_roles"
+
+    create_table "events", :force => true 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.datetime "created_at",                                 :null => false
+      t.datetime "updated_at",                                 :null => false
+    end
+
+    create_table "locations", :force => true do |t|
+      t.string   "name"
+      t.datetime "created_at", :null => false
+      t.datetime "updated_at", :null => false
+    end
 
     create_table "taggings", :force => true do |t|
       t.integer  "tag_id"

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 => 20130328101418) do
+ActiveRecord::Schema.define(:version => 20130827094554) do
 
   create_table "alchemy_attachments", :force => true do |t|
     t.string   "name"

data/spec/fast_specs.rb

@@ -0,0 +1,15 @@
+# Include this file insted of spec_helper, if you don't need database and other slow stuff
+ENV["RAILS_ENV"] = "test"
+ENV["FAST_SPECS"] = 'true'
+
+require File.expand_path("../dummy/config/environment.rb", __FILE__)
+require "rails/test_help"
+require "rspec/rails"
+
+Rails.logger.level = 4
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+end

data/spec/helpers/admin/base_helper_spec.rb

@@ -96,54 +96,73 @@ module Alchemy
 
     end
 
-    describe '#pages_for_select' do
-
-      let(:contact_form) { FactoryGirl.create(:element, :name => 'contactform', :create_contents_after_create => true) }
-      let(:page_a) { FactoryGirl.create(:public_page, :name => 'Page A') }
-      let(:page_b) { FactoryGirl.create(:public_page, :name => 'Page B') }
-      let(:page_c) { FactoryGirl.create(:public_page, :name => 'Page C', :parent_id => page_b.id) }
-
-      before do
-        # to be shure the ordering is alphabetic
-        page_b
-        page_a
-        helper.session[:language_id] = 1
+    describe '#toolbar_button' do
+      context "with permission" do
+        before {
+          helper.stub(:permitted_to?).and_return(true)
+        }
+
+        it "renders a toolbar button" do
+          helper.toolbar_button(
+            url: admin_users_path
+          ).should match /<div.+class="button_with_label/
+        end
       end
 
-      context "with no arguments given" do
+      context "without permission" do
+        before {
+          helper.stub(:permitted_to?).and_return(false)
+        }
 
-        it "should return options for select with all pages ordered by lft" do
-          helper.pages_for_select.should match(/option.*Page B.*Page A/m)
+        it "returns empty string" do
+          helper.toolbar_button(
+            url: admin_users_path
+          ).should be_empty
         end
+      end
 
-        it "should return options for select with nested page names" do
-          page_c
-          output = helper.pages_for_select
-          output.should match(/option.*Startseite.*>&nbsp;&nbsp;Page B.*>&nbsp;&nbsp;&nbsp;&nbsp;Page C.*>&nbsp;&nbsp;Page A/m)
-        end
+      context "with disabled permission check" do
+        before {
+          helper.stub(:permitted_to?).and_return(false)
+        }
 
+        it "returns the button" do
+          helper.toolbar_button(
+            url: admin_users_path,
+            skip_permission_check: true
+          ).should match /<div.+class="button_with_label/
+        end
       end
 
-      context "with pages passed in" do
+      context "with empty permission option" do
+        before {
+          helper.stub(:permitted_to?).and_return(true)
+        }
 
-        before do
-          @pages = []
-          3.times { @pages << FactoryGirl.create(:public_page) }
+        it "returns reads the permission from url" do
+          helper.should_receive(:permission_array_from_url)
+          helper.toolbar_button(
+            url: admin_users_path,
+            if_permitted_to: ''
+          ).should_not be_empty
         end
+      end
 
-        it "should return options for select with only these pages" do
-          output = helper.pages_for_select(@pages)
-          output.should match(/#{@pages.collect(&:name).join('.*')}/m)
-          output.should_not match(/Page A/m)
-        end
+      context "with overlay option set to false" do
+        before {
+          helper.stub(:permitted_to?).and_return(true)
+          helper.should_receive(:permission_array_from_url)
+        }
 
-        it "should not nest the page names" do
-          output = helper.pages_for_select(@pages)
-          output.should_not match(/option.*&nbsp;/m)
+        it "renders a normal link" do
+          button = helper.toolbar_button(
+            url: admin_users_path,
+            overlay: false
+          )
+          button.should match /<a.+href="#{admin_users_path}"/
+          button.should_not match /data-alchemy-overlay/
         end
-
       end
-
     end
 
   end

data/spec/helpers/admin/contents_helper_spec.rb

@@ -1,27 +1,35 @@
 require 'spec_helper'
 
 describe Alchemy::Admin::ContentsHelper do
+  let(:element) { FactoryGirl.create(:element, name: 'article', create_contents_after_create: true) }
 
-  before(:each) do
-    @element = FactoryGirl.create(:element, :name => 'article', :create_contents_after_create => true)
+  it "should render a dom id" do
+    helper.content_dom_id(element.content_by_type('EssenceText')).should match(/essence_text_\d{1,}/)
   end
 
-  it "should render a dom id" do
-    helper.content_dom_id(@element.content_by_type('EssenceText')).should match(/essence_text_\d{1,}/)
+  describe '#contents_form_field_ids_string' do
+    let(:content_1) { double('Alchemy::Content', form_field_id: 'contents_content_1_body') }
+    let(:content_2) { double('Alchemy::Content', form_field_id: 'contents_content_2_body') }
+
+    it "renders a jquery selector string of form field ids from given contents" do
+      expect(
+        helper.contents_form_field_ids_string([content_1, content_2])
+      ).to eq('#contents_content_1_body, #contents_content_2_body')
+    end
   end
 
   it "should render the content name" do
-    helper.render_content_name(@element.content_by_type('EssenceText')).should == "Intro"
+    helper.render_content_name(element.content_by_type('EssenceText')).should == "Intro"
   end
 
   it "should render a link to add new content to element" do
     helper.stub!(:render_icon).and_return('')
-    helper.render_new_content_link(@element).should match(/a.+href.*admin\/elements\/#{@element.id}\/contents\/new/m)
+    helper.render_new_content_link(element).should match(/a.+href.*admin\/elements\/#{element.id}\/contents\/new/m)
   end
 
   it "should render a link to create a content in element" do
     helper.stub!(:render_icon).and_return('')
-    helper.render_create_content_link(@element, 'headline').should match(/a.+href.*admin\/contents.+class.+new_content_link.*data-method.+post/)
+    helper.render_create_content_link(element, 'headline').should match(/a.+href.*admin\/contents.+class.+new_content_link.*data-method.+post/)
   end
 
 end

data/spec/helpers/admin/elements_helper_spec.rb

@@ -1,56 +1,101 @@
 require 'spec_helper'
 
-include Alchemy::BaseHelper
+module Alchemy
 
-describe Alchemy::Admin::ElementsHelper do
+  include BaseHelper
 
-  context "partial rendering" do
+  describe Admin::ElementsHelper do
 
-    before do
-      @page = FactoryGirl.create(:public_page)
-      @element = FactoryGirl.create(:element, :page => @page, :create_contents_after_create => true)
-    end
+    context "partial rendering" do
 
-    it "should render an element editor partial" do
-      helper.render_editor(@element).should match(/class="essence_text content_editor".+id="essence_text_\d{1,}"/)
-    end
+      before do
+        @page = FactoryGirl.create(:public_page)
+        @element = FactoryGirl.create(:element, :page => @page, :create_contents_after_create => true)
+      end
+
+      it "should render an element editor partial" do
+        helper.render_editor(@element).should match(/class="essence_text content_editor".+id="essence_text_\d{1,}"/)
+      end
+
+      it "should render a picture gallery editor partial" do
+        helper.render_picture_gallery_editor(@element).should match(/class=".+picture_gallery_editor"/)
+      end
 
-    it "should render a picture gallery editor partial" do
-      helper.render_picture_gallery_editor(@element).should match(/class=".+picture_gallery_editor"/)
     end
 
-  end
+    describe "#grouped_elements_for_select" do
 
-  describe "#grouped_elements_for_select" do
+      before do
+        @page = FactoryGirl.create(:public_page)
+      end
 
-    before do
-      @page = FactoryGirl.create(:public_page)
-    end
+      before(:each) do
+        @page.stub!(:layout_description).and_return({'name' => "foo", 'cells' => ["foo_cell"]})
+        cell_descriptions = [{'name' => "foo_cell", 'elements' => ["1", "2"]}]
+        @elements = [
+          mock_model('Element', name: '1', display_name: '1'),
+          mock_model('Element', name: '2', display_name: '2')
+        ]
+        Alchemy::Cell.stub!(:definitions).and_return(cell_descriptions)
+      end
 
-    before(:each) do
-      @page.stub!(:layout_description).and_return({'name' => "foo", 'cells' => ["foo_cell"]})
-      cell_descriptions = [{'name' => "foo_cell", 'elements' => ["1", "2"]}]
-      @elements = [{'name' => '1'}, {'name' => '2'}]
-      Alchemy::Cell.stub!(:definitions).and_return(cell_descriptions)
-    end
+      it "should return string of elements grouped by cell for select_tag helper" do
+        helper.grouped_elements_for_select(@elements).should == helper.grouped_options_for_select({"Foo cell" => [["1", "1#foo_cell"], ["2", "2#foo_cell"]]})
+      end
 
-    it "should return string of elements grouped by cell for select_tag helper" do
-      helper.grouped_elements_for_select(@elements).should == helper.grouped_options_for_select({"Foo cell" => [["1", "1#foo_cell"], ["2", "2#foo_cell"]]})
-    end
+      context "with empty elements array" do
+        it "should return an empty string" do
+          helper.grouped_elements_for_select([]).should == ""
+        end
+      end
 
-    context "with empty elements array" do
-      it "should return an empty string" do
-        helper.grouped_elements_for_select([]).should == ""
+      context "with empty cell definitions" do
+        it "should return an empty string" do
+          @page.stub!(:layout_description).and_return({'name' => "foo"})
+          helper.grouped_elements_for_select(@elements).should == ""
+        end
       end
+
     end
 
-    context "with empty cell definitions" do
-      it "should return an empty string" do
-        @page.stub!(:layout_description).and_return({'name' => "foo"})
-        helper.grouped_elements_for_select(@elements).should == ""
+    describe "#elements_for_select" do
+
+      context "passing element instances" do
+        let(:element_objects) do
+          [
+            mock_model('Element', name: 'element_1', display_name: 'Element 1'),
+            mock_model('Element', name: 'element_2', display_name: 'Element 2')
+          ]
+        end
+
+        it "should return a String with html option tags" do
+          helper.should_receive(:options_for_select)
+          helper.elements_for_select(element_objects)
+        end
+      end
+
+      context "passing a hash with element descriptions" do
+        let(:element_descriptions) do
+          [{
+            'name' => 'headline',
+            'contents' => []
+          }]
+        end
+
+        subject { helper.elements_for_select(element_descriptions) }
+
+        it "should return a String with html option tags" do
+          helper.should_receive(:options_for_select)
+          subject
+        end
+
+        it "should render the elements display name" do
+          Element.should_receive(:display_name_for).with('headline')
+          subject
+        end
       end
+
     end
 
   end
-
 end