Marcel/submit with button#94

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

Closed
fatboypunk wants to merge 3 commits into from
Closed

Marcel/submit with button #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f8629b
Submit forms with a button
fatboypunk Oct 20, 2021
a2c1652
push _dispatch_form below the usage of it
fatboypunk Oct 20, 2021
89cee46
take the name from the radio input
fatboypunk Oct 21, 2021
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
29 changes: 17 additions & 12 deletions lib/test_dispatch.ex
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,12 +36,7 @@ defmodule TestDispatch do
{form, selector_type} = find_form(conn, entity_or_test_selector)
selector_tuple = {selector_type, entity_or_test_selector}

form
|> find_inputs(selector_tuple)
|> Enum.map(&input_to_tuple(&1, selector_tuple))
|> update_input_values(attrs)
|> prepend_entity(selector_tuple)
|> send_to_action(form, conn)
_dispatch_form(conn, form, selector_tuple, attrs)
end

def dispatch_form(conn, entity_or_test_selector, nil),
Expand All@@ -57,6 +52,14 @@ defmodule TestDispatch do
{form, _} = find_form(conn, test_selector)
selector_tuple = {:entity, entity}

_dispatch_form(conn, form, selector_tuple, attrs)
end

@spec submit_form(Plug.Conn.t(), %{}, binary() | atom() | nil) :: Plug.Conn.t()
def submit_form(conn, attrs \\ %{}, entity_or_test_selector \\ nil),
do: dispatch_form(conn, attrs, entity_or_test_selector)

defp _dispatch_form(conn, form, selector_tuple, attrs) do
form
|> find_inputs(selector_tuple)
|> Enum.map(&input_to_tuple(&1, selector_tuple))
Expand All@@ -65,10 +68,6 @@ defmodule TestDispatch do
|> send_to_action(form, conn)
end

@spec submit_form(Plug.Conn.t(), %{}, binary() | atom() | nil) :: Plug.Conn.t()
def submit_form(conn, attrs, entity_or_test_selector),
do: dispatch_form(conn, attrs, entity_or_test_selector)

@doc """
Works like `submit_form/3`. The test_selector is used to find the right form and the
entity is used to find and fill the inputs correctly.
Expand All@@ -78,6 +77,14 @@ defmodule TestDispatch do
def submit_form(conn, attrs, entity, test_selector),
do: dispatch_form(conn, attrs, entity, test_selector)

@spec submit_form(Plug.Conn.t(), %{}, binary()) :: Plug.Conn.t()

@EasterPeanutEasterPeanutOct 22, 2021

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
@specsubmit_form(Plug.Conn.t(),%{},binary())::Plug.Conn.t()
@specsubmit_with_button(Plug.Conn.t(),%{},binary())::Plug.Conn.t()

@fatboypunkfatboypunkOct 22, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

def submit_with_button(%Plug.Conn{} = conn, attrs \\ %{}, button_text) do
{form, _} = find_form(conn, button_text: button_text)
selector_tuple = {:button_text, button_text}

_dispatch_form(conn, form, selector_tuple, attrs)
end

@doc """
Finds a link by a given conn, test_selector and an optional test_value.

Expand DownExpand Up@@ -148,8 +155,6 @@ defmodule TestDispatch do
|> find_link(test_selector, test_value)
|> _dispatch_link(conn)

@spec dispatch_link(nil | Floki.html_tree(), Plug.Conn.t(), binary(), binary() | nil) ::
Plug.Conn.t()
def click_link(conn, test_selector, test_value, tree),
do: dispatch_link(conn, test_selector, test_value, tree)

Expand Down
91 changes: 84 additions & 7 deletions lib/test_dispatch/form.ex
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,15 +9,43 @@ defmodule TestDispatch.Form do
def find_inputs(form, {:entity, _} = entity_tuple),
do: find_input_fields(form, entity_tuple)

def find_inputs(form, {:button_text, button_text}) do
button = find_buttons(form, button_text)
Comment thread
fatboypunk marked this conversation as resolved.

if button,
do: [button | find_default_inputs(form)],
else: find_default_inputs(form)
end

def find_inputs(form, _) do
find_default_inputs(form)
end

defp find_default_inputs(form) do
fields = find_input_fields(form, "")
selects = find_selects(form, "")
textareas = find_textareas(form, "")
radio_buttons = find_radio_buttons(form, "")

Enum.uniq(fields ++ selects ++ textareas ++ radio_buttons)
end

def find_buttons(form, button_text),
Comment thread
fatboypunk marked this conversation as resolved.
do:
find_submit_input(form, button_text) ||
find_submit_button(form, button_text)

defp find_submit_button(form, button_text) do
form
|> Floki.find("button[type=submit]")
|> Enum.find(&contains_button_text?(&1, button_text))
end

defp find_submit_input(form, button_text) do
form
|> Floki.find("input[type=submit]")
|> Enum.find(&contains_button_text?(&1, button_text))
end

def find_radio_buttons(form, "") do
radios = Floki.find(form, "input[type=radio]")

Expand All@@ -28,7 +56,7 @@ defmodule TestDispatch.Form do
other_radios =
radios
|> Enum.uniq_by(fn {_, list, _} ->
list |> Enum.find(fn {key, _} -> "name" == key end) |> elem(1)
Enum.find(list, fn {key, _} -> "name" == key end) |> elem(1)
end)
|> Enum.reject(fn radio -> floki_attribute(radio, "name") in checked_names end)

Expand DownExpand Up@@ -72,6 +100,9 @@ defmodule TestDispatch.Form do
new_nested_list = update_nested_input_values(acc_nested_list, tuple, nested_attr)

Map.put(acc, key, new_nested_list)

{} ->
acc
end
end)
end
Expand All@@ -80,11 +111,13 @@ defmodule TestDispatch.Form do
value = input |> elem(0) |> _input_to_tuple([input])

case input |> key_for_input(entity_tuple) |> resolve_nested() do
nil -> {}
{key, index, nested_key} -> {key, index, {nested_key, value}}
key -> {key, value}
end
end

defp _input_to_tuple("button", input), do: Floki.text(input)
defp _input_to_tuple("textarea", input), do: Floki.text(input)
defp _input_to_tuple("input", input), do: floki_attribute(input, "value")

Expand All@@ -102,14 +135,19 @@ defmodule TestDispatch.Form do
String.replace_prefix(key, "#{entity}_", "")
end

defp key_for_input({"button", _, _} = input, _), do: floki_attribute(input, "name")

defp key_for_input(input, _) do
name = floki_attribute(input, "name")
id = floki_attribute(input, "id")

if floki_attribute(input, "type") == "radio",
do: String.replace_suffix(id, "_#{floki_attribute(input, "value")}", ""),
do: name,
else: id
end

defp resolve_nested(nil), do: nil

defp resolve_nested(key) do
case Regex.split(~r{_\d*_}, key, include_captures: true) do
[key, capture, nested_key] ->
Expand DownExpand Up@@ -171,13 +209,27 @@ defmodule TestDispatch.Form do
"The provided conn had the status #{status} that doesn't fall into the 2xx range"
)

def find_form_by(form, nil), do: {List.last(form), nil}
def find_form_by(forms, nil), do: {List.last(forms), nil}

def find_form_by(form, entity_or_test_selector) do
test_selector_result = Enum.find(form, &find_test_selector(&1, entity_or_test_selector))
def find_form_by(forms, button_text: button_text) do
form = Enum.find(forms, &contains_button_text?(&1, button_text))

if form,
do: {form, :button_text},
else:
raise("""
No form found for the given button text: #{button_text}
Found the button texts:

#{all_buttons(forms)}
""")
end

def find_form_by(forms, entity_or_test_selector) do
test_selector_result = Enum.find(forms, &find_test_selector(&1, entity_or_test_selector))

entity_result =
Enum.find(form, &(&1 |> Floki.find("*[id^=#{entity_or_test_selector}_]") |> Enum.any?()))
Enum.find(forms, &(&1 |> Floki.find("*[id^=#{entity_or_test_selector}_]") |> Enum.any?()))

cond do
is_tuple(test_selector_result) ->
Expand All@@ -204,4 +256,29 @@ defmodule TestDispatch.Form do
|> html_response(status)
|> Floki.parse_document!()
end

defp contains_button_text?(form, button_text) do
input_submit =
form
|> Floki.find("input[type=submit]")
|> Enum.any?(&(text(&1) == button_text))

button_submit =
form
|> Floki.find("button[type=submit]")
|> Enum.any?(&(text(&1) == button_text))

input_submit || button_submit
end

def text(html_tree),

@EasterPeanutEasterPeanutOct 22, 2021

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
deftext(html_tree),
defptext(html_tree),

@fatboypunkfatboypunkOct 22, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm yeah i'm moving this later in #97.

do: html_tree |> Floki.text() |> String.replace(~r/\s+/, " ") |> String.trim()

defp all_buttons(html_tree) do

@EasterPeanutEasterPeanutOct 22, 2021

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
defpall_buttons(html_tree)do
defpall_submit_controls(html_tree)do

or something like it? :p

@fatboypunkfatboypunkOct 22, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah nice i'll update this in #97

all_submit_buttons = html_tree |> Floki.find("button[type=submit]")
all_submit_inputs = html_tree |> Floki.find("input[type=submit]")

(all_submit_inputs ++ all_submit_buttons)
|> Enum.map(&(text([&1]) <> "\n "))
end
end
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Marcel/submit with button#94

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

 Closed

fatboypunk
wants to merge
3
commits into

from

 Closed


Marcel/submit with button
#94
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0f8629b

Submit forms with a button


fatboypunk Oct 20, 2021
a2c1652

push _dispatch_form below the usage of it


fatboypunk Oct 20, 2021
89cee46

take the name from the radio input


fatboypunk Oct 21, 2021

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


29 changes: 17 additions & 12 deletions
lib/test_dispatch.ex

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,12 +36,7 @@ defmodule TestDispatch do
 {form, selector_type} = find_form(conn, entity_or_test_selector)
 selector_tuple = {selector_type, entity_or_test_selector}

 form
 |> find_inputs(selector_tuple)
 |> Enum.map(&input_to_tuple(&1, selector_tuple))
 |> update_input_values(attrs)
 |> prepend_entity(selector_tuple)
 |> send_to_action(form, conn)
 _dispatch_form(conn, form, selector_tuple, attrs)
 end

 def dispatch_form(conn, entity_or_test_selector, nil),
Expand All@@ -57,6 +52,14 @@ defmodule TestDispatch do
 {form, _} = find_form(conn, test_selector)
 selector_tuple = {:entity, entity}

 _dispatch_form(conn, form, selector_tuple, attrs)
 end

 @spec submit_form(Plug.Conn.t(), %{}, binary() | atom() | nil) :: Plug.Conn.t()
 def submit_form(conn, attrs \\ %{}, entity_or_test_selector \\ nil),
 do: dispatch_form(conn, attrs, entity_or_test_selector)

 defp _dispatch_form(conn, form, selector_tuple, attrs) do
 form
 |> find_inputs(selector_tuple)
 |> Enum.map(&input_to_tuple(&1, selector_tuple))
Expand All@@ -65,10 +68,6 @@ defmodule TestDispatch do
 |> send_to_action(form, conn)
 end

 @spec submit_form(Plug.Conn.t(), %{}, binary() | atom() | nil) :: Plug.Conn.t()
 def submit_form(conn, attrs, entity_or_test_selector),
 do: dispatch_form(conn, attrs, entity_or_test_selector)

 @doc """
 Works like `submit_form/3`. The test_selector is used to find the right form and the
 entity is used to find and fill the inputs correctly.
Expand All@@ -78,6 +77,14 @@ defmodule TestDispatch do
 def submit_form(conn, attrs, entity, test_selector),
 do: dispatch_form(conn, attrs, entity, test_selector)

 @spec submit_form(Plug.Conn.t(), %{}, binary()) :: Plug.Conn.t()
@EasterPeanutEasterPeanutOct 22, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

@specsubmit_form(Plug.Conn.t(),%{},binary())::Plug.Conn.t()
@specsubmit_with_button(Plug.Conn.t(),%{},binary())::Plug.Conn.t()
@fatboypunkfatboypunkOct 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!
 def submit_with_button(%Plug.Conn{} = conn, attrs \\ %{}, button_text) do
 {form, _} = find_form(conn, button_text: button_text)
 selector_tuple = {:button_text, button_text}

 _dispatch_form(conn, form, selector_tuple, attrs)
 end

 @doc """
 Finds a link by a given conn, test_selector and an optional test_value.

Expand DownExpand Up@@ -148,8 +155,6 @@ defmodule TestDispatch do
 |> find_link(test_selector, test_value)
 |> _dispatch_link(conn)

 @spec dispatch_link(nil | Floki.html_tree(), Plug.Conn.t(), binary(), binary() | nil) ::
 Plug.Conn.t()
 def click_link(conn, test_selector, test_value, tree),
 do: dispatch_link(conn, test_selector, test_value, tree)

Expand Down

91 changes: 84 additions & 7 deletions
lib/test_dispatch/form.ex

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,15 +9,43 @@ defmodule TestDispatch.Form do
 def find_inputs(form, {:entity, _} = entity_tuple),
 do: find_input_fields(form, entity_tuple)

 def find_inputs(form, {:button_text, button_text}) do
 button = find_buttons(form, button_text)
Comment thread
fatboypunk marked this conversation as resolved.


 if button,
 do: [button | find_default_inputs(form)],
 else: find_default_inputs(form)
 end

 def find_inputs(form, _) do
 find_default_inputs(form)
 end

 defp find_default_inputs(form) do
 fields = find_input_fields(form, "")
 selects = find_selects(form, "")
 textareas = find_textareas(form, "")
 radio_buttons = find_radio_buttons(form, "")

 Enum.uniq(fields ++ selects ++ textareas ++ radio_buttons)
 end

 def find_buttons(form, button_text),
Comment thread
fatboypunk marked this conversation as resolved.

 do:
 find_submit_input(form, button_text) ||
 find_submit_button(form, button_text)

 defp find_submit_button(form, button_text) do
 form
 |> Floki.find("button[type=submit]")
 |> Enum.find(&contains_button_text?(&1, button_text))
 end

 defp find_submit_input(form, button_text) do
 form
 |> Floki.find("input[type=submit]")
 |> Enum.find(&contains_button_text?(&1, button_text))
 end

 def find_radio_buttons(form, "") do
 radios = Floki.find(form, "input[type=radio]")

Expand All@@ -28,7 +56,7 @@ defmodule TestDispatch.Form do
 other_radios =
 radios
 |> Enum.uniq_by(fn {_, list, _} ->
list |> Enum.find(fn {key, _} -> "name" == key end) |> elem(1)
 Enum.find(list, fn {key, _} -> "name" == key end) |> elem(1)
 end)
 |> Enum.reject(fn radio -> floki_attribute(radio, "name") in checked_names end)

Expand DownExpand Up@@ -72,6 +100,9 @@ defmodule TestDispatch.Form do
 new_nested_list = update_nested_input_values(acc_nested_list, tuple, nested_attr)

 Map.put(acc, key, new_nested_list)

 {} ->
 acc
 end
 end)
 end
Expand All@@ -80,11 +111,13 @@ defmodule TestDispatch.Form do
 value = input |> elem(0) |> _input_to_tuple([input])

 case input |> key_for_input(entity_tuple) |> resolve_nested() do
 nil -> {}
 {key, index, nested_key} -> {key, index, {nested_key, value}}
 key -> {key, value}
 end
 end

 defp _input_to_tuple("button", input), do: Floki.text(input)
 defp _input_to_tuple("textarea", input), do: Floki.text(input)
 defp _input_to_tuple("input", input), do: floki_attribute(input, "value")

Expand All@@ -102,14 +135,19 @@ defmodule TestDispatch.Form do
 String.replace_prefix(key, "#{entity}_", "")
 end

 defp key_for_input({"button", _, _} = input, _), do: floki_attribute(input, "name")

 defp key_for_input(input, _) do
 name = floki_attribute(input, "name")
 id = floki_attribute(input, "id")

 if floki_attribute(input, "type") == "radio",
 do: String.replace_suffix(id, "_#{floki_attribute(input, "value")}", ""),
 do: name,
 else: id
 end

 defp resolve_nested(nil), do: nil

 defp resolve_nested(key) do
 case Regex.split(~r{_\d*_}, key, include_captures: true) do
 [key, capture, nested_key] ->
Expand DownExpand Up@@ -171,13 +209,27 @@ defmodule TestDispatch.Form do
 "The provided conn had the status #{status} that doesn't fall into the 2xx range"
 )

 def find_form_by(form, nil), do: {List.last(form), nil}
 def find_form_by(forms, nil), do: {List.last(forms), nil}

 def find_form_by(form, entity_or_test_selector) do
 test_selector_result = Enum.find(form, &find_test_selector(&1, entity_or_test_selector))
 def find_form_by(forms, button_text: button_text) do
 form = Enum.find(forms, &contains_button_text?(&1, button_text))

 if form,
 do: {form, :button_text},
 else:
 raise("""
 No form found for the given button text: #{button_text}
 Found the button texts:

 #{all_buttons(forms)}
 """)
 end

 def find_form_by(forms, entity_or_test_selector) do
 test_selector_result = Enum.find(forms, &find_test_selector(&1, entity_or_test_selector))

 entity_result =
 Enum.find(form, &(&1 |> Floki.find("*[id^=#{entity_or_test_selector}_]") |> Enum.any?()))
 Enum.find(forms, &(&1 |> Floki.find("*[id^=#{entity_or_test_selector}_]") |> Enum.any?()))

 cond do
 is_tuple(test_selector_result) ->
Expand All@@ -204,4 +256,29 @@ defmodule TestDispatch.Form do
 |> html_response(status)
 |> Floki.parse_document!()
 end

 defp contains_button_text?(form, button_text) do
 input_submit =
 form
 |> Floki.find("input[type=submit]")
 |> Enum.any?(&(text(&1) == button_text))

 button_submit =
 form
 |> Floki.find("button[type=submit]")
 |> Enum.any?(&(text(&1) == button_text))

 input_submit || button_submit
 end

 def text(html_tree),
@EasterPeanutEasterPeanutOct 22, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

deftext(html_tree),
defptext(html_tree),
@fatboypunkfatboypunkOct 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm yeah i'm moving this later in #97.
 do: html_tree |> Floki.text() |> String.replace(~r/\s+/, " ") |> String.trim()

 defp all_buttons(html_tree) do
@EasterPeanutEasterPeanutOct 22, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

defpall_buttons(html_tree)do
defpall_submit_controls(html_tree)do
or something like it? :p
@fatboypunkfatboypunkOct 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah nice i'll update this in #97
 all_submit_buttons = html_tree |> Floki.find("button[type=submit]")
 all_submit_inputs = html_tree |> Floki.find("input[type=submit]")

 (all_submit_inputs ++ all_submit_buttons)
 |> Enum.map(&(text([&1]) <> "\n "))
 end
end

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Marcel/submit with button#94

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

 Closed

fatboypunk
wants to merge
3
commits into

from

 Closed


Marcel/submit with button
#94
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0f8629b

Submit forms with a button


fatboypunk Oct 20, 2021
a2c1652

push _dispatch_form below the usage of it


fatboypunk Oct 20, 2021
89cee46

take the name from the radio input


fatboypunk Oct 21, 2021

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


29 changes: 17 additions & 12 deletions
lib/test_dispatch.ex

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,12 +36,7 @@ defmodule TestDispatch do
 {form, selector_type} = find_form(conn, entity_or_test_selector)
 selector_tuple = {selector_type, entity_or_test_selector}

 form
 |> find_inputs(selector_tuple)
 |> Enum.map(&input_to_tuple(&1, selector_tuple))
 |> update_input_values(attrs)
 |> prepend_entity(selector_tuple)
 |> send_to_action(form, conn)
 _dispatch_form(conn, form, selector_tuple, attrs)
 end

 def dispatch_form(conn, entity_or_test_selector, nil),
Expand All@@ -57,6 +52,14 @@ defmodule TestDispatch do
 {form, _} = find_form(conn, test_selector)
 selector_tuple = {:entity, entity}

 _dispatch_form(conn, form, selector_tuple, attrs)
 end

 @spec submit_form(Plug.Conn.t(), %{}, binary() | atom() | nil) :: Plug.Conn.t()
 def submit_form(conn, attrs \\ %{}, entity_or_test_selector \\ nil),
 do: dispatch_form(conn, attrs, entity_or_test_selector)

 defp _dispatch_form(conn, form, selector_tuple, attrs) do
 form
 |> find_inputs(selector_tuple)
 |> Enum.map(&input_to_tuple(&1, selector_tuple))
Expand All@@ -65,10 +68,6 @@ defmodule TestDispatch do
 |> send_to_action(form, conn)
 end

 @spec submit_form(Plug.Conn.t(), %{}, binary() | atom() | nil) :: Plug.Conn.t()
 def submit_form(conn, attrs, entity_or_test_selector),
 do: dispatch_form(conn, attrs, entity_or_test_selector)

 @doc """
 Works like `submit_form/3`. The test_selector is used to find the right form and the
 entity is used to find and fill the inputs correctly.
Expand All@@ -78,6 +77,14 @@ defmodule TestDispatch do
 def submit_form(conn, attrs, entity, test_selector),
 do: dispatch_form(conn, attrs, entity, test_selector)

 @spec submit_form(Plug.Conn.t(), %{}, binary()) :: Plug.Conn.t()
@EasterPeanutEasterPeanutOct 22, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

@specsubmit_form(Plug.Conn.t(),%{},binary())::Plug.Conn.t()
@specsubmit_with_button(Plug.Conn.t(),%{},binary())::Plug.Conn.t()
@fatboypunkfatboypunkOct 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!
 def submit_with_button(%Plug.Conn{} = conn, attrs \\ %{}, button_text) do
 {form, _} = find_form(conn, button_text: button_text)
 selector_tuple = {:button_text, button_text}

 _dispatch_form(conn, form, selector_tuple, attrs)
 end

 @doc """
 Finds a link by a given conn, test_selector and an optional test_value.

Expand DownExpand Up@@ -148,8 +155,6 @@ defmodule TestDispatch do
 |> find_link(test_selector, test_value)
 |> _dispatch_link(conn)

 @spec dispatch_link(nil | Floki.html_tree(), Plug.Conn.t(), binary(), binary() | nil) ::
 Plug.Conn.t()
 def click_link(conn, test_selector, test_value, tree),
 do: dispatch_link(conn, test_selector, test_value, tree)

Expand Down

91 changes: 84 additions & 7 deletions
lib/test_dispatch/form.ex

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,15 +9,43 @@ defmodule TestDispatch.Form do
 def find_inputs(form, {:entity, _} = entity_tuple),
 do: find_input_fields(form, entity_tuple)

 def find_inputs(form, {:button_text, button_text}) do
 button = find_buttons(form, button_text)
Comment thread
fatboypunk marked this conversation as resolved.


 if button,
 do: [button | find_default_inputs(form)],
 else: find_default_inputs(form)
 end

 def find_inputs(form, _) do
 find_default_inputs(form)
 end

 defp find_default_inputs(form) do
 fields = find_input_fields(form, "")
 selects = find_selects(form, "")
 textareas = find_textareas(form, "")
 radio_buttons = find_radio_buttons(form, "")

 Enum.uniq(fields ++ selects ++ textareas ++ radio_buttons)
 end

 def find_buttons(form, button_text),
Comment thread
fatboypunk marked this conversation as resolved.

 do:
 find_submit_input(form, button_text) ||
 find_submit_button(form, button_text)

 defp find_submit_button(form, button_text) do
 form
 |> Floki.find("button[type=submit]")
 |> Enum.find(&contains_button_text?(&1, button_text))
 end

 defp find_submit_input(form, button_text) do
 form
 |> Floki.find("input[type=submit]")
 |> Enum.find(&contains_button_text?(&1, button_text))
 end

 def find_radio_buttons(form, "") do
 radios = Floki.find(form, "input[type=radio]")

Expand All@@ -28,7 +56,7 @@ defmodule TestDispatch.Form do
 other_radios =
 radios
 |> Enum.uniq_by(fn {_, list, _} ->
list |> Enum.find(fn {key, _} -> "name" == key end) |> elem(1)
 Enum.find(list, fn {key, _} -> "name" == key end) |> elem(1)
 end)
 |> Enum.reject(fn radio -> floki_attribute(radio, "name") in checked_names end)

Expand DownExpand Up@@ -72,6 +100,9 @@ defmodule TestDispatch.Form do
 new_nested_list = update_nested_input_values(acc_nested_list, tuple, nested_attr)

 Map.put(acc, key, new_nested_list)

 {} ->
 acc
 end
 end)
 end
Expand All@@ -80,11 +111,13 @@ defmodule TestDispatch.Form do
 value = input |> elem(0) |> _input_to_tuple([input])

 case input |> key_for_input(entity_tuple) |> resolve_nested() do
 nil -> {}
 {key, index, nested_key} -> {key, index, {nested_key, value}}
 key -> {key, value}
 end
 end

 defp _input_to_tuple("button", input), do: Floki.text(input)
 defp _input_to_tuple("textarea", input), do: Floki.text(input)
 defp _input_to_tuple("input", input), do: floki_attribute(input, "value")

Expand All@@ -102,14 +135,19 @@ defmodule TestDispatch.Form do
 String.replace_prefix(key, "#{entity}_", "")
 end

 defp key_for_input({"button", _, _} = input, _), do: floki_attribute(input, "name")

 defp key_for_input(input, _) do
 name = floki_attribute(input, "name")
 id = floki_attribute(input, "id")

 if floki_attribute(input, "type") == "radio",
 do: String.replace_suffix(id, "_#{floki_attribute(input, "value")}", ""),
 do: name,
 else: id
 end

 defp resolve_nested(nil), do: nil

 defp resolve_nested(key) do
 case Regex.split(~r{_\d*_}, key, include_captures: true) do
 [key, capture, nested_key] ->
Expand DownExpand Up@@ -171,13 +209,27 @@ defmodule TestDispatch.Form do
 "The provided conn had the status #{status} that doesn't fall into the 2xx range"
 )

 def find_form_by(form, nil), do: {List.last(form), nil}
 def find_form_by(forms, nil), do: {List.last(forms), nil}

 def find_form_by(form, entity_or_test_selector) do
 test_selector_result = Enum.find(form, &find_test_selector(&1, entity_or_test_selector))
 def find_form_by(forms, button_text: button_text) do
 form = Enum.find(forms, &contains_button_text?(&1, button_text))

 if form,
 do: {form, :button_text},
 else:
 raise("""
 No form found for the given button text: #{button_text}
 Found the button texts:

 #{all_buttons(forms)}
 """)
 end

 def find_form_by(forms, entity_or_test_selector) do
 test_selector_result = Enum.find(forms, &find_test_selector(&1, entity_or_test_selector))

 entity_result =
 Enum.find(form, &(&1 |> Floki.find("*[id^=#{entity_or_test_selector}_]") |> Enum.any?()))
 Enum.find(forms, &(&1 |> Floki.find("*[id^=#{entity_or_test_selector}_]") |> Enum.any?()))

 cond do
 is_tuple(test_selector_result) ->
Expand All@@ -204,4 +256,29 @@ defmodule TestDispatch.Form do
 |> html_response(status)
 |> Floki.parse_document!()
 end

 defp contains_button_text?(form, button_text) do
 input_submit =
 form
 |> Floki.find("input[type=submit]")
 |> Enum.any?(&(text(&1) == button_text))

 button_submit =
 form
 |> Floki.find("button[type=submit]")
 |> Enum.any?(&(text(&1) == button_text))

 input_submit || button_submit
 end

 def text(html_tree),
@EasterPeanutEasterPeanutOct 22, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

deftext(html_tree),
defptext(html_tree),
@fatboypunkfatboypunkOct 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm yeah i'm moving this later in #97.
 do: html_tree |> Floki.text() |> String.replace(~r/\s+/, " ") |> String.trim()

 defp all_buttons(html_tree) do
@EasterPeanutEasterPeanutOct 22, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

defpall_buttons(html_tree)do
defpall_submit_controls(html_tree)do
or something like it? :p
@fatboypunkfatboypunkOct 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah nice i'll update this in #97
 all_submit_buttons = html_tree |> Floki.find("button[type=submit]")
 all_submit_inputs = html_tree |> Floki.find("input[type=submit]")

 (all_submit_inputs ++ all_submit_buttons)
 |> Enum.map(&(text([&1]) <> "\n "))
 end
end

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Marcel/submit with button#94

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

 Closed

fatboypunk
wants to merge
3
commits into

from

 Closed


Marcel/submit with button
#94
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0f8629b

Submit forms with a button


fatboypunk Oct 20, 2021
a2c1652

push _dispatch_form below the usage of it


fatboypunk Oct 20, 2021
89cee46

take the name from the radio input


fatboypunk Oct 21, 2021

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


29 changes: 17 additions & 12 deletions
lib/test_dispatch.ex

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,12 +36,7 @@ defmodule TestDispatch do
 {form, selector_type} = find_form(conn, entity_or_test_selector)
 selector_tuple = {selector_type, entity_or_test_selector}

 form
 |> find_inputs(selector_tuple)
 |> Enum.map(&input_to_tuple(&1, selector_tuple))
 |> update_input_values(attrs)
 |> prepend_entity(selector_tuple)
 |> send_to_action(form, conn)
 _dispatch_form(conn, form, selector_tuple, attrs)
 end

 def dispatch_form(conn, entity_or_test_selector, nil),
Expand All@@ -57,6 +52,14 @@ defmodule TestDispatch do
 {form, _} = find_form(conn, test_selector)
 selector_tuple = {:entity, entity}

 _dispatch_form(conn, form, selector_tuple, attrs)
 end

 @spec submit_form(Plug.Conn.t(), %{}, binary() | atom() | nil) :: Plug.Conn.t()
 def submit_form(conn, attrs \\ %{}, entity_or_test_selector \\ nil),
 do: dispatch_form(conn, attrs, entity_or_test_selector)

 defp _dispatch_form(conn, form, selector_tuple, attrs) do
 form
 |> find_inputs(selector_tuple)
 |> Enum.map(&input_to_tuple(&1, selector_tuple))
Expand All@@ -65,10 +68,6 @@ defmodule TestDispatch do
 |> send_to_action(form, conn)
 end

 @spec submit_form(Plug.Conn.t(), %{}, binary() | atom() | nil) :: Plug.Conn.t()
 def submit_form(conn, attrs, entity_or_test_selector),
 do: dispatch_form(conn, attrs, entity_or_test_selector)

 @doc """
 Works like `submit_form/3`. The test_selector is used to find the right form and the
 entity is used to find and fill the inputs correctly.
Expand All@@ -78,6 +77,14 @@ defmodule TestDispatch do
 def submit_form(conn, attrs, entity, test_selector),
 do: dispatch_form(conn, attrs, entity, test_selector)

 @spec submit_form(Plug.Conn.t(), %{}, binary()) :: Plug.Conn.t()
@EasterPeanutEasterPeanutOct 22, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

@specsubmit_form(Plug.Conn.t(),%{},binary())::Plug.Conn.t()
@specsubmit_with_button(Plug.Conn.t(),%{},binary())::Plug.Conn.t()
@fatboypunkfatboypunkOct 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!
 def submit_with_button(%Plug.Conn{} = conn, attrs \\ %{}, button_text) do
 {form, _} = find_form(conn, button_text: button_text)
 selector_tuple = {:button_text, button_text}

 _dispatch_form(conn, form, selector_tuple, attrs)
 end

 @doc """
 Finds a link by a given conn, test_selector and an optional test_value.

Expand DownExpand Up@@ -148,8 +155,6 @@ defmodule TestDispatch do
 |> find_link(test_selector, test_value)
 |> _dispatch_link(conn)

 @spec dispatch_link(nil | Floki.html_tree(), Plug.Conn.t(), binary(), binary() | nil) ::
 Plug.Conn.t()
 def click_link(conn, test_selector, test_value, tree),
 do: dispatch_link(conn, test_selector, test_value, tree)

Expand Down

91 changes: 84 additions & 7 deletions
lib/test_dispatch/form.ex

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,15 +9,43 @@ defmodule TestDispatch.Form do
 def find_inputs(form, {:entity, _} = entity_tuple),
 do: find_input_fields(form, entity_tuple)

 def find_inputs(form, {:button_text, button_text}) do
 button = find_buttons(form, button_text)
Comment thread
fatboypunk marked this conversation as resolved.


 if button,
 do: [button | find_default_inputs(form)],
 else: find_default_inputs(form)
 end

 def find_inputs(form, _) do
 find_default_inputs(form)
 end

 defp find_default_inputs(form) do
 fields = find_input_fields(form, "")
 selects = find_selects(form, "")
 textareas = find_textareas(form, "")
 radio_buttons = find_radio_buttons(form, "")

 Enum.uniq(fields ++ selects ++ textareas ++ radio_buttons)
 end

 def find_buttons(form, button_text),
Comment thread
fatboypunk marked this conversation as resolved.

 do:
 find_submit_input(form, button_text) ||
 find_submit_button(form, button_text)

 defp find_submit_button(form, button_text) do
 form
 |> Floki.find("button[type=submit]")
 |> Enum.find(&contains_button_text?(&1, button_text))
 end

 defp find_submit_input(form, button_text) do
 form
 |> Floki.find("input[type=submit]")
 |> Enum.find(&contains_button_text?(&1, button_text))
 end

 def find_radio_buttons(form, "") do
 radios = Floki.find(form, "input[type=radio]")

Expand All@@ -28,7 +56,7 @@ defmodule TestDispatch.Form do
 other_radios =
 radios
 |> Enum.uniq_by(fn {_, list, _} ->
list |> Enum.find(fn {key, _} -> "name" == key end) |> elem(1)
 Enum.find(list, fn {key, _} -> "name" == key end) |> elem(1)
 end)
 |> Enum.reject(fn radio -> floki_attribute(radio, "name") in checked_names end)

Expand DownExpand Up@@ -72,6 +100,9 @@ defmodule TestDispatch.Form do
 new_nested_list = update_nested_input_values(acc_nested_list, tuple, nested_attr)

 Map.put(acc, key, new_nested_list)

 {} ->
 acc
 end
 end)
 end
Expand All@@ -80,11 +111,13 @@ defmodule TestDispatch.Form do
 value = input |> elem(0) |> _input_to_tuple([input])

 case input |> key_for_input(entity_tuple) |> resolve_nested() do
 nil -> {}
 {key, index, nested_key} -> {key, index, {nested_key, value}}
 key -> {key, value}
 end
 end

 defp _input_to_tuple("button", input), do: Floki.text(input)
 defp _input_to_tuple("textarea", input), do: Floki.text(input)
 defp _input_to_tuple("input", input), do: floki_attribute(input, "value")

Expand All@@ -102,14 +135,19 @@ defmodule TestDispatch.Form do
 String.replace_prefix(key, "#{entity}_", "")
 end

 defp key_for_input({"button", _, _} = input, _), do: floki_attribute(input, "name")

 defp key_for_input(input, _) do
 name = floki_attribute(input, "name")
 id = floki_attribute(input, "id")

 if floki_attribute(input, "type") == "radio",
 do: String.replace_suffix(id, "_#{floki_attribute(input, "value")}", ""),
 do: name,
 else: id
 end

 defp resolve_nested(nil), do: nil

 defp resolve_nested(key) do
 case Regex.split(~r{_\d*_}, key, include_captures: true) do
 [key, capture, nested_key] ->
Expand DownExpand Up@@ -171,13 +209,27 @@ defmodule TestDispatch.Form do
 "The provided conn had the status #{status} that doesn't fall into the 2xx range"
 )

 def find_form_by(form, nil), do: {List.last(form), nil}
 def find_form_by(forms, nil), do: {List.last(forms), nil}

 def find_form_by(form, entity_or_test_selector) do
 test_selector_result = Enum.find(form, &find_test_selector(&1, entity_or_test_selector))
 def find_form_by(forms, button_text: button_text) do
 form = Enum.find(forms, &contains_button_text?(&1, button_text))

 if form,
 do: {form, :button_text},
 else:
 raise("""
 No form found for the given button text: #{button_text}
 Found the button texts:

 #{all_buttons(forms)}
 """)
 end

 def find_form_by(forms, entity_or_test_selector) do
 test_selector_result = Enum.find(forms, &find_test_selector(&1, entity_or_test_selector))

 entity_result =
 Enum.find(form, &(&1 |> Floki.find("*[id^=#{entity_or_test_selector}_]") |> Enum.any?()))
 Enum.find(forms, &(&1 |> Floki.find("*[id^=#{entity_or_test_selector}_]") |> Enum.any?()))

 cond do
 is_tuple(test_selector_result) ->
Expand All@@ -204,4 +256,29 @@ defmodule TestDispatch.Form do
 |> html_response(status)
 |> Floki.parse_document!()
 end

 defp contains_button_text?(form, button_text) do
 input_submit =
 form
 |> Floki.find("input[type=submit]")
 |> Enum.any?(&(text(&1) == button_text))

 button_submit =
 form
 |> Floki.find("button[type=submit]")
 |> Enum.any?(&(text(&1) == button_text))

 input_submit || button_submit
 end

 def text(html_tree),
@EasterPeanutEasterPeanutOct 22, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

deftext(html_tree),
defptext(html_tree),
@fatboypunkfatboypunkOct 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm yeah i'm moving this later in #97.
 do: html_tree |> Floki.text() |> String.replace(~r/\s+/, " ") |> String.trim()

 defp all_buttons(html_tree) do
@EasterPeanutEasterPeanutOct 22, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

defpall_buttons(html_tree)do
defpall_submit_controls(html_tree)do
or something like it? :p
@fatboypunkfatboypunkOct 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah nice i'll update this in #97
 all_submit_buttons = html_tree |> Floki.find("button[type=submit]")
 all_submit_inputs = html_tree |> Floki.find("input[type=submit]")

 (all_submit_inputs ++ all_submit_buttons)
 |> Enum.map(&(text([&1]) <> "\n "))
 end
end

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Marcel/submit with button#94

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

 Closed

fatboypunk
wants to merge
3
commits into

from

 Closed


Marcel/submit with button
#94
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0f8629b

Submit forms with a button


fatboypunk Oct 20, 2021
a2c1652

push _dispatch_form below the usage of it


fatboypunk Oct 20, 2021
89cee46

take the name from the radio input


fatboypunk Oct 21, 2021

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


29 changes: 17 additions & 12 deletions
lib/test_dispatch.ex

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,12 +36,7 @@ defmodule TestDispatch do
 {form, selector_type} = find_form(conn, entity_or_test_selector)
 selector_tuple = {selector_type, entity_or_test_selector}

 form
 |> find_inputs(selector_tuple)
 |> Enum.map(&input_to_tuple(&1, selector_tuple))
 |> update_input_values(attrs)
 |> prepend_entity(selector_tuple)
 |> send_to_action(form, conn)
 _dispatch_form(conn, form, selector_tuple, attrs)
 end

 def dispatch_form(conn, entity_or_test_selector, nil),
Expand All@@ -57,6 +52,14 @@ defmodule TestDispatch do
 {form, _} = find_form(conn, test_selector)
 selector_tuple = {:entity, entity}

 _dispatch_form(conn, form, selector_tuple, attrs)
 end

 @spec submit_form(Plug.Conn.t(), %{}, binary() | atom() | nil) :: Plug.Conn.t()
 def submit_form(conn, attrs \\ %{}, entity_or_test_selector \\ nil),
 do: dispatch_form(conn, attrs, entity_or_test_selector)

 defp _dispatch_form(conn, form, selector_tuple, attrs) do
 form
 |> find_inputs(selector_tuple)
 |> Enum.map(&input_to_tuple(&1, selector_tuple))
Expand All@@ -65,10 +68,6 @@ defmodule TestDispatch do
 |> send_to_action(form, conn)
 end

 @spec submit_form(Plug.Conn.t(), %{}, binary() | atom() | nil) :: Plug.Conn.t()
 def submit_form(conn, attrs, entity_or_test_selector),
 do: dispatch_form(conn, attrs, entity_or_test_selector)

 @doc """
 Works like `submit_form/3`. The test_selector is used to find the right form and the
 entity is used to find and fill the inputs correctly.
Expand All@@ -78,6 +77,14 @@ defmodule TestDispatch do
 def submit_form(conn, attrs, entity, test_selector),
 do: dispatch_form(conn, attrs, entity, test_selector)

 @spec submit_form(Plug.Conn.t(), %{}, binary()) :: Plug.Conn.t()
@EasterPeanutEasterPeanutOct 22, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

@specsubmit_form(Plug.Conn.t(),%{},binary())::Plug.Conn.t()
@specsubmit_with_button(Plug.Conn.t(),%{},binary())::Plug.Conn.t()
@fatboypunkfatboypunkOct 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!
 def submit_with_button(%Plug.Conn{} = conn, attrs \\ %{}, button_text) do
 {form, _} = find_form(conn, button_text: button_text)
 selector_tuple = {:button_text, button_text}

 _dispatch_form(conn, form, selector_tuple, attrs)
 end

 @doc """
 Finds a link by a given conn, test_selector and an optional test_value.

Expand DownExpand Up@@ -148,8 +155,6 @@ defmodule TestDispatch do
 |> find_link(test_selector, test_value)
 |> _dispatch_link(conn)

 @spec dispatch_link(nil | Floki.html_tree(), Plug.Conn.t(), binary(), binary() | nil) ::
 Plug.Conn.t()
 def click_link(conn, test_selector, test_value, tree),
 do: dispatch_link(conn, test_selector, test_value, tree)

Expand Down

91 changes: 84 additions & 7 deletions
lib/test_dispatch/form.ex

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,15 +9,43 @@ defmodule TestDispatch.Form do
 def find_inputs(form, {:entity, _} = entity_tuple),
 do: find_input_fields(form, entity_tuple)

 def find_inputs(form, {:button_text, button_text}) do
 button = find_buttons(form, button_text)
Comment thread
fatboypunk marked this conversation as resolved.


 if button,
 do: [button | find_default_inputs(form)],
 else: find_default_inputs(form)
 end

 def find_inputs(form, _) do
 find_default_inputs(form)
 end

 defp find_default_inputs(form) do
 fields = find_input_fields(form, "")
 selects = find_selects(form, "")
 textareas = find_textareas(form, "")
 radio_buttons = find_radio_buttons(form, "")

 Enum.uniq(fields ++ selects ++ textareas ++ radio_buttons)
 end

 def find_buttons(form, button_text),
Comment thread
fatboypunk marked this conversation as resolved.

 do:
 find_submit_input(form, button_text) ||
 find_submit_button(form, button_text)

 defp find_submit_button(form, button_text) do
 form
 |> Floki.find("button[type=submit]")
 |> Enum.find(&contains_button_text?(&1, button_text))
 end

 defp find_submit_input(form, button_text) do
 form
 |> Floki.find("input[type=submit]")
 |> Enum.find(&contains_button_text?(&1, button_text))
 end

 def find_radio_buttons(form, "") do
 radios = Floki.find(form, "input[type=radio]")

Expand All@@ -28,7 +56,7 @@ defmodule TestDispatch.Form do
 other_radios =
 radios
 |> Enum.uniq_by(fn {_, list, _} ->
list |> Enum.find(fn {key, _} -> "name" == key end) |> elem(1)
 Enum.find(list, fn {key, _} -> "name" == key end) |> elem(1)
 end)
 |> Enum.reject(fn radio -> floki_attribute(radio, "name") in checked_names end)

Expand DownExpand Up@@ -72,6 +100,9 @@ defmodule TestDispatch.Form do
 new_nested_list = update_nested_input_values(acc_nested_list, tuple, nested_attr)

 Map.put(acc, key, new_nested_list)

 {} ->
 acc
 end
 end)
 end
Expand All@@ -80,11 +111,13 @@ defmodule TestDispatch.Form do
 value = input |> elem(0) |> _input_to_tuple([input])

 case input |> key_for_input(entity_tuple) |> resolve_nested() do
 nil -> {}
 {key, index, nested_key} -> {key, index, {nested_key, value}}
 key -> {key, value}
 end
 end

 defp _input_to_tuple("button", input), do: Floki.text(input)
 defp _input_to_tuple("textarea", input), do: Floki.text(input)
 defp _input_to_tuple("input", input), do: floki_attribute(input, "value")

Expand All@@ -102,14 +135,19 @@ defmodule TestDispatch.Form do
 String.replace_prefix(key, "#{entity}_", "")
 end

 defp key_for_input({"button", _, _} = input, _), do: floki_attribute(input, "name")

 defp key_for_input(input, _) do
 name = floki_attribute(input, "name")
 id = floki_attribute(input, "id")

 if floki_attribute(input, "type") == "radio",
 do: String.replace_suffix(id, "_#{floki_attribute(input, "value")}", ""),
 do: name,
 else: id
 end

 defp resolve_nested(nil), do: nil

 defp resolve_nested(key) do
 case Regex.split(~r{_\d*_}, key, include_captures: true) do
 [key, capture, nested_key] ->
Expand DownExpand Up@@ -171,13 +209,27 @@ defmodule TestDispatch.Form do
 "The provided conn had the status #{status} that doesn't fall into the 2xx range"
 )

 def find_form_by(form, nil), do: {List.last(form), nil}
 def find_form_by(forms, nil), do: {List.last(forms), nil}

 def find_form_by(form, entity_or_test_selector) do
 test_selector_result = Enum.find(form, &find_test_selector(&1, entity_or_test_selector))
 def find_form_by(forms, button_text: button_text) do
 form = Enum.find(forms, &contains_button_text?(&1, button_text))

 if form,
 do: {form, :button_text},
 else:
 raise("""
 No form found for the given button text: #{button_text}
 Found the button texts:

 #{all_buttons(forms)}
 """)
 end

 def find_form_by(forms, entity_or_test_selector) do
 test_selector_result = Enum.find(forms, &find_test_selector(&1, entity_or_test_selector))

 entity_result =
 Enum.find(form, &(&1 |> Floki.find("*[id^=#{entity_or_test_selector}_]") |> Enum.any?()))
 Enum.find(forms, &(&1 |> Floki.find("*[id^=#{entity_or_test_selector}_]") |> Enum.any?()))

 cond do
 is_tuple(test_selector_result) ->
Expand All@@ -204,4 +256,29 @@ defmodule TestDispatch.Form do
 |> html_response(status)
 |> Floki.parse_document!()
 end

 defp contains_button_text?(form, button_text) do
 input_submit =
 form
 |> Floki.find("input[type=submit]")
 |> Enum.any?(&(text(&1) == button_text))

 button_submit =
 form
 |> Floki.find("button[type=submit]")
 |> Enum.any?(&(text(&1) == button_text))

 input_submit || button_submit
 end

 def text(html_tree),
@EasterPeanutEasterPeanutOct 22, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

deftext(html_tree),
defptext(html_tree),
@fatboypunkfatboypunkOct 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm yeah i'm moving this later in #97.
 do: html_tree |> Floki.text() |> String.replace(~r/\s+/, " ") |> String.trim()

 defp all_buttons(html_tree) do
@EasterPeanutEasterPeanutOct 22, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

defpall_buttons(html_tree)do
defpall_submit_controls(html_tree)do
or something like it? :p
@fatboypunkfatboypunkOct 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah nice i'll update this in #97
 all_submit_buttons = html_tree |> Floki.find("button[type=submit]")
 all_submit_inputs = html_tree |> Floki.find("input[type=submit]")

 (all_submit_inputs ++ all_submit_buttons)
 |> Enum.map(&(text([&1]) <> "\n "))
 end
end

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Marcel/submit with button#94

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

 Closed

fatboypunk
wants to merge
3
commits into

from

 Closed


Marcel/submit with button
#94
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0f8629b

Submit forms with a button


fatboypunk Oct 20, 2021
a2c1652

push _dispatch_form below the usage of it


fatboypunk Oct 20, 2021
89cee46

take the name from the radio input


fatboypunk Oct 21, 2021

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


29 changes: 17 additions & 12 deletions
lib/test_dispatch.ex

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,12 +36,7 @@ defmodule TestDispatch do
 {form, selector_type} = find_form(conn, entity_or_test_selector)
 selector_tuple = {selector_type, entity_or_test_selector}

 form
 |> find_inputs(selector_tuple)
 |> Enum.map(&input_to_tuple(&1, selector_tuple))
 |> update_input_values(attrs)
 |> prepend_entity(selector_tuple)
 |> send_to_action(form, conn)
 _dispatch_form(conn, form, selector_tuple, attrs)
 end

 def dispatch_form(conn, entity_or_test_selector, nil),
Expand All@@ -57,6 +52,14 @@ defmodule TestDispatch do
 {form, _} = find_form(conn, test_selector)
 selector_tuple = {:entity, entity}

 _dispatch_form(conn, form, selector_tuple, attrs)
 end

 @spec submit_form(Plug.Conn.t(), %{}, binary() | atom() | nil) :: Plug.Conn.t()
 def submit_form(conn, attrs \\ %{}, entity_or_test_selector \\ nil),
 do: dispatch_form(conn, attrs, entity_or_test_selector)

 defp _dispatch_form(conn, form, selector_tuple, attrs) do
 form
 |> find_inputs(selector_tuple)
 |> Enum.map(&input_to_tuple(&1, selector_tuple))
Expand All@@ -65,10 +68,6 @@ defmodule TestDispatch do
 |> send_to_action(form, conn)
 end

 @spec submit_form(Plug.Conn.t(), %{}, binary() | atom() | nil) :: Plug.Conn.t()
 def submit_form(conn, attrs, entity_or_test_selector),
 do: dispatch_form(conn, attrs, entity_or_test_selector)

 @doc """
 Works like `submit_form/3`. The test_selector is used to find the right form and the
 entity is used to find and fill the inputs correctly.
Expand All@@ -78,6 +77,14 @@ defmodule TestDispatch do
 def submit_form(conn, attrs, entity, test_selector),
 do: dispatch_form(conn, attrs, entity, test_selector)

 @spec submit_form(Plug.Conn.t(), %{}, binary()) :: Plug.Conn.t()
@EasterPeanutEasterPeanutOct 22, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

@specsubmit_form(Plug.Conn.t(),%{},binary())::Plug.Conn.t()
@specsubmit_with_button(Plug.Conn.t(),%{},binary())::Plug.Conn.t()
@fatboypunkfatboypunkOct 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!
 def submit_with_button(%Plug.Conn{} = conn, attrs \\ %{}, button_text) do
 {form, _} = find_form(conn, button_text: button_text)
 selector_tuple = {:button_text, button_text}

 _dispatch_form(conn, form, selector_tuple, attrs)
 end

 @doc """
 Finds a link by a given conn, test_selector and an optional test_value.

Expand DownExpand Up@@ -148,8 +155,6 @@ defmodule TestDispatch do
 |> find_link(test_selector, test_value)
 |> _dispatch_link(conn)

 @spec dispatch_link(nil | Floki.html_tree(), Plug.Conn.t(), binary(), binary() | nil) ::
 Plug.Conn.t()
 def click_link(conn, test_selector, test_value, tree),
 do: dispatch_link(conn, test_selector, test_value, tree)

Expand Down

91 changes: 84 additions & 7 deletions
lib/test_dispatch/form.ex

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,15 +9,43 @@ defmodule TestDispatch.Form do
 def find_inputs(form, {:entity, _} = entity_tuple),
 do: find_input_fields(form, entity_tuple)

 def find_inputs(form, {:button_text, button_text}) do
 button = find_buttons(form, button_text)
Comment thread
fatboypunk marked this conversation as resolved.


 if button,
 do: [button | find_default_inputs(form)],
 else: find_default_inputs(form)
 end

 def find_inputs(form, _) do
 find_default_inputs(form)
 end

 defp find_default_inputs(form) do
 fields = find_input_fields(form, "")
 selects = find_selects(form, "")
 textareas = find_textareas(form, "")
 radio_buttons = find_radio_buttons(form, "")

 Enum.uniq(fields ++ selects ++ textareas ++ radio_buttons)
 end

 def find_buttons(form, button_text),
Comment thread
fatboypunk marked this conversation as resolved.

 do:
 find_submit_input(form, button_text) ||
 find_submit_button(form, button_text)

 defp find_submit_button(form, button_text) do
 form
 |> Floki.find("button[type=submit]")
 |> Enum.find(&contains_button_text?(&1, button_text))
 end

 defp find_submit_input(form, button_text) do
 form
 |> Floki.find("input[type=submit]")
 |> Enum.find(&contains_button_text?(&1, button_text))
 end

 def find_radio_buttons(form, "") do
 radios = Floki.find(form, "input[type=radio]")

Expand All@@ -28,7 +56,7 @@ defmodule TestDispatch.Form do
 other_radios =
 radios
 |> Enum.uniq_by(fn {_, list, _} ->
list |> Enum.find(fn {key, _} -> "name" == key end) |> elem(1)
 Enum.find(list, fn {key, _} -> "name" == key end) |> elem(1)
 end)
 |> Enum.reject(fn radio -> floki_attribute(radio, "name") in checked_names end)

Expand DownExpand Up@@ -72,6 +100,9 @@ defmodule TestDispatch.Form do
 new_nested_list = update_nested_input_values(acc_nested_list, tuple, nested_attr)

 Map.put(acc, key, new_nested_list)

 {} ->
 acc
 end
 end)
 end
Expand All@@ -80,11 +111,13 @@ defmodule TestDispatch.Form do
 value = input |> elem(0) |> _input_to_tuple([input])

 case input |> key_for_input(entity_tuple) |> resolve_nested() do
 nil -> {}
 {key, index, nested_key} -> {key, index, {nested_key, value}}
 key -> {key, value}
 end
 end

 defp _input_to_tuple("button", input), do: Floki.text(input)
 defp _input_to_tuple("textarea", input), do: Floki.text(input)
 defp _input_to_tuple("input", input), do: floki_attribute(input, "value")

Expand All@@ -102,14 +135,19 @@ defmodule TestDispatch.Form do
 String.replace_prefix(key, "#{entity}_", "")
 end

 defp key_for_input({"button", _, _} = input, _), do: floki_attribute(input, "name")

 defp key_for_input(input, _) do
 name = floki_attribute(input, "name")
 id = floki_attribute(input, "id")

 if floki_attribute(input, "type") == "radio",
 do: String.replace_suffix(id, "_#{floki_attribute(input, "value")}", ""),
 do: name,
 else: id
 end

 defp resolve_nested(nil), do: nil

 defp resolve_nested(key) do
 case Regex.split(~r{_\d*_}, key, include_captures: true) do
 [key, capture, nested_key] ->
Expand DownExpand Up@@ -171,13 +209,27 @@ defmodule TestDispatch.Form do
 "The provided conn had the status #{status} that doesn't fall into the 2xx range"
 )

 def find_form_by(form, nil), do: {List.last(form), nil}
 def find_form_by(forms, nil), do: {List.last(forms), nil}

 def find_form_by(form, entity_or_test_selector) do
 test_selector_result = Enum.find(form, &find_test_selector(&1, entity_or_test_selector))
 def find_form_by(forms, button_text: button_text) do
 form = Enum.find(forms, &contains_button_text?(&1, button_text))

 if form,
 do: {form, :button_text},
 else:
 raise("""
 No form found for the given button text: #{button_text}
 Found the button texts:

 #{all_buttons(forms)}
 """)
 end

 def find_form_by(forms, entity_or_test_selector) do
 test_selector_result = Enum.find(forms, &find_test_selector(&1, entity_or_test_selector))

 entity_result =
 Enum.find(form, &(&1 |> Floki.find("*[id^=#{entity_or_test_selector}_]") |> Enum.any?()))
 Enum.find(forms, &(&1 |> Floki.find("*[id^=#{entity_or_test_selector}_]") |> Enum.any?()))

 cond do
 is_tuple(test_selector_result) ->
Expand All@@ -204,4 +256,29 @@ defmodule TestDispatch.Form do
 |> html_response(status)
 |> Floki.parse_document!()
 end

 defp contains_button_text?(form, button_text) do
 input_submit =
 form
 |> Floki.find("input[type=submit]")
 |> Enum.any?(&(text(&1) == button_text))

 button_submit =
 form
 |> Floki.find("button[type=submit]")
 |> Enum.any?(&(text(&1) == button_text))

 input_submit || button_submit
 end

 def text(html_tree),
@EasterPeanutEasterPeanutOct 22, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

deftext(html_tree),
defptext(html_tree),
@fatboypunkfatboypunkOct 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm yeah i'm moving this later in #97.
 do: html_tree |> Floki.text() |> String.replace(~r/\s+/, " ") |> String.trim()

 defp all_buttons(html_tree) do
@EasterPeanutEasterPeanutOct 22, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

defpall_buttons(html_tree)do
defpall_submit_controls(html_tree)do
or something like it? :p
@fatboypunkfatboypunkOct 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah nice i'll update this in #97
 all_submit_buttons = html_tree |> Floki.find("button[type=submit]")
 all_submit_inputs = html_tree |> Floki.find("input[type=submit]")

 (all_submit_inputs ++ all_submit_buttons)
 |> Enum.map(&(text([&1]) <> "\n "))
 end
end

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Marcel/submit with button#94

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

 Closed

fatboypunk
wants to merge
3
commits into

from

 Closed


Marcel/submit with button
#94
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0f8629b

Submit forms with a button


fatboypunk Oct 20, 2021
a2c1652

push _dispatch_form below the usage of it


fatboypunk Oct 20, 2021
89cee46

take the name from the radio input


fatboypunk Oct 21, 2021

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


29 changes: 17 additions & 12 deletions
lib/test_dispatch.ex

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,12 +36,7 @@ defmodule TestDispatch do
 {form, selector_type} = find_form(conn, entity_or_test_selector)
 selector_tuple = {selector_type, entity_or_test_selector}

 form
 |> find_inputs(selector_tuple)
 |> Enum.map(&input_to_tuple(&1, selector_tuple))
 |> update_input_values(attrs)
 |> prepend_entity(selector_tuple)
 |> send_to_action(form, conn)
 _dispatch_form(conn, form, selector_tuple, attrs)
 end

 def dispatch_form(conn, entity_or_test_selector, nil),
Expand All@@ -57,6 +52,14 @@ defmodule TestDispatch do
 {form, _} = find_form(conn, test_selector)
 selector_tuple = {:entity, entity}

 _dispatch_form(conn, form, selector_tuple, attrs)
 end

 @spec submit_form(Plug.Conn.t(), %{}, binary() | atom() | nil) :: Plug.Conn.t()
 def submit_form(conn, attrs \\ %{}, entity_or_test_selector \\ nil),
 do: dispatch_form(conn, attrs, entity_or_test_selector)

 defp _dispatch_form(conn, form, selector_tuple, attrs) do
 form
 |> find_inputs(selector_tuple)
 |> Enum.map(&input_to_tuple(&1, selector_tuple))
Expand All@@ -65,10 +68,6 @@ defmodule TestDispatch do
 |> send_to_action(form, conn)
 end

 @spec submit_form(Plug.Conn.t(), %{}, binary() | atom() | nil) :: Plug.Conn.t()
 def submit_form(conn, attrs, entity_or_test_selector),
 do: dispatch_form(conn, attrs, entity_or_test_selector)

 @doc """
 Works like `submit_form/3`. The test_selector is used to find the right form and the
 entity is used to find and fill the inputs correctly.
Expand All@@ -78,6 +77,14 @@ defmodule TestDispatch do
 def submit_form(conn, attrs, entity, test_selector),
 do: dispatch_form(conn, attrs, entity, test_selector)

 @spec submit_form(Plug.Conn.t(), %{}, binary()) :: Plug.Conn.t()
@EasterPeanutEasterPeanutOct 22, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

@specsubmit_form(Plug.Conn.t(),%{},binary())::Plug.Conn.t()
@specsubmit_with_button(Plug.Conn.t(),%{},binary())::Plug.Conn.t()
@fatboypunkfatboypunkOct 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!
 def submit_with_button(%Plug.Conn{} = conn, attrs \\ %{}, button_text) do
 {form, _} = find_form(conn, button_text: button_text)
 selector_tuple = {:button_text, button_text}

 _dispatch_form(conn, form, selector_tuple, attrs)
 end

 @doc """
 Finds a link by a given conn, test_selector and an optional test_value.

Expand DownExpand Up@@ -148,8 +155,6 @@ defmodule TestDispatch do
 |> find_link(test_selector, test_value)
 |> _dispatch_link(conn)

 @spec dispatch_link(nil | Floki.html_tree(), Plug.Conn.t(), binary(), binary() | nil) ::
 Plug.Conn.t()
 def click_link(conn, test_selector, test_value, tree),
 do: dispatch_link(conn, test_selector, test_value, tree)

Expand Down

91 changes: 84 additions & 7 deletions
lib/test_dispatch/form.ex

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,15 +9,43 @@ defmodule TestDispatch.Form do
 def find_inputs(form, {:entity, _} = entity_tuple),
 do: find_input_fields(form, entity_tuple)

 def find_inputs(form, {:button_text, button_text}) do
 button = find_buttons(form, button_text)
Comment thread
fatboypunk marked this conversation as resolved.


 if button,
 do: [button | find_default_inputs(form)],
 else: find_default_inputs(form)
 end

 def find_inputs(form, _) do
 find_default_inputs(form)
 end

 defp find_default_inputs(form) do
 fields = find_input_fields(form, "")
 selects = find_selects(form, "")
 textareas = find_textareas(form, "")
 radio_buttons = find_radio_buttons(form, "")

 Enum.uniq(fields ++ selects ++ textareas ++ radio_buttons)
 end

 def find_buttons(form, button_text),
Comment thread
fatboypunk marked this conversation as resolved.

 do:
 find_submit_input(form, button_text) ||
 find_submit_button(form, button_text)

 defp find_submit_button(form, button_text) do
 form
 |> Floki.find("button[type=submit]")
 |> Enum.find(&contains_button_text?(&1, button_text))
 end

 defp find_submit_input(form, button_text) do
 form
 |> Floki.find("input[type=submit]")
 |> Enum.find(&contains_button_text?(&1, button_text))
 end

 def find_radio_buttons(form, "") do
 radios = Floki.find(form, "input[type=radio]")

Expand All@@ -28,7 +56,7 @@ defmodule TestDispatch.Form do
 other_radios =
 radios
 |> Enum.uniq_by(fn {_, list, _} ->
list |> Enum.find(fn {key, _} -> "name" == key end) |> elem(1)
 Enum.find(list, fn {key, _} -> "name" == key end) |> elem(1)
 end)
 |> Enum.reject(fn radio -> floki_attribute(radio, "name") in checked_names end)

Expand DownExpand Up@@ -72,6 +100,9 @@ defmodule TestDispatch.Form do
 new_nested_list = update_nested_input_values(acc_nested_list, tuple, nested_attr)

 Map.put(acc, key, new_nested_list)

 {} ->
 acc
 end
 end)
 end
Expand All@@ -80,11 +111,13 @@ defmodule TestDispatch.Form do
 value = input |> elem(0) |> _input_to_tuple([input])

 case input |> key_for_input(entity_tuple) |> resolve_nested() do
 nil -> {}
 {key, index, nested_key} -> {key, index, {nested_key, value}}
 key -> {key, value}
 end
 end

 defp _input_to_tuple("button", input), do: Floki.text(input)
 defp _input_to_tuple("textarea", input), do: Floki.text(input)
 defp _input_to_tuple("input", input), do: floki_attribute(input, "value")

Expand All@@ -102,14 +135,19 @@ defmodule TestDispatch.Form do
 String.replace_prefix(key, "#{entity}_", "")
 end

 defp key_for_input({"button", _, _} = input, _), do: floki_attribute(input, "name")

 defp key_for_input(input, _) do
 name = floki_attribute(input, "name")
 id = floki_attribute(input, "id")

 if floki_attribute(input, "type") == "radio",
 do: String.replace_suffix(id, "_#{floki_attribute(input, "value")}", ""),
 do: name,
 else: id
 end

 defp resolve_nested(nil), do: nil

 defp resolve_nested(key) do
 case Regex.split(~r{_\d*_}, key, include_captures: true) do
 [key, capture, nested_key] ->
Expand DownExpand Up@@ -171,13 +209,27 @@ defmodule TestDispatch.Form do
 "The provided conn had the status #{status} that doesn't fall into the 2xx range"
 )

 def find_form_by(form, nil), do: {List.last(form), nil}
 def find_form_by(forms, nil), do: {List.last(forms), nil}

 def find_form_by(form, entity_or_test_selector) do
 test_selector_result = Enum.find(form, &find_test_selector(&1, entity_or_test_selector))
 def find_form_by(forms, button_text: button_text) do
 form = Enum.find(forms, &contains_button_text?(&1, button_text))

 if form,
 do: {form, :button_text},
 else:
 raise("""
 No form found for the given button text: #{button_text}
 Found the button texts:

 #{all_buttons(forms)}
 """)
 end

 def find_form_by(forms, entity_or_test_selector) do
 test_selector_result = Enum.find(forms, &find_test_selector(&1, entity_or_test_selector))

 entity_result =
 Enum.find(form, &(&1 |> Floki.find("*[id^=#{entity_or_test_selector}_]") |> Enum.any?()))
 Enum.find(forms, &(&1 |> Floki.find("*[id^=#{entity_or_test_selector}_]") |> Enum.any?()))

 cond do
 is_tuple(test_selector_result) ->
Expand All@@ -204,4 +256,29 @@ defmodule TestDispatch.Form do
 |> html_response(status)
 |> Floki.parse_document!()
 end

 defp contains_button_text?(form, button_text) do
 input_submit =
 form
 |> Floki.find("input[type=submit]")
 |> Enum.any?(&(text(&1) == button_text))

 button_submit =
 form
 |> Floki.find("button[type=submit]")
 |> Enum.any?(&(text(&1) == button_text))

 input_submit || button_submit
 end

 def text(html_tree),
@EasterPeanutEasterPeanutOct 22, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

deftext(html_tree),
defptext(html_tree),
@fatboypunkfatboypunkOct 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm yeah i'm moving this later in #97.
 do: html_tree |> Floki.text() |> String.replace(~r/\s+/, " ") |> String.trim()

 defp all_buttons(html_tree) do
@EasterPeanutEasterPeanutOct 22, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

defpall_buttons(html_tree)do
defpall_submit_controls(html_tree)do
or something like it? :p
@fatboypunkfatboypunkOct 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah nice i'll update this in #97
 all_submit_buttons = html_tree |> Floki.find("button[type=submit]")
 all_submit_inputs = html_tree |> Floki.find("input[type=submit]")

 (all_submit_inputs ++ all_submit_buttons)
 |> Enum.map(&(text([&1]) <> "\n "))
 end
end

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Marcel/submit with button#94

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

 Closed

fatboypunk
wants to merge
3
commits into

from

 Closed


Marcel/submit with button
#94
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0f8629b

Submit forms with a button


fatboypunk Oct 20, 2021
a2c1652

push _dispatch_form below the usage of it


fatboypunk Oct 20, 2021
89cee46

take the name from the radio input


fatboypunk Oct 21, 2021

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


29 changes: 17 additions & 12 deletions
lib/test_dispatch.ex

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,12 +36,7 @@ defmodule TestDispatch do
 {form, selector_type} = find_form(conn, entity_or_test_selector)
 selector_tuple = {selector_type, entity_or_test_selector}

 form
 |> find_inputs(selector_tuple)
 |> Enum.map(&input_to_tuple(&1, selector_tuple))
 |> update_input_values(attrs)
 |> prepend_entity(selector_tuple)
 |> send_to_action(form, conn)
 _dispatch_form(conn, form, selector_tuple, attrs)
 end

 def dispatch_form(conn, entity_or_test_selector, nil),
Expand All@@ -57,6 +52,14 @@ defmodule TestDispatch do
 {form, _} = find_form(conn, test_selector)
 selector_tuple = {:entity, entity}

 _dispatch_form(conn, form, selector_tuple, attrs)
 end

 @spec submit_form(Plug.Conn.t(), %{}, binary() | atom() | nil) :: Plug.Conn.t()
 def submit_form(conn, attrs \\ %{}, entity_or_test_selector \\ nil),
 do: dispatch_form(conn, attrs, entity_or_test_selector)

 defp _dispatch_form(conn, form, selector_tuple, attrs) do
 form
 |> find_inputs(selector_tuple)
 |> Enum.map(&input_to_tuple(&1, selector_tuple))
Expand All@@ -65,10 +68,6 @@ defmodule TestDispatch do
 |> send_to_action(form, conn)
 end

 @spec submit_form(Plug.Conn.t(), %{}, binary() | atom() | nil) :: Plug.Conn.t()
 def submit_form(conn, attrs, entity_or_test_selector),
 do: dispatch_form(conn, attrs, entity_or_test_selector)

 @doc """
 Works like `submit_form/3`. The test_selector is used to find the right form and the
 entity is used to find and fill the inputs correctly.
Expand All@@ -78,6 +77,14 @@ defmodule TestDispatch do
 def submit_form(conn, attrs, entity, test_selector),
 do: dispatch_form(conn, attrs, entity, test_selector)

 @spec submit_form(Plug.Conn.t(), %{}, binary()) :: Plug.Conn.t()
@EasterPeanutEasterPeanutOct 22, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

@specsubmit_form(Plug.Conn.t(),%{},binary())::Plug.Conn.t()
@specsubmit_with_button(Plug.Conn.t(),%{},binary())::Plug.Conn.t()
@fatboypunkfatboypunkOct 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!
 def submit_with_button(%Plug.Conn{} = conn, attrs \\ %{}, button_text) do
 {form, _} = find_form(conn, button_text: button_text)
 selector_tuple = {:button_text, button_text}

 _dispatch_form(conn, form, selector_tuple, attrs)
 end

 @doc """
 Finds a link by a given conn, test_selector and an optional test_value.

Expand DownExpand Up@@ -148,8 +155,6 @@ defmodule TestDispatch do
 |> find_link(test_selector, test_value)
 |> _dispatch_link(conn)

 @spec dispatch_link(nil | Floki.html_tree(), Plug.Conn.t(), binary(), binary() | nil) ::
 Plug.Conn.t()
 def click_link(conn, test_selector, test_value, tree),
 do: dispatch_link(conn, test_selector, test_value, tree)

Expand Down

91 changes: 84 additions & 7 deletions
lib/test_dispatch/form.ex

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,15 +9,43 @@ defmodule TestDispatch.Form do
 def find_inputs(form, {:entity, _} = entity_tuple),
 do: find_input_fields(form, entity_tuple)

 def find_inputs(form, {:button_text, button_text}) do
 button = find_buttons(form, button_text)
Comment thread
fatboypunk marked this conversation as resolved.


 if button,
 do: [button | find_default_inputs(form)],
 else: find_default_inputs(form)
 end

 def find_inputs(form, _) do
 find_default_inputs(form)
 end

 defp find_default_inputs(form) do
 fields = find_input_fields(form, "")
 selects = find_selects(form, "")
 textareas = find_textareas(form, "")
 radio_buttons = find_radio_buttons(form, "")

 Enum.uniq(fields ++ selects ++ textareas ++ radio_buttons)
 end

 def find_buttons(form, button_text),
Comment thread
fatboypunk marked this conversation as resolved.

 do:
 find_submit_input(form, button_text) ||
 find_submit_button(form, button_text)

 defp find_submit_button(form, button_text) do
 form
 |> Floki.find("button[type=submit]")
 |> Enum.find(&contains_button_text?(&1, button_text))
 end

 defp find_submit_input(form, button_text) do
 form
 |> Floki.find("input[type=submit]")
 |> Enum.find(&contains_button_text?(&1, button_text))
 end

 def find_radio_buttons(form, "") do
 radios = Floki.find(form, "input[type=radio]")

Expand All@@ -28,7 +56,7 @@ defmodule TestDispatch.Form do
 other_radios =
 radios
 |> Enum.uniq_by(fn {_, list, _} ->
list |> Enum.find(fn {key, _} -> "name" == key end) |> elem(1)
 Enum.find(list, fn {key, _} -> "name" == key end) |> elem(1)
 end)
 |> Enum.reject(fn radio -> floki_attribute(radio, "name") in checked_names end)

Expand DownExpand Up@@ -72,6 +100,9 @@ defmodule TestDispatch.Form do
 new_nested_list = update_nested_input_values(acc_nested_list, tuple, nested_attr)

 Map.put(acc, key, new_nested_list)

 {} ->
 acc
 end
 end)
 end
Expand All@@ -80,11 +111,13 @@ defmodule TestDispatch.Form do
 value = input |> elem(0) |> _input_to_tuple([input])

 case input |> key_for_input(entity_tuple) |> resolve_nested() do
 nil -> {}
 {key, index, nested_key} -> {key, index, {nested_key, value}}
 key -> {key, value}
 end
 end

 defp _input_to_tuple("button", input), do: Floki.text(input)
 defp _input_to_tuple("textarea", input), do: Floki.text(input)
 defp _input_to_tuple("input", input), do: floki_attribute(input, "value")

Expand All@@ -102,14 +135,19 @@ defmodule TestDispatch.Form do
 String.replace_prefix(key, "#{entity}_", "")
 end

 defp key_for_input({"button", _, _} = input, _), do: floki_attribute(input, "name")

 defp key_for_input(input, _) do
 name = floki_attribute(input, "name")
 id = floki_attribute(input, "id")

 if floki_attribute(input, "type") == "radio",
 do: String.replace_suffix(id, "_#{floki_attribute(input, "value")}", ""),
 do: name,
 else: id
 end

 defp resolve_nested(nil), do: nil

 defp resolve_nested(key) do
 case Regex.split(~r{_\d*_}, key, include_captures: true) do
 [key, capture, nested_key] ->
Expand DownExpand Up@@ -171,13 +209,27 @@ defmodule TestDispatch.Form do
 "The provided conn had the status #{status} that doesn't fall into the 2xx range"
 )

 def find_form_by(form, nil), do: {List.last(form), nil}
 def find_form_by(forms, nil), do: {List.last(forms), nil}

 def find_form_by(form, entity_or_test_selector) do
 test_selector_result = Enum.find(form, &find_test_selector(&1, entity_or_test_selector))
 def find_form_by(forms, button_text: button_text) do
 form = Enum.find(forms, &contains_button_text?(&1, button_text))

 if form,
 do: {form, :button_text},
 else:
 raise("""
 No form found for the given button text: #{button_text}
 Found the button texts:

 #{all_buttons(forms)}
 """)
 end

 def find_form_by(forms, entity_or_test_selector) do
 test_selector_result = Enum.find(forms, &find_test_selector(&1, entity_or_test_selector))

 entity_result =
 Enum.find(form, &(&1 |> Floki.find("*[id^=#{entity_or_test_selector}_]") |> Enum.any?()))
 Enum.find(forms, &(&1 |> Floki.find("*[id^=#{entity_or_test_selector}_]") |> Enum.any?()))

 cond do
 is_tuple(test_selector_result) ->
Expand All@@ -204,4 +256,29 @@ defmodule TestDispatch.Form do
 |> html_response(status)
 |> Floki.parse_document!()
 end

 defp contains_button_text?(form, button_text) do
 input_submit =
 form
 |> Floki.find("input[type=submit]")
 |> Enum.any?(&(text(&1) == button_text))

 button_submit =
 form
 |> Floki.find("button[type=submit]")
 |> Enum.any?(&(text(&1) == button_text))

 input_submit || button_submit
 end

 def text(html_tree),
@EasterPeanutEasterPeanutOct 22, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

deftext(html_tree),
defptext(html_tree),
@fatboypunkfatboypunkOct 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm yeah i'm moving this later in #97.
 do: html_tree |> Floki.text() |> String.replace(~r/\s+/, " ") |> String.trim()

 defp all_buttons(html_tree) do
@EasterPeanutEasterPeanutOct 22, 2021

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Suggested change

defpall_buttons(html_tree)do
defpall_submit_controls(html_tree)do
or something like it? :p
@fatboypunkfatboypunkOct 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah nice i'll update this in #97
 all_submit_buttons = html_tree |> Floki.find("button[type=submit]")
 all_submit_inputs = html_tree |> Floki.find("input[type=submit]")

 (all_submit_inputs ++ all_submit_buttons)
 |> Enum.map(&(text([&1]) <> "\n "))
 end
end