Skip to content

Fix base url in tests #2590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickva merged 2 commits into from
Feb 22, 2020
Merged

Fix base url in tests #2590

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc5cd9d
Revert "Support setting base_url in Couch test helper"
iilyak Feb 21, 2020
58ac037
Support setting base_url in Couch test helper (take 2)
iilyak Feb 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions test/elixir/lib/couch.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,12 @@ defmodule Couch.Session do
# if the need arises.

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)
opts = Keyword.merge(opts, cookie: sess.cookie, base_url: sess.base_url)
Couch.request(method, url, opts)
end

def go!(%Couch.Session{} = sess, method, url, opts) do
opts = Keyword.merge(opts, cookie: sess.cookie)
opts = Keyword.merge(opts, cookie: sess.cookie, base_url: sess.base_url)
Couch.request!(method, url, opts)
end
end
Expand All @@ -56,13 +55,9 @@ defmodule Couch do
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
base_url <> url
Keyword.get(options, :base_url) <> url
|> prepend_protocol
|> append_query_string(options)
end

def process_request_headers(headers, _body, options) do
Expand All @@ -85,6 +80,8 @@ defmodule Couch do
end

def process_options(options) do
base_url = System.get_env("EX_COUCH_URL") || "http://127.0.0.1:15984"
options = Keyword.put_new(options, :base_url, base_url)
if Keyword.get(options, :cookie) == nil do
headers = Keyword.get(options, :headers, [])

Expand Down Expand Up @@ -120,12 +117,20 @@ defmodule Couch do

def login(userinfo) do
[user, pass] = String.split(userinfo, ":", parts: 2)
login(nil, user, pass)
login(user, pass)
end

def login(user, pass) do
base_url = System.get_env("EX_COUCH_URL") || "http://127.0.0.1:15984"
login(base_url, user, pass)
end

def login(base_url, user, pass) do
resp = Couch.post("/_session",
body: %{:username => user, :password => pass}, base_url: base_url)
resp = Couch.post(
"/_session",
body: %{:username => user, :password => pass},
base_url: base_url
)
true = resp.body["ok"]
cookie = resp.headers[:"set-cookie"]
[token | _] = String.split(cookie, ";")
Expand Down