[couchdb] 01/02: Revert "Support setting base_url in Couch test helper"

[va...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vatamane pushed a commit to branch prototype/fdb-layer
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit ded6d64781fa7e8b6adfd1bf5aa548503ba3606f
Author: ILYA Khlopotov <ii...@apache.org>
AuthorDate: Fri Feb 21 07:35:02 2020 -0800

    Revert "Support setting base_url in Couch test helper"
    
    This reverts commit 8650a4e0bb127165affe8972989f134d0e1f6554.
---
 test/elixir/lib/couch.ex | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/test/elixir/lib/couch.ex b/test/elixir/lib/couch.ex
index 3fa5001..8f47ad8 100644
--- a/test/elixir/lib/couch.ex
+++ b/test/elixir/lib/couch.ex
@@ -4,7 +4,7 @@ defmodule Couch.Session do
   """
 
   @enforce_keys [:cookie]
-  defstruct [:cookie, :base_url]
+  defstruct [:cookie]
 
   def new(cookie) do
     %Couch.Session{cookie: cookie}
@@ -34,7 +34,6 @@ defmodule Couch.Session do
 
   def go(%Couch.Session{} = sess, method, url, opts) do
     opts = Keyword.merge(opts, cookie: sess.cookie)
-    opts = Keyword.merge(opts, base_url: sess.base_url)
     Couch.request(method, url, opts)
   end
 
@@ -55,13 +54,8 @@ defmodule Couch do
     url
   end
 
-  def process_url(url, options) do
-    base_url = case Keyword.get(options, :base_url) do
-      nil ->
-        System.get_env("EX_COUCH_URL") || "http://127.0.0.1:15984"
-      base_url ->
-        base_url
-    end
+  def process_url(url) do
+    base_url = System.get_env("EX_COUCH_URL") || "http://127.0.0.1:15984"
     base_url <> url
   end
 
@@ -120,16 +114,15 @@ defmodule Couch do
 
   def login(userinfo) do
     [user, pass] = String.split(userinfo, ":", parts: 2)
-    login(nil, user, pass)
+    login(user, pass)
   end
 
-  def login(base_url, user, pass) do
-    resp = Couch.post("/_session",
-      body: %{:username => user, :password => pass}, base_url: base_url)
+  def login(user, pass) do
+    resp = Couch.post("/_session", body: %{:username => user, :password => pass})
     true = resp.body["ok"]
     cookie = resp.headers[:"set-cookie"]
     [token | _] = String.split(cookie, ";")
-    %Couch.Session{cookie: token, base_url: base_url}
+    %Couch.Session{cookie: token}
   end
 
 end