alchemy_cms 2.7.3 → 2.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c1712ce9ba3131c3371c70272b7db7d6c4c1841
-  data.tar.gz: 5c448ca386ced2c678073043337dd5bc9c07ca75
+  metadata.gz: ec39e6f9f8433170bdf6cfa12566eded64cc8970
+  data.tar.gz: 79ae67d762d97a743c584a0bd5e1d2df47ff56a0
 SHA512:
-  metadata.gz: ccf13a66d86c853cde47712863466b0652adebd807c917b1b5c0f2709eb92e467f0b1fdf23d6e2e3d89c7a8cb697628c7341adfa47f2d88991060e6073b8fe05
-  data.tar.gz: 7356a7ee68fef0e7c8c8344fc7e8ed3c1ee252631bda7604f586017f7e8a13455df55cdaecb38a451b91f578a3dc41710cb68c34023976961a187a91f04c0956
+  metadata.gz: 36f7ce8de540fdb2d2830be679ac0215e6d16115342653ad83cb8ae84a0589d3b78b3e46d01ad3da7c413bb6cd4a78d6d326402a4e2001e57515510c7e6ba304
+  data.tar.gz: 3c1d7a9aab4b031126c5113deb889d7f7c12ac54e2d22e422bb0761bb7538f914a7b7983df534bb0ed454d4b9f460e518dfb24ca70a548e2da0639bbb721ae4d

data/Gemfile

@@ -14,6 +14,8 @@ gem 'sqlite3'               if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
 gem 'mysql2'                if ENV['DB'] == 'mysql'
 gem 'pg'                    if ENV['DB'] == 'postgresql'
 
+gem 'database_cleaner'
+
 unless ENV['CI']
   gem 'pry'
   gem 'quiet_assets' # Mute assets loggin
@@ -23,7 +25,6 @@ end
 group :test do
   unless ENV['FAST_SPECS']
     gem 'poltergeist'
-    gem 'connection_pool' # https://gist.github.com/mperham/3049152
     unless ENV['CI']
       gem 'launchy'
     end

data/app/views/alchemy/admin/elements/trash.js.erb

@@ -6,7 +6,7 @@ $('#element_<%= @element.id %>').hide(200, function() {
   $('#element_trash_button .icon').addClass('full');
   Alchemy.PreviewWindow.refresh();
   <% @element.contents.essence_richtexts.each do |content| %>
-  tinymce.get('contents_content_<%= content.id %>_body').remove();
+    tinymce.get('tinymce_<%= content.id %>').remove();
   <% end %>
   <%= update_essence_select_elements(@page, @element) -%>
 });

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  VERSION = "2.7.3"
+  VERSION = "2.7.4"
 
   def self.version
     VERSION

data/spec/features/admin/element_create_feature_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe 'element create feature', js: true do
+  let(:a_page) { FactoryGirl.create(:page) }
+
+  before do
+    authorize_as_admin
+    visit edit_admin_page_path(a_page)
+    expect(page).to have_no_selector('.alchemy-elements-window .element_editor')
+  end
+
+  it "adds a new element to the list" do
+    create_element!
+    expect(page).to have_no_selector(".spinner") # wait until spinner disappears
+    expect(page).to have_selector(".element_editor", count: 1)
+  end
+end
+

data/spec/features/admin/element_trash_feature_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe "element trash feature", js: true do
+  let(:a_page) { FactoryGirl.create(:page) }
+
+  before do
+    authorize_as_admin
+    visit edit_admin_page_path(a_page)
+    create_element! # We want to trash an article element later because it contains a richtext essence
+    expect(page).to have_no_selector(".spinner") # wait until spinner disappears
+  end
+
+  it "removes an element from the list" do
+    expect(page).to have_selector(".element_editor", count: 1)
+    within ".alchemy-elements-window .element_editor:first" do
+      click_link Alchemy::I18n.t("trash element")
+    end
+    expect(page).to have_content Alchemy::I18n.t('Element trashed')
+    expect(page).to have_no_selector(".element_editor")
+  end
+end

data/spec/spec_helper.rb

@@ -33,6 +33,11 @@ Capybara.default_selector = :css
 Capybara.register_driver(:rack_test_translated_header) do |app|
   Capybara::RackTest::Driver.new(app, :headers => { 'HTTP_ACCEPT_LANGUAGE' => 'de' })
 end
+if ENV['CI']
+  Capybara.register_driver :poltergeist do |app|
+    Capybara::Poltergeist::Driver.new(app, timeout: 60)
+  end
+end
 Capybara.javascript_driver = :poltergeist
 
 # Load support files
@@ -48,15 +53,32 @@ RSpec.configure do |config|
   config.include Devise::TestHelpers, :type => :controller
   config.include Alchemy::Specs::ControllerHelpers, :type => :controller
   config.include Alchemy::Specs::IntegrationHelpers, :type => :feature
-  config.use_transactional_fixtures = true
-  # Make sure the database is clean and ready for test
+  config.use_transactional_fixtures = false
+
   config.before(:suite) do
-    truncate_all_tables
+    DatabaseCleaner.clean_with(:truncation)
     Alchemy::Seeder.seed!
   end
-  # Ensuring that the locale is always resetted to :en before running any tests
+
+  # All specs are running in transactions, but feature specs not.
   config.before(:each) do
     Alchemy::Site.current = nil
     ::I18n.locale = :en
+    if example.metadata[:type] == :feature
+      DatabaseCleaner.strategy = :truncation
+    else
+      DatabaseCleaner.strategy = :transaction
+    end
+    DatabaseCleaner.start
+  end
+
+  # After each spec the database gets cleaned. (via rollback or truncate for feature specs)
+  # After every feature spec the database gets seeded so the next spec can rely on that data.
+  config.append_after(:each) do
+    DatabaseCleaner.clean
+    if example.metadata[:type] == :feature
+      Alchemy::Seeder.stub(:puts)
+      Alchemy::Seeder.seed!
+    end
   end
 end

data/spec/support/alchemy/integration_helpers.rb

@@ -60,6 +60,20 @@ module Alchemy
         FactoryGirl.create(:admin_user)
       end
 
+      # Capybara actions to create a new element.
+      #
+      # You can pass the name of the desired element, or just use the default "Article".
+      #
+      def create_element!(name = 'Article')
+        within '.alchemy-elements-window' do
+          click_link Alchemy::I18n.t('New Element')
+        end
+        within '.new_alchemy_element' do
+          select(name, from: 'element[name]')
+          click_button 'Add'
+        end
+      end
+
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.7.3
+  version: 2.7.4
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -917,6 +917,8 @@ files:
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
 - spec/fast_specs.rb
+- spec/features/admin/element_create_feature_spec.rb
+- spec/features/admin/element_trash_feature_spec.rb
 - spec/features/admin/link_overlay_spec.rb
 - spec/features/admin/modules_integration_spec.rb
 - spec/features/admin/pages_controller_spec.rb
@@ -988,7 +990,6 @@ files:
 - spec/support/alchemy/controller_hacks.rb
 - spec/support/alchemy/controller_helpers.rb
 - spec/support/alchemy/integration_helpers.rb
-- spec/support/alchemy/test_tweaks.rb
 - spec/support/ci/install_phantomjs
 - spec/support/factories.rb
 - spec/support/image with spaces.png
@@ -1209,6 +1210,8 @@ test_files:
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
 - spec/fast_specs.rb
+- spec/features/admin/element_create_feature_spec.rb
+- spec/features/admin/element_trash_feature_spec.rb
 - spec/features/admin/link_overlay_spec.rb
 - spec/features/admin/modules_integration_spec.rb
 - spec/features/admin/pages_controller_spec.rb
@@ -1280,7 +1283,6 @@ test_files:
 - spec/support/alchemy/controller_hacks.rb
 - spec/support/alchemy/controller_helpers.rb
 - spec/support/alchemy/integration_helpers.rb
-- spec/support/alchemy/test_tweaks.rb
 - spec/support/ci/install_phantomjs
 - spec/support/factories.rb
 - spec/support/image with spaces.png

data/spec/support/alchemy/test_tweaks.rb

@@ -1,31 +0,0 @@
-# https://gist.github.com/mperham/3049152
-# Fixes Capybara database connection issues
-class ActiveRecord::Base
-  mattr_accessor :shared_connection
-  @@shared_connection = nil
-
-  def self.connection
-    @@shared_connection || ConnectionPool::Wrapper.new(:size => 1) { retrieve_connection }
-  end
-end
-ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
-
-# fast truncation of all tables that need truncations (select is 10x faster then truncate)
-# http://grosser.it/2012/07/03/rubyactiverecord-fastest-way-to-truncate-test-database/
-def truncate_all_tables
-  config = ActiveRecord::Base.configurations[::Rails.env]
-  connection = ActiveRecord::Base.connection
-  connection.disable_referential_integrity do
-    connection.tables.each do |table_name|
-      next if connection.select_value("SELECT count(*) FROM #{table_name}") == 0
-      case config["adapter"]
-        when "mysql2", "postgresql"
-          connection.execute("TRUNCATE #{table_name}")
-        when "sqlite3"
-          connection.execute("DELETE FROM #{table_name}")
-          connection.execute("DELETE FROM sqlite_sequence where name='#{table_name}'")
-      end
-    end
-    connection.execute("VACUUM") if config["adapter"] == "sqlite3"
-  end
-end