Fix infinite loop

cucumber-ltd · Nov 10, 2010 · 84d5e17 · 84d5e17
1 parent a07338e
commit 84d5e17
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/relish/commands/base.rb b/lib/relish/commands/base.rb
@@ -47,7 +47,9 @@ def get_api_token
       end
 
       def resource(options = {})
-        RestClient::Resource.new(url, {:user => api_token, :password => 'X'}.merge(options))
+        options[:user] ||= api_token
+        options[:password] ||= 'X'
+        RestClient::Resource.new(url, options)
       end
 
       def clean_args(args)