alchemy_cms 2.2.2 → 2.2.3.1

data/spec/models/essence_boolean_spec.rb

@@ -4,7 +4,7 @@ module Alchemy
   describe EssenceBoolean do
 
     it "should act as essence" do
-      expect { EssenceBoolean.new.acts_as_essence? }.should_not raise_error(NoMethodError)
+      expect { EssenceBoolean.new.acts_as_essence? }.to_not raise_error(NoMethodError)
     end
 
     it "should have correct partial path" do

data/spec/models/essence_select_spec.rb

@@ -4,7 +4,7 @@ module Alchemy
   describe EssenceSelect do
 
     it "should act as essence" do
-      expect { EssenceSelect.new.acts_as_essence? }.should_not raise_error(NoMethodError)
+      expect { EssenceSelect.new.acts_as_essence? }.to_not raise_error(NoMethodError)
     end
 
     it "should have correct partial path" do

data/spec/models/language_spec.rb

@@ -58,7 +58,7 @@ describe Alchemy::Language do
     if !@default_language
       @default_language = FactoryGirl.create(:language, :name => "default", :code => "aa", :frontpage_name => "intro", :default => true)
     end
-    expect { @default_language.destroy }.should raise_error
+    expect { @default_language.destroy }.to raise_error
   end
 
   describe "before save" do

data/spec/models/page_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 module Alchemy
   describe Page do
 
-    before(:all) do
+    before(:each) do
       @rootpage = Page.root
       @rootpage.children.destroy_all
       @language = Language.get_default

data/spec/spec_helper.rb

@@ -9,9 +9,6 @@ def configure
 
   require File.expand_path("../dummy/config/environment.rb", __FILE__)
 
-  require 'database_cleaner'
-  DatabaseCleaner.strategy = :truncation
-
   require 'authlogic/test_case'
   include Authlogic::TestCase
 
@@ -25,6 +22,8 @@ def configure
   ActionMailer::Base.default_url_options[:host] = "test.com"
 
   Rails.backtrace_cleaner.remove_silencers!
+  # Disable rails loggin for faster IO. Remove this if you want to have a test.log
+  Rails.logger.level = 4
 
   # Configure capybara for integration testing
   require "capybara/rails"
@@ -32,6 +31,9 @@ def configure
   Capybara.default_driver = :rack_test
   Capybara.default_selector = :css
   Capybara.javascript_driver = :poltergeist
+  Capybara.register_driver(:rack_test_translated_header) do |app|
+    Capybara::RackTest::Driver.new(app, :headers => { 'HTTP_ACCEPT_LANGUAGE' => 'de' })
+  end
 
   # Load support files
   Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
@@ -42,22 +44,21 @@ def configure
     config.include Alchemy::Engine.routes.url_helpers
     config.mock_with :rspec
     config.use_transactional_fixtures = true
+    # Make sure the database is clean and ready for test
+    config.before(:suite) do
+      truncate_all_tables
+      Alchemy::Seeder.seed!
+    end
+    # Ensuring that the locale is always resetted to :en before running any tests
+    config.before(:each) do
+      ::I18n.locale = :en
+    end
   end
 
 end
 
-def seed
-  # This code will be run each time you run your specs.
-  DatabaseCleaner.clean
-  # Seed the database
-  Alchemy::Seeder.seed!
-  ::I18n.locale = :en
-end
-
 if defined?(Spork)
   Spork.prefork { configure }
-  Spork.each_run { seed }
 else
   configure
-  seed
 end

data/spec/support/alchemy/specs_helpers.rb

@@ -2,22 +2,29 @@ require 'declarative_authorization/maintenance'
 
 module Alchemy
   module Specs
+
     # Helpers for integration specs
+    #
     # This file is auto included in rspec integration/request tests.
+    #
     module Helpers
       include Authorization::TestHelper
 
-      # Capybara actions to login into Alchemy Backend
+      # Shortcut method for:
       #
-      # === IMPORTANT NOTE:
+      #   * create_admin_user
+      #   * login_into_alchemy
       #
-      # Because of a very strange bug in capybara, or rspec, or what ever, you **MUST** create the user inside a +before(:all)+ block inside your integrations specs.
+      def authorize_as_admin
+        create_admin_user
+        login_into_alchemy
+      end
+
+      # Capybara actions to login into Alchemy Backend
       #
-      # === Example:
+      # You should have a admin user before loggin in.
       #
-      #   before(:all) do
-      #     create_admin_user
-      #   end
+      # See: create_admin_user method
       #
       def login_into_alchemy
         visit '/alchemy/admin/login'
@@ -27,18 +34,30 @@ module Alchemy
       end
 
       # Load additional authorization_rules for specs.
+      #
       # For some strange reason, this isn't done automatically while running the specs
+      #
       def load_authorization_rules
         instance = Alchemy::AuthEngine.get_instance
         instance.load(File.join(File.dirname(__FILE__), '../../dummy', 'config/authorization_rules.rb'))
       end
 
       # Creates an admin user in a way it works
+      #
+      # You should create it once in a before block
+      #
+      # === Example:
+      #
+      #   before do
+      #     create_admin_user
+      #   end
+      #
       def create_admin_user
-        @user = FactoryGirl.build(:admin_user).save_without_session_maintenance
+        @user ||= FactoryGirl.build(:admin_user).save_without_session_maintenance
       end
 
     end
+
   end
 end
 

data/spec/support/alchemy/test_tweaks.rb

@@ -0,0 +1,35 @@
+# Fixes Capybara database connection issues
+# Found http://blog.plataformatec.com.br/2011/12/three-tips-to-improve-the-performance-of-your-test-suite/
+
+class ActiveRecord::Base
+  mattr_accessor :shared_connection
+  @@shared_connection = nil
+
+  def self.connection
+    @@shared_connection || retrieve_connection
+  end
+end
+
+# Forces all threads to share the same connection. This works on
+# Capybara because it starts the web server in a thread.
+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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-07 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -270,22 +270,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -863,6 +847,7 @@ files:
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
+- spec/dummy/config/locales/fo.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
@@ -917,6 +902,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/alchemy/controller_hacks.rb
 - spec/support/alchemy/specs_helpers.rb
+- spec/support/alchemy/test_tweaks.rb
 - vendor/assets/javascripts/jquery_plugins/jquery.Jcrop.min.js
 - vendor/assets/javascripts/jquery_plugins/jquery.dialogextend.min.js
 - vendor/assets/javascripts/jquery_plugins/jquery.html5uploader.js
@@ -1039,7 +1025,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4110800022102781738
+      hash: -3671524832789070109
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 
@@ -1085,6 +1071,7 @@ test_files:
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
+- spec/dummy/config/locales/fo.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
@@ -1139,4 +1126,5 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/alchemy/controller_hacks.rb
 - spec/support/alchemy/specs_helpers.rb
+- spec/support/alchemy/test_tweaks.rb
 has_rdoc: