alchemy_cms 2.3.2 → 2.4.beta2

data/spec/controllers/admin/trash_controller_spec.rb

@@ -64,7 +64,7 @@ module Alchemy
       context "#clear" do
 
         it "should destroy all containing elements" do
-          post :clear, {:page_id => page.id}
+          post :clear, {:page_id => page.id, :format => :js}
           Element.trashed.should be_empty
         end
 

data/spec/controllers/admin/users_controller_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Alchemy::Admin::UsersController do
+
+  describe "POST update" do
+
+    let!(:user) { FactoryGirl.create(:admin_user) }
+
+    before do
+      activate_authlogic
+      Alchemy::UserSession.create user
+    end
+
+    it "assigns user to @user" do
+      post :update, :id => user.id, :user => {}, :format => :js
+      assigns(:user).should eq(user)
+    end
+
+    context "if user is permitted to update roles" do
+      it "updates the user including role" do
+        controller.stub(:permitted_to?).with(:update_role).and_return { true }
+        Alchemy::User.any_instance.should_receive(:update_attributes).with({'role' => 'Administrator'})
+        post :update, :id => user.id, :user => {:role => 'Administrator'}, :format => :js
+      end
+    end
+
+    context "if the user is not permitted to update roles" do
+      it "updates user without role" do
+        controller.stub(:permitted_to?).with(:update_role).and_return { false }
+        Alchemy::User.any_instance.should_receive(:update_attributes).with({})
+        post :update, :id => user.id, :user => {'role' => 'Administrator'}, :format => :js
+      end
+    end
+
+  end
+end

data/spec/controllers/base_controller_spec.rb

@@ -51,13 +51,24 @@ module Alchemy
 
         context "for language that does not exist" do
 
-          it "should set the language to default" do
+          before do
             controller.stub!(:params).and_return({:lang => 'fo'})
             controller.send :set_language
+          end
+
+          it "should set the language to default" do
             controller.session[:language_id].should == default_language.id
             controller.session[:language_code].should == default_language.code
           end
 
+          it "should set the rails locale to default language code" do
+            ::I18n.locale.should == default_language.code.to_sym
+          end
+
+          it "should not set the rails locale to requested locale" do
+            ::I18n.locale.should_not == :fo
+          end
+
         end
 
       end

data/spec/controllers/elements_controller_spec.rb

@@ -6,22 +6,26 @@ module Alchemy
     let(:page)       { FactoryGirl.create(:public_page, :restricted => true) }
     let(:element)    { FactoryGirl.create(:element, :page => page, :name => 'download') }
 
-    it "should not be possible to see restricted elements" do
-      get :show, :id => element.id
-      response.status.should == 302
-      response.should redirect_to(login_path)
-    end
-
-    context "as a registered user" do
+    describe '#show' do
 
-      before do
-        activate_authlogic
-        UserSession.create(FactoryGirl.create(:registered_user))
+      it "should not return restricted elements" do
+        get :show, :id => element.id
+        response.status.should == 302
+        response.should redirect_to(login_path)
       end
 
-      it "should be possible to see restricted elements" do
-        get :show, :id => element.id
-        response.status.should == 200
+      context "for registered user" do
+
+        before do
+          activate_authlogic
+          UserSession.create(FactoryGirl.create(:registered_user))
+        end
+
+        it "should render restricted elements" do
+          get :show, :id => element.id
+          response.status.should == 200
+        end
+
       end
 
     end

data/spec/controllers/pictures_controller_spec.rb

@@ -16,7 +16,7 @@ module Alchemy
 
     context "Requesting a picture that is not assigned with any page" do
       it "should render the picture" do
-        get :show, :id => picture.id, :format => :png
+        get :show, :id => picture.id, :format => :png, :sh => picture.security_token
         response.status.should == 200
       end
     end
@@ -35,7 +35,7 @@ module Alchemy
 
       context "as guest user" do
         it "should render the picture" do
-          get :show, :id => picture.id, :format => :png
+          get :show, :id => picture.id, :format => :png, :sh => picture.security_token
           response.status.should == 200
         end
       end
@@ -53,7 +53,7 @@ module Alchemy
       context "as guest user" do
 
         it "should not render the picture, but redirect to login path" do
-          get :show, :id => picture.id
+          get :show, :id => picture.id, :sh => picture.security_token
           response.status.should == 302
           response.should redirect_to(login_path)
         end
@@ -68,7 +68,7 @@ module Alchemy
         end
 
         it "should render the picture" do
-          get :show, :id => picture.id, :format => :png
+          get :show, :id => picture.id, :format => :png, :sh => picture.security_token
           response.status.should == 200
         end
 

data/spec/dummy/config/application.rb

@@ -37,7 +37,7 @@ module Dummy
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    config.i18n.default_locale = :en
+    # config.i18n.default_locale = :de
 
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"

data/spec/dummy/db/migrate/20121026100815_alchemy_two_point_three.rb

@@ -0,0 +1,312 @@
+# This is a compressed migration for creating all Alchemy 2.3 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 AlchemyTwoPointThree < 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.integer  "creator_id"
+      t.integer  "updater_id"
+      t.datetime "created_at",   :null => false
+      t.datetime "updated_at",   :null => false
+    end
+
+    create_table "alchemy_cells", :force => true do |t|
+      t.integer  "page_id"
+      t.string   "name"
+      t.datetime "created_at", :null => false
+      t.datetime "updated_at", :null => false
+    end
+
+    create_table "alchemy_contents", :force => true do |t|
+      t.string   "name"
+      t.string   "essence_type"
+      t.integer  "essence_id"
+      t.integer  "element_id"
+      t.integer  "position"
+      t.datetime "created_at",   :null => false
+      t.datetime "updated_at",   :null => false
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+    end
+
+    add_index "alchemy_contents", ["element_id", "position"], :name => "index_contents_on_element_id_and_position"
+
+    create_table "alchemy_elements", :force => true do |t|
+      t.string   "name"
+      t.integer  "position"
+      t.integer  "page_id"
+      t.boolean  "public",     :default => true
+      t.boolean  "folded",     :default => false
+      t.boolean  "unique",     :default => false
+      t.datetime "created_at",                    :null => false
+      t.datetime "updated_at",                    :null => false
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.integer  "cell_id"
+    end
+
+    add_index "alchemy_elements", ["page_id", "position"], :name => "index_elements_on_page_id_and_position"
+
+    create_table "alchemy_elements_alchemy_pages", :id => false, :force => true do |t|
+      t.integer "element_id"
+      t.integer "page_id"
+    end
+
+    create_table "alchemy_essence_audios", :force => true do |t|
+      t.integer  "attachment_id"
+      t.integer  "width",           :default => 400
+      t.integer  "height",          :default => 300
+      t.boolean  "show_eq",         :default => true
+      t.boolean  "show_navigation", :default => true
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.datetime "created_at",                        :null => false
+      t.datetime "updated_at",                        :null => false
+    end
+
+    create_table "alchemy_essence_booleans", :force => true do |t|
+      t.boolean  "value"
+      t.datetime "created_at", :null => false
+      t.datetime "updated_at", :null => false
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+    end
+
+    add_index "alchemy_essence_booleans", ["value"], :name => "index_alchemy_essence_booleans_on_value"
+
+    create_table "alchemy_essence_dates", :force => true do |t|
+      t.datetime "date"
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.datetime "created_at", :null => false
+      t.datetime "updated_at", :null => false
+    end
+
+    create_table "alchemy_essence_files", :force => true do |t|
+      t.integer  "attachment_id"
+      t.string   "title"
+      t.string   "css_class"
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.datetime "created_at",    :null => false
+      t.datetime "updated_at",    :null => false
+    end
+
+    create_table "alchemy_essence_flashes", :force => true do |t|
+      t.integer  "attachment_id"
+      t.integer  "width",          :default => 400
+      t.integer  "height",         :default => 300
+      t.string   "player_version", :default => "9.0.28"
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.datetime "created_at",                           :null => false
+      t.datetime "updated_at",                           :null => false
+    end
+
+    create_table "alchemy_essence_htmls", :force => true do |t|
+      t.text     "source"
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.datetime "created_at", :null => false
+      t.datetime "updated_at", :null => false
+    end
+
+    create_table "alchemy_essence_pictures", :force => true do |t|
+      t.integer  "picture_id"
+      t.string   "caption"
+      t.string   "title"
+      t.string   "alt_tag"
+      t.string   "link"
+      t.string   "link_class_name"
+      t.string   "link_title"
+      t.string   "css_class"
+      t.string   "link_target"
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.datetime "created_at",      :null => false
+      t.datetime "updated_at",      :null => false
+      t.string   "crop_from"
+      t.string   "crop_size"
+      t.string   "render_size"
+    end
+
+    create_table "alchemy_essence_richtexts", :force => true do |t|
+      t.text     "body"
+      t.text     "stripped_body"
+      t.boolean  "do_not_index",  :default => false
+      t.boolean  "public"
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.datetime "created_at",                       :null => false
+      t.datetime "updated_at",                       :null => false
+    end
+
+    create_table "alchemy_essence_selects", :force => true do |t|
+      t.string   "value"
+      t.datetime "created_at", :null => false
+      t.datetime "updated_at", :null => false
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+    end
+
+    add_index "alchemy_essence_selects", ["value"], :name => "index_alchemy_essence_selects_on_value"
+
+    create_table "alchemy_essence_texts", :force => true do |t|
+      t.text     "body"
+      t.string   "link"
+      t.string   "link_title"
+      t.string   "link_class_name"
+      t.boolean  "public",          :default => false
+      t.boolean  "do_not_index",    :default => false
+      t.string   "link_target"
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.datetime "created_at",                         :null => false
+      t.datetime "updated_at",                         :null => false
+    end
+
+    create_table "alchemy_essence_videos", :force => true do |t|
+      t.integer  "attachment_id"
+      t.integer  "width"
+      t.integer  "height"
+      t.boolean  "allow_fullscreen", :default => true
+      t.boolean  "auto_play",        :default => false
+      t.boolean  "show_navigation",  :default => true
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.datetime "created_at",                          :null => false
+      t.datetime "updated_at",                          :null => false
+    end
+
+    create_table "alchemy_folded_pages", :force => true do |t|
+      t.integer "page_id"
+      t.integer "user_id"
+      t.boolean "folded",  :default => false
+    end
+
+    create_table "alchemy_languages", :force => true do |t|
+      t.string   "name"
+      t.string   "language_code"
+      t.string   "frontpage_name"
+      t.string   "page_layout",    :default => "intro"
+      t.boolean  "public",         :default => false
+      t.datetime "created_at",                          :null => false
+      t.datetime "updated_at",                          :null => false
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.boolean  "default",        :default => false
+      t.string   "country_code",   :default => "",      :null => false
+    end
+
+    add_index "alchemy_languages", ["language_code", "country_code"], :name => "index_alchemy_languages_on_language_code_and_country_code"
+    add_index "alchemy_languages", ["language_code"], :name => "index_alchemy_languages_on_language_code"
+
+    create_table "alchemy_pages", :force => true do |t|
+      t.string   "name"
+      t.string   "urlname"
+      t.string   "title"
+      t.string   "language_code"
+      t.boolean  "language_root"
+      t.string   "page_layout"
+      t.text     "meta_keywords"
+      t.text     "meta_description"
+      t.integer  "lft"
+      t.integer  "rgt"
+      t.integer  "parent_id"
+      t.integer  "depth"
+      t.boolean  "visible",          :default => false
+      t.boolean  "public",           :default => false
+      t.boolean  "locked",           :default => false
+      t.integer  "locked_by"
+      t.boolean  "restricted",       :default => false
+      t.boolean  "robot_index",      :default => true
+      t.boolean  "robot_follow",     :default => true
+      t.boolean  "sitemap",          :default => true
+      t.boolean  "layoutpage",       :default => false
+      t.datetime "created_at",                          :null => false
+      t.datetime "updated_at",                          :null => false
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.integer  "language_id"
+    end
+
+    add_index "alchemy_pages", ["language_id"], :name => "index_pages_on_language_id"
+    add_index "alchemy_pages", ["parent_id", "lft"], :name => "index_pages_on_parent_id_and_lft"
+    add_index "alchemy_pages", ["urlname"], :name => "index_pages_on_urlname"
+
+    create_table "alchemy_pictures", :force => true do |t|
+      t.string   "name"
+      t.string   "image_filename"
+      t.integer  "image_width"
+      t.integer  "image_height"
+      t.datetime "created_at",      :null => false
+      t.datetime "updated_at",      :null => false
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+      t.string   "upload_hash"
+      t.string   "cached_tag_list"
+    end
+
+    create_table "alchemy_users", :force => true do |t|
+      t.string   "firstname"
+      t.string   "lastname"
+      t.string   "login"
+      t.string   "email"
+      t.string   "gender"
+      t.string   "role",                               :default => "registered"
+      t.string   "language"
+      t.string   "crypted_password",    :limit => 128, :default => "",           :null => false
+      t.string   "password_salt",       :limit => 128, :default => "",           :null => false
+      t.integer  "login_count",                        :default => 0,            :null => false
+      t.integer  "failed_login_count",                 :default => 0,            :null => false
+      t.datetime "last_request_at"
+      t.datetime "current_login_at"
+      t.datetime "last_login_at"
+      t.string   "current_login_ip"
+      t.string   "last_login_ip"
+      t.string   "persistence_token",                                            :null => false
+      t.string   "single_access_token",                                          :null => false
+      t.string   "perishable_token",                                             :null => false
+      t.datetime "created_at",                                                   :null => false
+      t.datetime "updated_at",                                                   :null => false
+      t.integer  "creator_id"
+      t.integer  "updater_id"
+    end
+
+    add_index "alchemy_users", ["perishable_token"], :name => "index_users_on_perishable_token"
+
+    # Skip migrations for acts-as-taggable-on, if the tables are already present
+    unless table_exists?(:taggings)
+      create_table "taggings", :force => true do |t|
+        t.integer  "tag_id"
+        t.integer  "taggable_id"
+        t.string   "taggable_type"
+        t.integer  "tagger_id"
+        t.string   "tagger_type"
+        t.string   "context"
+        t.datetime "created_at"
+      end
+
+      add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
+      add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
+    end
+
+    unless table_exists?(:tags)
+      create_table "tags", :force => true do |t|
+        t.string "name"
+      end
+    end
+
+  end
+end