diff --git a/lib/compass/configuration/serialization.rb b/lib/compass/configuration/serialization.rb index 3e3606f5..afdf4fc5 100644 --- a/lib/compass/configuration/serialization.rb +++ b/lib/compass/configuration/serialization.rb @@ -8,7 +8,7 @@ module Compass end module ClassMethods - def new_from_file(config_file, defaults) + def new_from_file(config_file, defaults = nil) data = Data.new(config_file) data.with_defaults(defaults) do data._parse(config_file) @@ -16,7 +16,7 @@ module Compass data end - def new_from_string(contents, filename, defaults) + def new_from_string(contents, filename, defaults = nil) data = Data.new(filename) data.with_defaults(defaults) do data.parse_string(contents, filename) diff --git a/test/rails_integration_test.rb b/test/rails_integration_test.rb index 5e69ca9e..5fd30626 100644 --- a/test/rails_integration_test.rb +++ b/test/rails_integration_test.rb @@ -19,9 +19,9 @@ class RailsIntegrationTest < Test::Unit::TestCase begin generate_rails_app_directories("compass_rails") Dir.chdir "compass_rails" do - compass(*%w(--rails --trace --boring .)) do |responder| - responder.respond_to %r{^\s*Is this OK\? \(Y/n\)\s*$}, :with => "Y", :required => true - responder.respond_to %r{^\s*Emit compiled stylesheets to public/stylesheets/compiled/\? \(Y/n\)\s*$}, :with => "Y", :required => true + compass(*%w(init rails --trace --boring .)) do |responder| + responder.respond_to %r{^\s*Is this OK\? \(Y/n\)\s*$}, :with => "Y" + responder.respond_to %r{^\s*Emit compiled stylesheets to public/stylesheets/compiled/\? \(Y/n\)\s*$}, :with => "Y" end # puts ">>>#{@last_result}<<<" assert_action_performed :create, "./app/stylesheets/screen.scss"