From 49e47274d55bfbe39eebfc8c78b520c4c31518fb Mon Sep 17 00:00:00 2001 From: rick Date: Wed, 28 Dec 2011 14:05:23 -0700 Subject: [PATCH] fix an excon and rack error (headers should be strings, excon likes IPs) --- test/adapters/live_test.rb | 2 +- test/helper.rb | 2 +- test/live_server.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/adapters/live_test.rb b/test/adapters/live_test.rb index 91eae2ac..c8e8a4f3 100644 --- a/test/adapters/live_test.rb +++ b/test/adapters/live_test.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helper')) +require File.expand_path("../../helper", __FILE__) if !Faraday::TestCase::LIVE_SERVER warn "warning: test server not specified; skipping live server tests" diff --git a/test/helper.rb b/test/helper.rb index b4322143..c91da680 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -23,7 +23,7 @@ module Faraday LIVE_SERVER = case ENV['LIVE'] when /^http/ then ENV['LIVE'] when nil then nil - else 'http://localhost:4567' + else 'http://127.0.0.1:4567' end def test_default diff --git a/test/live_server.rb b/test/live_server.rb index 9bd500fe..ea90bd8e 100644 --- a/test/live_server.rb +++ b/test/live_server.rb @@ -41,5 +41,5 @@ delete '/delete_with_json' do end get '/multi' do - [200, { 'Set-Cookie' => %w[ one two ] }, ''] + [200, { 'Set-Cookie' => 'one, two' }, ''] end