github-migration/compass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix broken tests and code.

Browse Source
This commit is contained in:
Chris Eppstein 2010-12-18 17:13:47 -08:00
parent 2040be4b6c
commit cc8bccfb15
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/compass/configuration/serialization.rb
View File

@ -8,7 +8,7 @@ module Compass
end end
module ClassMethods module ClassMethods
def new_from_file(config_file, defaults) def new_from_file(config_file, defaults = nil)
data = Data.new(config_file) data = Data.new(config_file)
data.with_defaults(defaults) do data.with_defaults(defaults) do
data._parse(config_file) data._parse(config_file)
@ -16,7 +16,7 @@ module Compass
data data
end end
def new_from_string(contents, filename, defaults) def new_from_string(contents, filename, defaults = nil)
data = Data.new(filename) data = Data.new(filename)
data.with_defaults(defaults) do data.with_defaults(defaults) do
data.parse_string(contents, filename) data.parse_string(contents, filename)

6
test/rails_integration_test.rb
View File

@ -19,9 +19,9 @@ class RailsIntegrationTest < Test::Unit::TestCase
begin begin
generate_rails_app_directories("compass_rails") generate_rails_app_directories("compass_rails")
Dir.chdir "compass_rails" do Dir.chdir "compass_rails" do
compass(*%w(--rails --trace --boring .)) do |responder| compass(*%w(init 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*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", :required => true responder.respond_to %r{^\s*Emit compiled stylesheets to public/stylesheets/compiled/\? \(Y/n\)\s*$}, :with => "Y"
end end
# puts ">>>#{@last_result}<<<" # puts ">>>#{@last_result}<<<"
assert_action_performed :create, "./app/stylesheets/screen.scss" assert_action_performed :create, "./app/stylesheets/screen.scss"