fixed with_configuration to get rid of old configurations before yielding

Benjamin Krause · Benjamin Krause · commit eb868dff478e · 2009-10-21T23:20:08.000+02:00
diff --git a/lib/sunspot/rails/configuration.rb b/lib/sunspot/rails/configuration.rb
@@ -115,10 +115,7 @@ def master_path
       # Boolean:: bool
       #
       def has_master?
-        unless defined?(@has_master)
-          @has_master = !!user_configuration_from_key('master_solr')
-        end
-        @has_master
+        @has_master = !!user_configuration_from_key('master_solr')
       end
 
       # 
diff --git a/spec/session_spec.rb b/spec/session_spec.rb
@@ -30,6 +30,7 @@
 
   def with_configuration(options)
     original_configuration = Sunspot::Rails.configuration
+    Sunspot::Rails.reset
     Sunspot::Rails.configuration = Sunspot::Rails::Configuration.new
     Sunspot::Rails.configuration.user_configuration = options
     yield

Original file line number	Diff line number	Diff line change
`@@ -115,10 +115,7 @@ def master_path`
`115`	`115`	`# Boolean:: bool`
`116`	`116`	`#`
`117`	`117`	`def has_master?`
`118`		`- unless defined?(@has_master)`
`119`		`- @has_master = !!user_configuration_from_key('master_solr')`
`120`		`- end`
`121`		`- @has_master`
	`118`	`+ @has_master = !!user_configuration_from_key('master_solr')`
`122`	`119`	`end`
`123`	`120`
`124`	`121`	`#`