diff --git a/Rakefile b/Rakefile index 41e4be0..ce8e76f 100644 --- a/Rakefile +++ b/Rakefile @@ -50,6 +50,7 @@ namespace :litmus do desc "Run litmus test suite" task :run => :configure do sh "cd spec/dummy/ && rails server -d" + sleep 1 puma_pid = `cat spec/dummy/tmp/pids/server.pid` exit_code = 0 @@ -60,7 +61,6 @@ namespace :litmus do puts "!!!!! Failure encountered during litmus test suite !!!!!" end - sleep 1 sh "kill #{puma_pid}" exit exit_code end diff --git a/lib/calligraphy/rails/web_dav_requests_controller.rb b/lib/calligraphy/rails/web_dav_requests_controller.rb index 1dafa4d..982bbf5 100644 --- a/lib/calligraphy/rails/web_dav_requests_controller.rb +++ b/lib/calligraphy/rails/web_dav_requests_controller.rb @@ -127,7 +127,7 @@ module Calligraphy::Rails end if conditions[:etag] - validators = [@resource.etag, ""] + validators = [@resource.etag, ''] conditions_met = false unless validate_etag validators, conditions[:etag] end @@ -149,7 +149,7 @@ module Calligraphy::Rails end def get_client_nonce - auth_header = request.headers["HTTP_AUTHORIZATION"] + auth_header = request.headers['HTTP_AUTHORIZATION'] auth = ::ActionController::HttpAuthentication::Digest.decode_credentials auth_header auth[:cnonce]