@@ -1,5 +1,6 @@ * [#102] New association method in data_factory * [#101] Update to file upload testing (build_file -> file_for_upload, and multipart support in put) +* [#98] Fixed mack-facets not being loaded before app_config files. * [#97] Fixed sessions only working with 'local_memory' mode * [#96] Distributed Views module now uses file cache * [#92] Removed deprecated app_config.orm code. CHANGELOG @@ -2,6 +2,7 @@ require 'rake' require 'rake/testtask' require 'rake/rdoctask' require 'rubygems' +require 'mack-facets' require 'application_configuration' require File.join(File.dirname(__FILE__), "mack", "initialization", "configuration.rb") lib/mack_tasks.rb @@ -9,4 +9,7 @@ mack::page_cache: true mack::use_distributed_routes: false mack::distributed_app_name: fake_app -mack::testing_framework: rspec \ No newline at end of file +mack::testing_framework: rspec + +mack::test_facets: <%= 24.hours %> +test_facets: <%= 15.minutes %> \ No newline at end of file test/fake_application/config/app_config/default.yml @@ -56,4 +56,9 @@ describe Mack::Configuration do end + it "should load facets before loading app config" do + app_config.mack.test_facets.should == 86400 + app_config.test_facets.should == 900 + end + end test/unit/initialize/configuration_spec.rb f9d6b8b7899187fd9c5542332b65a68982d572bb Mark Bates mark@markbates.com http://github.com/markbates/mack/commit/6839e5dee379dfc4dc5189f3ba52981ccd796ea6 6839e5dee379dfc4dc5189f3ba52981ccd796ea6 2008-08-18T10:19:42-07:00 2008-08-18T10:19:42-07:00 Fixed mack-facets not being loaded before app_config files. [#98 state:resolved] 6ab142d21f47fb4509d12270a6ac6f96a9d337ee Mark Bates mark@markbates.com