alchemy_cms 2.8.1 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edf3ac4fd7a2b98807ac909f6f091cdafb11f9c6
-  data.tar.gz: 4515777e5e93ef98b427f57dd9fd5a9f4b59333f
+  metadata.gz: c340c7f6e2a90471d1b5772227b1498b37859249
+  data.tar.gz: 450b8d1a217f9deaecabab868405f5c4a9457df7
 SHA512:
-  metadata.gz: a32052e6ccd970e0ba9f51e978d57897b67ffd0980425c283ddb1c01d27e5a8f71006d553867c6833420c33fc95802917987de9a599322fd1f44908e0e4d9455
-  data.tar.gz: d8199c8dce2e4d9f52aa0d6da2eca587050a574ef6d67855fe28c484718a8cb4d19a5fba1848e39ff1163512a148fabf014bc5d5ebd1c0002e55f304459be1eb
+  metadata.gz: fa4fec08b37e3fe38aa3c3b0ddc10458007b1621299734c8ad8071849de679b0a08b5d33c0989198cff1321106c94be6cebe2560ceabb6ea721b5fb15c5750d2
+  data.tar.gz: adbccc24de430ef03733e08d179f2528f7cb947cdb363c17a8b66b6aa7dd5a0bd2e1961aedf205f249d74cc00d7f1f64c519395d2d733029dc3456b078232fd3

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,6 +1,6 @@
 module Alchemy
 
-  VERSION = "2.8.1"
+  VERSION = "2.8.2"
 
   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/features/admin/pages_controller_spec.rb

@@ -24,7 +24,7 @@ module Alchemy
         it "one should be able to switch the language tree" do
           visit('/admin/pages')
           page.select 'Klingonian', :from => 'language'
-          page.should have_selector('#sitemap .sitemap_pagename_link', :text => 'Klingonian')
+          page.should have_selector('#sitemap', :text => 'Klingonian')
         end
 
         after { Capybara.default_wait_time = 2 } # Reset to default

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.8.1
+  version: 2.8.2
 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-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -918,6 +918,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
@@ -989,7 +991,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
@@ -1210,6 +1211,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
@@ -1281,7 +1284,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