Permalink
Browse files

Fix user_pref bug introduced with httpclient (get request params miss…

…ing)
  • Loading branch information...
krukow committed Sep 5, 2012
1 parent 12add66 commit df09845a7f94f3eacd8bb61581a04a1d96b93906
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
- calabash-cucumber (0.9.100)
+ calabash-cucumber (0.9.101)
CFPropertyList
bundler (~> 1.1)
cucumber
@@ -26,7 +26,7 @@ GEM
gherkin (2.11.1)
json (>= 1.4.6)
httpclient (2.2.7)
- json (1.7.4)
+ json (1.7.5)
location-one (0.0.5)
geocoder (~> 1.1)
json
@@ -35,7 +35,7 @@ GEM
rack
sim_launcher (0.3.8)
sinatra
- sinatra (1.3.2)
+ sinatra (1.3.3)
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3)
@@ -79,7 +79,7 @@ def set_user_pref(key, val)
end
def user_pref(key)
- res = http({:method => :get, :path => 'userprefs'},
+ res = http({:method => :get, :raw => true, :path => 'userprefs'},
{:key=> key})
res = JSON.parse(res)
if res['outcome'] != 'SUCCESS'
@@ -1,6 +1,6 @@
module Calabash
module Cucumber
- VERSION = "0.9.100"
+ VERSION = "0.9.101"
FRAMEWORK_VERSION = "0.9.100"
end
end
View
@@ -1,4 +1,4 @@
-(defproject calabash-jvm "0.0.1"
+(defproject calabash-jvm "0.0.3"
:description "JVM client for calabash-ios-server for automated iOS functional testing"
:url "https://github.com/calabash/calabash-ios"
:repositories {"sonatype"
@@ -19,7 +19,7 @@
{:level :info}
["calabash-jvm"]
- {:level :debug
+ {:level :info
:pattern "%p %m (query=%X{query}, action=%X{action}, :extras=%X{extras}) %n"})
@@ -2,7 +2,7 @@
# Set root logger level to DEBUG and its only appender to A1.
log4j.rootLogger=DEBUG, A1
log4j.logger.org.apache.http=INFO
-log4j.logger.calabash_jvm=INFO
+log4j.logger.calabash-jvm=INFO
# A1 is set to be a ConsoleAppender.
log4j.appender.A1=org.apache.log4j.ConsoleAppender

0 comments on commit df09845

Please sign in to comment.