alchemy_cms 3.2.0.beta → 3.2.0.rc1

data/spec/dummy/app/controllers/login_controller.rb

@@ -0,0 +1,5 @@
+class LoginController < ApplicationController
+  def new
+    render text: 'Please login'
+  end
+end

data/spec/dummy/app/models/dummy_model.rb

@@ -0,0 +1,3 @@
+class DummyModel < ActiveRecord::Base
+  acts_as_essence ingredient_column: 'data'
+end

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

@@ -1,2 +1,5 @@
 - name: right_column
-  elements: [search]
+  elements: [search, text]
+
+- name: <%= 'erb_' + 'cell' %>
+  elements: [text]

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

@@ -35,6 +35,9 @@
   - name: text
     type: EssenceRichtext
 
+- name: search
+  contents: []
+
 - name: news
   contents:
   - name: date
@@ -102,3 +105,8 @@
     type: EssenceSelect
   - name: essence_text
     type: EssenceText
+
+- name: <%= 'erb_' + 'element' %>
+  contents:
+  - name: text
+    type: EssenceRichtext

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

@@ -6,7 +6,8 @@
   autogenerate: [header, article]
 
 - name: everything
-  elements: [all_you_can_eat]
+  cells: [right_column]
+  elements: [text, all_you_can_eat]
   autogenerate: [all_you_can_eat]
 
 - name: news
@@ -26,3 +27,6 @@
 - name: external
   unique: false
   redirects_to_external: true
+
+- name: <%= 'erb_' + 'layout' %>
+  unique: true

data/spec/dummy/config/routes.rb

@@ -2,12 +2,11 @@ Rails.application.routes.draw do
 
   mount JasmineRails::Engine => "/specs" if defined?(JasmineRails)
 
-  get '/404' => 'errors#status_404', :as => :status_404
+  get '/login' => 'login#new', as: 'login'
 
   namespace :admin do
     resources :events
   end
 
   mount Alchemy::Engine => "/"
-
 end

data/spec/dummy/db/migrate/20150412103152_create_dummy_model.rb

@@ -0,0 +1,7 @@
+class CreateDummyModel < ActiveRecord::Migration
+  def change
+    create_table :dummy_models do |t|
+      t.string :data
+    end
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,9 +11,9 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150122213514) do
+ActiveRecord::Schema.define(version: 20150412103152) do
 
-  create_table "alchemy_attachments", force: true do |t|
+  create_table "alchemy_attachments", force: :cascade do |t|
     t.string   "name"
     t.string   "file_name"
     t.string   "file_mime_type"
@@ -28,14 +28,14 @@ ActiveRecord::Schema.define(version: 20150122213514) do
 
   add_index "alchemy_attachments", ["file_uid"], name: "index_alchemy_attachments_on_file_uid"
 
-  create_table "alchemy_cells", force: true do |t|
+  create_table "alchemy_cells", force: :cascade 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|
+  create_table "alchemy_contents", force: :cascade do |t|
     t.string   "name"
     t.string   "essence_type"
     t.integer  "essence_id"
@@ -49,7 +49,7 @@ ActiveRecord::Schema.define(version: 20150122213514) do
 
   add_index "alchemy_contents", ["element_id", "position"], name: "index_contents_on_element_id_and_position"
 
-  create_table "alchemy_elements", force: true do |t|
+  create_table "alchemy_elements", force: :cascade do |t|
     t.string   "name"
     t.integer  "position"
     t.integer  "page_id"
@@ -66,12 +66,12 @@ ActiveRecord::Schema.define(version: 20150122213514) do
 
   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|
+  create_table "alchemy_elements_alchemy_pages", id: false, force: :cascade do |t|
     t.integer "element_id"
     t.integer "page_id"
   end
 
-  create_table "alchemy_essence_booleans", force: true do |t|
+  create_table "alchemy_essence_booleans", force: :cascade do |t|
     t.boolean  "value"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -81,7 +81,7 @@ ActiveRecord::Schema.define(version: 20150122213514) do
 
   add_index "alchemy_essence_booleans", ["value"], name: "index_alchemy_essence_booleans_on_value"
 
-  create_table "alchemy_essence_dates", force: true do |t|
+  create_table "alchemy_essence_dates", force: :cascade do |t|
     t.datetime "date"
     t.integer  "creator_id"
     t.integer  "updater_id"
@@ -89,7 +89,7 @@ ActiveRecord::Schema.define(version: 20150122213514) do
     t.datetime "updated_at", null: false
   end
 
-  create_table "alchemy_essence_files", force: true do |t|
+  create_table "alchemy_essence_files", force: :cascade do |t|
     t.integer  "attachment_id"
     t.string   "title"
     t.string   "css_class"
@@ -99,7 +99,7 @@ ActiveRecord::Schema.define(version: 20150122213514) do
     t.datetime "updated_at",    null: false
   end
 
-  create_table "alchemy_essence_htmls", force: true do |t|
+  create_table "alchemy_essence_htmls", force: :cascade do |t|
     t.text     "source"
     t.integer  "creator_id"
     t.integer  "updater_id"
@@ -107,7 +107,7 @@ ActiveRecord::Schema.define(version: 20150122213514) do
     t.datetime "updated_at", null: false
   end
 
-  create_table "alchemy_essence_links", force: true do |t|
+  create_table "alchemy_essence_links", force: :cascade do |t|
     t.string   "link"
     t.string   "link_title"
     t.string   "link_target"
@@ -118,7 +118,7 @@ ActiveRecord::Schema.define(version: 20150122213514) do
     t.integer  "updater_id"
   end
 
-  create_table "alchemy_essence_pictures", force: true do |t|
+  create_table "alchemy_essence_pictures", force: :cascade do |t|
     t.integer  "picture_id"
     t.string   "caption"
     t.string   "title"
@@ -137,7 +137,7 @@ ActiveRecord::Schema.define(version: 20150122213514) do
     t.string   "render_size"
   end
 
-  create_table "alchemy_essence_richtexts", force: true do |t|
+  create_table "alchemy_essence_richtexts", force: :cascade do |t|
     t.text     "body"
     t.text     "stripped_body"
     t.boolean  "public"
@@ -147,7 +147,7 @@ ActiveRecord::Schema.define(version: 20150122213514) do
     t.datetime "updated_at",    null: false
   end
 
-  create_table "alchemy_essence_selects", force: true do |t|
+  create_table "alchemy_essence_selects", force: :cascade do |t|
     t.string   "value"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -157,7 +157,7 @@ ActiveRecord::Schema.define(version: 20150122213514) do
 
   add_index "alchemy_essence_selects", ["value"], name: "index_alchemy_essence_selects_on_value"
 
-  create_table "alchemy_essence_texts", force: true do |t|
+  create_table "alchemy_essence_texts", force: :cascade do |t|
     t.text     "body"
     t.string   "link"
     t.string   "link_title"
@@ -170,13 +170,13 @@ ActiveRecord::Schema.define(version: 20150122213514) do
     t.datetime "updated_at",                      null: false
   end
 
-  create_table "alchemy_folded_pages", force: true do |t|
+  create_table "alchemy_folded_pages", force: :cascade do |t|
     t.integer "page_id"
     t.integer "user_id"
     t.boolean "folded",  default: false
   end
 
-  create_table "alchemy_languages", force: true do |t|
+  create_table "alchemy_languages", force: :cascade do |t|
     t.string   "name"
     t.string   "language_code"
     t.string   "frontpage_name"
@@ -195,7 +195,7 @@ ActiveRecord::Schema.define(version: 20150122213514) do
   add_index "alchemy_languages", ["language_code"], name: "index_alchemy_languages_on_language_code"
   add_index "alchemy_languages", ["site_id"], name: "index_alchemy_languages_on_site_id"
 
-  create_table "alchemy_legacy_page_urls", force: true do |t|
+  create_table "alchemy_legacy_page_urls", force: :cascade do |t|
     t.string   "urlname",    null: false
     t.integer  "page_id",    null: false
     t.datetime "created_at", null: false
@@ -204,7 +204,7 @@ ActiveRecord::Schema.define(version: 20150122213514) do
 
   add_index "alchemy_legacy_page_urls", ["urlname"], name: "index_alchemy_legacy_page_urls_on_urlname"
 
-  create_table "alchemy_pages", force: true do |t|
+  create_table "alchemy_pages", force: :cascade do |t|
     t.string   "name"
     t.string   "urlname"
     t.string   "title"
@@ -239,7 +239,7 @@ ActiveRecord::Schema.define(version: 20150122213514) do
   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|
+  create_table "alchemy_pictures", force: :cascade do |t|
     t.string   "name"
     t.string   "image_file_name"
     t.integer  "image_file_width"
@@ -254,7 +254,7 @@ ActiveRecord::Schema.define(version: 20150122213514) do
     t.integer  "image_file_size"
   end
 
-  create_table "alchemy_sites", force: true do |t|
+  create_table "alchemy_sites", force: :cascade do |t|
     t.string   "host"
     t.string   "name"
     t.datetime "created_at",                               null: false
@@ -267,14 +267,18 @@ ActiveRecord::Schema.define(version: 20150122213514) do
   add_index "alchemy_sites", ["host", "public"], name: "alchemy_sites_public_hosts_idx"
   add_index "alchemy_sites", ["host"], name: "index_alchemy_sites_on_host"
 
-  create_table "dummy_users", force: true do |t|
+  create_table "dummy_models", force: :cascade do |t|
+    t.string "data"
+  end
+
+  create_table "dummy_users", force: :cascade do |t|
     t.string "email"
     t.string "password"
   end
 
   add_index "dummy_users", ["email"], name: "index_dummy_users_on_email"
 
-  create_table "events", force: true do |t|
+  create_table "events", force: :cascade do |t|
     t.string   "name"
     t.string   "hidden_name"
     t.datetime "starts_at"
@@ -289,13 +293,13 @@ ActiveRecord::Schema.define(version: 20150122213514) do
     t.datetime "updated_at",                              null: false
   end
 
-  create_table "locations", force: true do |t|
+  create_table "locations", force: :cascade do |t|
     t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "taggings", force: true do |t|
+  create_table "taggings", force: :cascade do |t|
     t.integer  "tag_id"
     t.integer  "taggable_id"
     t.string   "taggable_type"
@@ -308,7 +312,7 @@ ActiveRecord::Schema.define(version: 20150122213514) do
   add_index "taggings", ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], name: "taggings_idx", unique: true
   add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context"
 
-  create_table "tags", force: true do |t|
+  create_table "tags", force: :cascade do |t|
     t.string  "name"
     t.integer "taggings_count", default: 0
   end

data/spec/features/admin/dashboard_spec.rb

@@ -1,11 +1,10 @@
 require 'spec_helper'
 
 describe 'Dashboard feature' do
-  let(:user) { DummyUser.new }
+  let(:user) { create(:alchemy_dummy_user, :as_admin, name: "Joe User") }
 
   before do
-    user.update_attributes(alchemy_roles: %w(admin), name: "Joe User", id: 1)
-    authorize_as_admin(user)
+    authorize_user(user)
   end
 
   describe 'Locked pages summary' do
@@ -30,11 +29,11 @@ describe 'Dashboard feature' do
     end
 
     context 'When locked by another user' do
-      it "should show locked by user's name" do
-        user = DummyUser.new
-        user.update_attributes(alchemy_roles: %w(admin), name: "Sue Smith", id: 2)
-        a_page.lock_to!(user)
-        allow(DummyUser).to receive(:find_by).and_return(user)
+      let(:other_user) { create(:alchemy_dummy_user, :as_admin, name: "Sue Smith") }
+
+      it "shows the name of the user who locked the page" do
+        a_page.lock_to!(other_user)
+        allow(user.class).to receive(:find_by).and_return(other_user)
         visit admin_dashboard_path
         locked_pages_widget = all('div[@class="widget"]').first
         expect(locked_pages_widget).to have_content "Currently locked pages:"
@@ -46,7 +45,10 @@ describe 'Dashboard feature' do
 
   describe 'Sites widget' do
     context 'with multiple sites' do
-      let!(:site) { Alchemy::Site.create!(name: 'Site', host: 'site.com') }
+
+      before do
+        Alchemy::Site.create!(name: 'Site', host: 'site.com')
+      end
 
       it "lists all sites" do
         visit admin_dashboard_path

data/spec/features/admin/language_tree_feature_spec.rb

@@ -1,18 +1,17 @@
 require 'spec_helper'
 
 describe 'Language tree feature', type: :feature, js: true do
-
   let(:klingonian) { FactoryGirl.create(:klingonian) }
-  let(:german_root) { FactoryGirl.create(:language_root_page) }
-  let(:klingonian_root) { FactoryGirl.create(:language_root_page, :name => 'Klingonian', :language => klingonian) }
 
   before do
-    german_root
-    authorize_as_admin
+    FactoryGirl.create(:language_root_page)
+    authorize_user(:as_admin)
   end
 
   context "in a multilangual environment" do
-    before { klingonian_root }
+    before do
+      FactoryGirl.create(:language_root_page, :name => 'Klingonian', :language => klingonian)
+    end
 
     it "one should be able to switch the language tree" do
       visit('/admin/pages')

data/spec/features/admin/legacy_page_url_management_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe 'Legacy page url management', type: :feature, js: true do
   before do
-    authorize_as_admin
+    authorize_user(:as_admin)
   end
 
   let!(:a_page) { create(:page) }

data/spec/features/admin/link_overlay_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "Link overlay" do
 
   before do
-    authorize_as_admin
+    authorize_user(:as_admin)
   end
 
   context "GUI" do

data/spec/features/admin/locale_select_feature_spec.rb

@@ -4,7 +4,7 @@ describe 'Locale select' do
   let(:a_page) { FactoryGirl.create(:public_page) }
   before do
     allow(Alchemy::I18n).to receive(:translation_files).and_return ['alchemy.kl.yml', 'alchemy.jp.yml', 'alchemy.cz.yml']
-    authorize_as_admin
+    authorize_user(:as_admin)
   end
 
   it "contains all locales in a selectbox" do

data/spec/features/admin/modules_integration_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "Modules" do
   context "A custom module with a main-apps controller" do
-    before { authorize_as_admin }
+    before { authorize_user(:as_admin) }
 
     it "should have a button in main_navigation, pointing to the configured controller" do
       Alchemy::Modules.register_module(

data/spec/features/admin/navigation_feature_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'Admin navigation feature' do
 
   context 'admin users' do
-    before { authorize_as_admin }
+    before { authorize_user(:as_admin) }
 
     it "can leave the admin area" do
       visit ('/admin/leave')

data/spec/features/admin/page_creation_feature_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Alchemy
   describe "Page creation" do
-    before { authorize_as_admin }
+    before { authorize_user(:as_admin) }
 
     describe "overlay GUI" do
       context "without having a Page in the clipboard" do

data/spec/features/admin/page_editing_feature_spec.rb

@@ -4,7 +4,7 @@ describe 'Page editing feature' do
   let(:a_page) { create(:page) }
 
   context 'as author' do
-    before { authorize_as_admin(build(:author_user)) }
+    before { authorize_user(:as_author) }
 
     it 'cannot publish page.' do
       visit alchemy.edit_admin_page_path(a_page)
@@ -13,7 +13,7 @@ describe 'Page editing feature' do
   end
 
   context 'as editor' do
-    before { authorize_as_admin(build(:editor_user)) }
+    before { authorize_user(:as_editor) }
 
     it 'can publish page.' do
       visit alchemy.edit_admin_page_path(a_page)
@@ -34,7 +34,7 @@ describe 'Page editing feature' do
   context 'as admin' do
     let(:a_page) { create(:public_page, visible: true) }
 
-    before { authorize_as_admin }
+    before { authorize_user(:as_admin) }
 
     context "in configure overlay" do
       context "when editing a normal page" do