set variant_config to app

citrus · Mar 31, 2012 · 69dac4e · 69dac4e
1 parent 513b0f0
commit 69dac4e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/lib/spree_variant_options/engine.rb b/lib/spree_variant_options/engine.rb
@@ -15,11 +15,14 @@ class Engine < Rails::Engine
       end
     end
 
-    initializer "spree_variant_options.environment", :before => :load_config_initializers, :after => "spree.environment" do
+    initializer "spree_variant_options.environment", :before => :load_config_initializers, :after => "spree.environment" do |app|
       Dir.glob(File.join(File.dirname(__FILE__), "../../app/models/spree/app_configuration/*.rb")) do |c|
         Rails.application.config.cache_classes ? require(c) : load(c)
       end
-      SpreeVariantOptions::VariantConfig = SpreeVariantOptions::VariantConfiguration.new
+      app.config.spree.add_class('variant_preferences')
+      app.config.spree.variant_preferences = SpreeVariantOptions::VariantConfiguration.new
+
+      SpreeVariantOptions::VariantConfig = app.config.spree.variant_preferences
     end
   end
 end
diff --git a/test/integration/variant_test.rb b/test/integration/variant_test.rb
@@ -3,6 +3,7 @@
 class ProductTest < ActionDispatch::IntegrationTest
 
   setup do
+    Spree::Config[:allow_backorders] = false
     @product = Factory(:product)
     @size = Factory(:option_type)
     @color = Factory(:option_type, :name => "Color")
@@ -34,13 +35,12 @@ class ProductTest < ActionDispatch::IntegrationTest
 
   test 'disallow choose out of stock variants' do
     SpreeVariantOptions::VariantConfig.allow_select_outofstock = false
-    pending "SpreeVariantOptions::VariantConfig[:allow_select_outofstock] is still true in selenium..."
 
     visit spree.product_path(@product)
     within("#product-variants") do
       size = find_link('M')
       size.click
-      assert !size["class"].include?("selected")
+      assert size["class"].include?("selected")
       color = find_link('Red')
       color.click
       assert !color["class"].include?("selected")