alchemy_cms 3.1.1 → 3.1.3

data/spec/dummy/spec/javascripts

@@ -0,0 +1 @@
+../../../spec/javascripts

data/spec/features/admin/page_creation_feature_spec.rb

@@ -30,8 +30,8 @@ module Alchemy
 
           it "the create page tab is visible by default" do
             within('#overlay_tabs') do
-              expect(find '#create_page_tab').to be_visible
-              expect(find '#paste_page_tab').to_not be_visible
+              expect(page).to have_selector('#create_page_tab', visible: true)
+              expect(page).to have_selector('#paste_page_tab')
             end
           end
 

data/spec/features/admin/picture_library_integration_spec.rb

@@ -1,58 +1,62 @@
 require 'spec_helper'
 
-describe "Picture Library", type: :feature, js: true do
-
+RSpec.feature "Picture Library" do
   before do
     authorize_as_admin
   end
 
   describe "Tagging" do
+    let!(:picture_1) { create(:picture, tag_list: 'tag1', name: 'TaggedWith1') }
+    let!(:picture_2) { create(:picture, tag_list: 'tag2', name: 'TaggedWith2') }
 
-    before do
-      picture = FactoryGirl.create(:picture, tag_list: 'tag1', name: 'TaggedWith1')
-      picture = FactoryGirl.create(:picture, tag_list: 'tag2', name: 'TaggedWith2')
-    end
+    scenario "it's possible to filter tags by clicking on its name in the tag list." do
+      visit alchemy.admin_pictures_path
 
-    it "it should be possible to filter tags by clicking on its name in the tag list" do
-      visit '/admin/pictures'
       click_on 'tag1 (1)'
-      expect(page).to have_content 'TaggedWith1'
-      expect(page).not_to have_content 'TaggedWith2'
+
+      expect(page).to have_content('TaggedWith1')
+      expect(page).not_to have_content('TaggedWith2')
     end
 
-    it "it should be possible to undo tag filtering by clicking on an active tag name" do
-      visit '/admin/pictures'
+    scenario "it's possible to undo tag filtering by clicking on an active tag name" do
+      visit alchemy.admin_pictures_path
+
       click_on 'tag1 (1)'
-      expect(page).not_to have_content 'TaggedWith2'
+
+      expect(page).to have_content('TaggedWith1')
+      expect(page).not_to have_content('TaggedWith2')
+
       click_on 'tag1 (1)'
-      expect(page).to have_content 'TaggedWith2'
+
+      expect(page).to have_content('TaggedWith1')
+      expect(page).to have_content('TaggedWith2')
     end
 
-    it "it should be possible to tighten the tag scope by clicking on another tag name" do
-      visit '/admin/pictures'
+    scenario "it's possible to tighten the tag scope by clicking on another tag name." do
+      visit alchemy.admin_pictures_path
+
       click_on 'tag1 (1)'
       click_on 'tag2 (1)'
-      expect(page).to have_content "You don't have any images in your archive"
-    end
 
+      expect(page).to have_content("You don't have any images in your archive")
+    end
   end
 
   describe "Filter by tag" do
+    let!(:picture) { create(:picture, tag_list: 'bla') }
 
-    before do
-      FactoryGirl.create(:picture, tag_list: 'bla')
-    end
+    scenario "lists all applied tags." do
+      visit alchemy.admin_pictures_path
 
-    it "should list all applied tags" do
-      visit '/admin/pictures'
-      expect(page).to have_content 'bla'
+      expect(page).to have_content('bla')
     end
 
-    it "should be possible to filter pictures by tag" do
-      visit '/admin/pictures'
+    scenario "it's possible to filter pictures by tag." do
+      visit alchemy.admin_pictures_path
+
       click_on 'bla (1)'
-      expect(page).to have_content 'bla'
-    end
 
+      expect(page).to have_content('bla')
+    end
   end
 end

data/spec/features/picture_security_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Picture renderung security', :js => true do
+describe 'Picture renderung security' do
 
   let(:picture) { Alchemy::Picture.create(:image_file => File.new(File.expand_path('../../fixtures/image.png', __FILE__))) }
 
@@ -23,7 +23,7 @@ describe 'Picture renderung security', :js => true do
     end
 
     it 'should return image' do
-      expect(page.body).to match(/img/)
+      expect(page.body).to match(/PNG/)
     end
 
     it 'should return status ok (200)' do

data/spec/libraries/permissions_spec.rb

@@ -251,4 +251,13 @@ describe Alchemy::Permissions do
       is_expected.to be_able_to(:manage, Alchemy::Site)
     end
   end
+
+  context "A logged in user without a role" do
+    let(:user) { mock_user([]) }
+
+    it "can only see visible not restricted pages (like the guest role)" do
+      is_expected.to be_able_to(:see, visible_page)
+      is_expected.not_to be_able_to(:see, not_visible_page)
+    end
+  end
 end

data/spec/models/dummy_model_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe 'A User-defined Essence' do
+
+  describe DummyModel do
+    it_behaves_like "an essence" do
+      let(:essence)          { DummyModel.new  }
+      let(:ingredient_value) { "Some String" }
+    end
+  end
+end

data/spec/models/page_spec.rb

@@ -55,7 +55,7 @@ module Alchemy
         end
 
         context "with url_nesting set to true" do
-          let(:other_parent) { FactoryGirl.create(:page, parent_id: Page.root.id) }
+          let(:other_parent) { FactoryGirl.create(:page, parent_id: Page.root.id, visible: true) }
 
           before do
             allow(Config).to receive(:get).and_return(true)
@@ -1333,6 +1333,18 @@ module Alchemy
           expect(contact.urlname).not_to match(/invisible/)
         end
 
+        context "with an invisible parent" do
+          before { parent.update_attribute(:visible, false) }
+
+          it "does not change if set_urlname is called" do
+            expect { page.send(:set_urlname) }.not_to change { page.urlname }
+          end
+
+          it "does not change if update_urlname! is called" do
+            expect { page.update_urlname! }.not_to change { page.urlname }
+          end
+        end
+
         context "after changing page's urlname" do
           it "updates urlnames of descendants" do
             page

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.3
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack-page_caching
@@ -97,6 +97,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -104,6 +107,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -987,6 +993,7 @@ files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/ability.rb
+- spec/dummy/app/models/dummy_model.rb
 - spec/dummy/app/models/dummy_user.rb
 - spec/dummy/app/models/event.rb
 - spec/dummy/app/models/location.rb
@@ -1031,6 +1038,7 @@ files:
 - spec/dummy/db/migrate/20140107192720_add_missing_unique_indices_to_tags_and_taggings.rb
 - spec/dummy/db/migrate/20140701160159_add_taggings_counter_cache_to_tags.rb
 - spec/dummy/db/migrate/20140701160225_add_missing_taggable_index.rb
+- spec/dummy/db/migrate/20150412103152_create_dummy_model.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/lib/assets/.gitkeep
@@ -1038,6 +1046,7 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/spec/javascripts
 - spec/features/admin/dashboard_spec.rb
 - spec/features/admin/language_tree_feature_spec.rb
 - spec/features/admin/legacy_page_url_management_spec.rb
@@ -1103,6 +1112,7 @@ files:
 - spec/models/attachment_spec.rb
 - spec/models/cell_spec.rb
 - spec/models/content_spec.rb
+- spec/models/dummy_model_spec.rb
 - spec/models/element_spec.rb
 - spec/models/essence_boolean_spec.rb
 - spec/models/essence_date_spec.rb
@@ -1218,7 +1228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails 4
@@ -1257,6 +1267,7 @@ test_files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/ability.rb
+- spec/dummy/app/models/dummy_model.rb
 - spec/dummy/app/models/dummy_user.rb
 - spec/dummy/app/models/event.rb
 - spec/dummy/app/models/location.rb
@@ -1301,6 +1312,7 @@ test_files:
 - spec/dummy/db/migrate/20140107192720_add_missing_unique_indices_to_tags_and_taggings.rb
 - spec/dummy/db/migrate/20140701160159_add_taggings_counter_cache_to_tags.rb
 - spec/dummy/db/migrate/20140701160225_add_missing_taggable_index.rb
+- spec/dummy/db/migrate/20150412103152_create_dummy_model.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/lib/assets/.gitkeep
@@ -1308,6 +1320,7 @@ test_files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/spec/javascripts
 - spec/features/admin/dashboard_spec.rb
 - spec/features/admin/language_tree_feature_spec.rb
 - spec/features/admin/legacy_page_url_management_spec.rb
@@ -1373,6 +1386,7 @@ test_files:
 - spec/models/attachment_spec.rb
 - spec/models/cell_spec.rb
 - spec/models/content_spec.rb
+- spec/models/dummy_model_spec.rb
 - spec/models/element_spec.rb
 - spec/models/essence_boolean_spec.rb
 - spec/models/essence_date_spec.rb

data/spec/dummy/db/migrate/20130827094554_alchemy_two_point_six.rb

@@ -1,397 +0,0 @@
-# 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 AlchemyTwoPointSix < ActiveRecord::Migration
-  def up
-
-    unless table_exists?('alchemy_attachments')
-      create_table "alchemy_attachments" do |t|
-        t.string   "name"
-        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"
-    end
-
-    unless table_exists?('alchemy_cells')
-      create_table "alchemy_cells" do |t|
-        t.integer  "page_id"
-        t.string   "name"
-        t.datetime "created_at", null: false
-        t.datetime "updated_at", null: false
-      end
-    end
-
-    unless table_exists?('alchemy_contents')
-      create_table "alchemy_contents" 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"
-    end
-
-    unless table_exists?('alchemy_elements')
-      create_table "alchemy_elements" 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"
-        t.text     "cached_tag_list"
-      end
-      add_index "alchemy_elements", ["page_id", "position"], name: "index_elements_on_page_id_and_position"
-    end
-
-    unless table_exists?('alchemy_elements_alchemy_pages')
-      create_table "alchemy_elements_alchemy_pages", id: false do |t|
-        t.integer "element_id"
-        t.integer "page_id"
-      end
-    end
-
-    unless table_exists?('alchemy_essence_booleans')
-      create_table "alchemy_essence_booleans" 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"
-    end
-
-    unless table_exists?('alchemy_essence_dates')
-      create_table "alchemy_essence_dates" 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
-    end
-
-    unless table_exists?('alchemy_essence_files')
-      create_table "alchemy_essence_files" 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
-    end
-
-    unless table_exists?('alchemy_essence_htmls')
-      create_table "alchemy_essence_htmls" 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
-    end
-
-    unless table_exists?('alchemy_essence_links')
-      create_table "alchemy_essence_links" do |t|
-        t.string   "link"
-        t.string   "link_title"
-        t.string   "link_target"
-        t.string   "link_class_name"
-        t.datetime "created_at", null: false
-        t.datetime "updated_at", null: false
-        t.integer  "creator_id"
-        t.integer  "updater_id"
-      end
-    end
-
-    unless table_exists?('alchemy_essence_pictures')
-      create_table "alchemy_essence_pictures" 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
-    end
-
-    unless table_exists?('alchemy_essence_richtexts')
-      create_table "alchemy_essence_richtexts" 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
-    end
-
-    unless table_exists?('alchemy_essence_selects')
-      create_table "alchemy_essence_selects" 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"
-    end
-
-    unless table_exists?('alchemy_essence_texts')
-      create_table "alchemy_essence_texts" 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
-    end
-
-    unless table_exists?('alchemy_folded_pages')
-      create_table "alchemy_folded_pages" do |t|
-        t.integer "page_id"
-        t.integer "user_id"
-        t.boolean "folded",  default: false
-      end
-    end
-
-    unless table_exists?('alchemy_languages')
-      create_table "alchemy_languages" 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
-        t.integer  "site_id"
-      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"
-      add_index "alchemy_languages", ["site_id"], name: "index_alchemy_languages_on_site_id"
-    end
-
-    unless table_exists?('alchemy_legacy_page_urls')
-      create_table "alchemy_legacy_page_urls" do |t|
-        t.string   "urlname",    null: false
-        t.integer  "page_id",    null: false
-        t.datetime "created_at", null: false
-        t.datetime "updated_at", null: false
-      end
-      add_index "alchemy_legacy_page_urls", ["urlname"], name: "index_alchemy_legacy_page_urls_on_urlname"
-    end
-
-    unless table_exists?('alchemy_pages')
-      create_table "alchemy_pages" 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"
-        t.text     "cached_tag_list"
-      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"
-    end
-
-    unless table_exists?('alchemy_pictures')
-      create_table "alchemy_pictures" do |t|
-        t.string   "name"
-        t.string   "image_file_name"
-        t.integer  "image_file_width"
-        t.integer  "image_file_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.text     "cached_tag_list"
-        t.string   "image_file_uid"
-        t.integer  "image_file_size"
-      end
-    end
-
-    unless table_exists?('alchemy_sites')
-      create_table "alchemy_sites" do |t|
-        t.string   "host"
-        t.string   "name"
-        t.datetime "created_at", null: false
-        t.datetime "updated_at", null: false
-        t.boolean  "public",     default: false
-        t.text     "aliases"
-        t.boolean  "redirect_to_primary_host"
-      end
-      add_index "alchemy_sites", ["host", "public"], name: "alchemy_sites_public_hosts_idx"
-      add_index "alchemy_sites", ["host"], name: "index_alchemy_sites_on_host"
-    end
-
-    unless table_exists?('taggings')
-      create_table "taggings" 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"
-      create_table "tags" do |t|
-        t.string "name"
-      end
-    end
-  end
-
-  def down
-    if table_exists?('alchemy_attachments')
-      drop_table "alchemy_attachments"
-    end
-
-    if table_exists?('alchemy_cells')
-      drop_table "alchemy_cells"
-    end
-
-    if table_exists?('alchemy_contents')
-      drop_table "alchemy_contents"
-    end
-
-    if table_exists?('alchemy_elements')
-      drop_table "alchemy_elements"
-    end
-
-    if table_exists?('alchemy_elements_alchemy_pages')
-      drop_table "alchemy_elements_alchemy_pages"
-    end
-
-    if table_exists?('alchemy_essence_booleans')
-      drop_table "alchemy_essence_booleans"
-    end
-
-    if table_exists?('alchemy_essence_dates')
-      drop_table "alchemy_essence_dates"
-    end
-
-    if table_exists?('alchemy_essence_files')
-      drop_table "alchemy_essence_files"
-    end
-
-    if table_exists?('alchemy_essence_htmls')
-      drop_table "alchemy_essence_htmls"
-    end
-
-    if table_exists?('alchemy_essence_links')
-      drop_table "alchemy_essence_links"
-    end
-
-    if table_exists?('alchemy_essence_pictures')
-      drop_table "alchemy_essence_pictures"
-    end
-
-    if table_exists?('alchemy_essence_richtexts')
-      drop_table "alchemy_essence_richtexts"
-    end
-
-    if table_exists?('alchemy_essence_selects')
-      drop_table "alchemy_essence_selects"
-    end
-
-    if table_exists?('alchemy_essence_texts')
-      drop_table "alchemy_essence_texts"
-    end
-
-    if table_exists?('alchemy_folded_pages')
-      drop_table "alchemy_folded_pages"
-    end
-
-    if table_exists?('alchemy_languages')
-      drop_table "alchemy_languages"
-    end
-
-    if table_exists?('alchemy_legacy_page_urls')
-      drop_table "alchemy_legacy_page_urls"
-    end
-
-    if table_exists?('alchemy_pages')
-      drop_table "alchemy_pages"
-    end
-
-    if table_exists?('alchemy_pictures')
-      drop_table "alchemy_pictures"
-    end
-
-    if table_exists?('alchemy_sites')
-      drop_table "alchemy_sites"
-    end
-
-  end
-end