From 75218eb68de11f84729c8e89f9838adeff74edf2 Mon Sep 17 00:00:00 2001 From: Troy Martin Date: Sun, 17 Jan 2021 10:52:07 -0500 Subject: [PATCH 1/2] Relax deps and add application boundries --- mix.exs | 7 ++++--- mix.lock | 26 ++++++++++++++------------ 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/mix.exs b/mix.exs index 4646472..2c29efa 100644 --- a/mix.exs +++ b/mix.exs @@ -29,7 +29,8 @@ defmodule ScrivenerHtml.Mixfile do # Type `mix help compile.app` for more information def application do [ - applications: [:logger] + applications: [:logger], + extra_applications: [:phoenix, :phoenix_html] ] end @@ -48,8 +49,8 @@ defmodule ScrivenerHtml.Mixfile do defp deps do [ {:scrivener, "~> 1.2 or ~> 2.0"}, - {:phoenix_html, "~> 2.2"}, - {:phoenix, "~> 1.0 and < 1.5.0", optional: true}, + {:phoenix_html, "~> 2.11"}, + {:phoenix, "~> 1.0 and < 1.6.0", optional: true}, {:plug, "~> 1.1"}, {:ex_doc, "~> 0.19", only: :dev}, {:earmark, "~> 1.1", only: :dev} diff --git a/mix.lock b/mix.lock index 60a41fe..38002fb 100644 --- a/mix.lock +++ b/mix.lock @@ -1,20 +1,22 @@ %{ "decimal": {:hex, :decimal, "1.1.2", "79a769d4657b2d537b51ef3c02d29ab7141d2b486b516c109642d453ee08e00c", [:mix], []}, - "earmark": {:hex, :earmark, "1.3.1", "73812f447f7a42358d3ba79283cfa3075a7580a3a2ed457616d6517ac3738cb9", [:mix], [], "hexpm"}, + "earmark": {:hex, :earmark, "1.4.13", "2c6ce9768fc9fdbf4046f457e207df6360ee6c91ee1ecb8e9a139f96a4289d91", [:mix], [{:earmark_parser, ">= 1.4.12", [hex: :earmark_parser, repo: "hexpm", optional: false]}], "hexpm", "a0cf3ed88ef2b1964df408889b5ecb886d1a048edde53497fc935ccd15af3403"}, + "earmark_parser": {:hex, :earmark_parser, "1.4.12", "b245e875ec0a311a342320da0551da407d9d2b65d98f7a9597ae078615af3449", [:mix], [], "hexpm", "711e2cc4d64abb7d566d43f54b78f7dc129308a63bc103fbd88550d2174b3160"}, "ecto": {:hex, :ecto, "1.1.8", "0f0348e678fa5a450c266d69816808f97fbd82ade32cf88d4b09bbe8f8c27545", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, optional: false]}, {:mariaex, "~> 0.5.0 or ~> 0.6.0", [hex: :mariaex, optional: true]}, {:poison, "~> 1.0 or ~> 2.0", [hex: :poison, optional: true]}, {:poolboy, "~> 1.4", [hex: :poolboy, optional: false]}, {:postgrex, "~> 0.11.0", [hex: :postgrex, optional: true]}, {:sbroker, "~> 0.7", [hex: :sbroker, optional: true]}]}, - "ex_doc": {:hex, :ex_doc, "0.19.3", "3c7b0f02851f5fc13b040e8e925051452e41248f685e40250d7e40b07b9f8c10", [:mix], [{:earmark, "~> 1.2", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.10", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"}, - "makeup": {:hex, :makeup, "0.8.0", "9cf32aea71c7fe0a4b2e9246c2c4978f9070257e5c9ce6d4a28ec450a839b55f", [:mix], [{:nimble_parsec, "~> 0.5.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm"}, - "makeup_elixir": {:hex, :makeup_elixir, "0.13.0", "be7a477997dcac2e48a9d695ec730b2d22418292675c75aa2d34ba0909dcdeda", [:mix], [{:makeup, "~> 0.8", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm"}, + "ex_doc": {:hex, :ex_doc, "0.23.0", "a069bc9b0bf8efe323ecde8c0d62afc13d308b1fa3d228b65bca5cf8703a529d", [:mix], [{:earmark_parser, "~> 1.4.0", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm", "f5e2c4702468b2fd11b10d39416ddadd2fcdd173ba2a0285ebd92c39827a5a16"}, + "makeup": {:hex, :makeup, "1.0.5", "d5a830bc42c9800ce07dd97fa94669dfb93d3bf5fcf6ea7a0c67b2e0e4a7f26c", [:mix], [{:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cfa158c02d3f5c0c665d0af11512fed3fba0144cf1aadee0f2ce17747fba2ca9"}, + "makeup_elixir": {:hex, :makeup_elixir, "0.15.0", "98312c9f0d3730fde4049985a1105da5155bfe5c11e47bdc7406d88e01e4219b", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.1", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "75ffa34ab1056b7e24844c90bfc62aaf6f3a37a15faa76b07bc5eba27e4a8b4a"}, "meck": {:hex, :meck, "0.8.4", "59ca1cd971372aa223138efcf9b29475bde299e1953046a0c727184790ab1520", [:rebar, :make], []}, - "mime": {:hex, :mime, "1.3.0", "5e8d45a39e95c650900d03f897fbf99ae04f60ab1daa4a34c7a20a5151b7a5fe", [:mix], [], "hexpm"}, - "nimble_parsec": {:hex, :nimble_parsec, "0.5.0", "90e2eca3d0266e5c53f8fbe0079694740b9c91b6747f2b7e3c5d21966bba8300", [:mix], [], "hexpm"}, + "mime": {:hex, :mime, "1.5.0", "203ef35ef3389aae6d361918bf3f952fa17a09e8e43b5aa592b93eba05d0fb8d", [:mix], [], "hexpm", "55a94c0f552249fc1a3dd9cd2d3ab9de9d3c89b559c2bd01121f824834f24746"}, + "nimble_parsec": {:hex, :nimble_parsec, "1.1.0", "3a6fca1550363552e54c216debb6a9e95bd8d32348938e13de5eda962c0d7f89", [:mix], [], "hexpm", "08eb32d66b706e913ff748f11694b17981c0b04a33ef470e33e11b3d3ac8f54b"}, "pavlov": {:git, "https://github.com/sproutapp/pavlov.git", "7f3c0d7c75c8c2875e21b495511a291194bfc85a", []}, - "phoenix": {:hex, :phoenix, "1.4.0", "56fe9a809e0e735f3e3b9b31c1b749d4b436e466d8da627b8d82f90eaae714d2", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}], "hexpm"}, - "phoenix_html": {:hex, :phoenix_html, "2.9.3", "1b5a2122cbf743aa242f54dced8a4f1cc778b8bd304f4b4c0043a6250c58e258", [:mix], [{:plug, "~> 1.0", [hex: :plug, optional: false]}]}, - "phoenix_pubsub": {:hex, :phoenix_pubsub, "1.1.1", "6668d787e602981f24f17a5fbb69cc98f8ab085114ebfac6cc36e10a90c8e93c", [:mix], [], "hexpm"}, - "plug": {:hex, :plug, "1.7.1", "8516d565fb84a6a8b2ca722e74e2cd25ca0fc9d64f364ec9dbec09d33eb78ccd", [:mix], [{:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}], "hexpm"}, - "plug_crypto": {:hex, :plug_crypto, "1.0.0", "18e49317d3fa343f24620ed22795ec29d4a5e602d52d1513ccea0b07d8ea7d4d", [:mix], [], "hexpm"}, + "phoenix": {:hex, :phoenix, "1.5.7", "2923bb3af924f184459fe4fa4b100bd25fa6468e69b2803dfae82698269aa5e0", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 2.13", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.1.2 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "774cd64417c5a3788414fdbb2be2eb9bcd0c048d9e6ad11a0c1fd67b7c0d0978"}, + "phoenix_html": {:hex, :phoenix_html, "2.14.3", "51f720d0d543e4e157ff06b65de38e13303d5778a7919bcc696599e5934271b8", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "efd697a7fff35a13eeeb6b43db884705cba353a1a41d127d118fda5f90c8e80f"}, + "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.0.0", "a1ae76717bb168cdeb10ec9d92d1480fec99e3080f011402c0a2d68d47395ffb", [:mix], [], "hexpm", "c52d948c4f261577b9c6fa804be91884b381a7f8f18450c5045975435350f771"}, + "plug": {:hex, :plug, "1.11.0", "f17217525597628298998bc3baed9f8ea1fa3f1160aa9871aee6df47a6e4d38e", [:mix], [{:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "2d9c633f0499f9dc5c2fd069161af4e2e7756890b81adcbb2ceaa074e8308876"}, + "plug_crypto": {:hex, :plug_crypto, "1.2.0", "1cb20793aa63a6c619dd18bb33d7a3aa94818e5fd39ad357051a67f26dfa2df6", [:mix], [], "hexpm", "a48b538ae8bf381ffac344520755f3007cc10bd8e90b240af98ea29b69683fc2"}, "poison": {:hex, :poison, "2.2.0", "4763b69a8a77bd77d26f477d196428b741261a761257ff1cf92753a0d4d24a63", [:mix], [], "hexpm"}, "poolboy": {:hex, :poolboy, "1.5.1", "6b46163901cfd0a1b43d692657ed9d7e599853b3b21b95ae5ae0a777cf9b6ca8", [:rebar], []}, - "scrivener": {:hex, :scrivener, "2.2.1", "5a84cdfc042e3c318a03f965d8197b8294676a8fff7c4a29e482a90c467ebf19", [:mix], []}, + "scrivener": {:hex, :scrivener, "2.7.0", "fa94cdea21fad0649921d8066b1833d18d296217bfdf4a5389a2f45ee857b773", [:mix], [], "hexpm", "30da36a427f2519cf75993271fb7c5aad1759682a70f90d880a85c3d743d2c57"}, + "telemetry": {:hex, :telemetry, "0.4.2", "2808c992455e08d6177322f14d3bdb6b625fbcfd233a73505870d8738a2f4599", [:rebar3], [], "hexpm", "2d1419bd9dda6a206d7b5852179511722e2b18812310d304620c7bd92a13fcef"}, } From 621012cc47a5290b18ecb2bacf6d59b6fc30ea9b Mon Sep 17 00:00:00 2001 From: Troy Martin Date: Sun, 17 Jan 2021 11:29:00 -0500 Subject: [PATCH 2/2] Adjust tests --- config/config.exs | 2 + mix.exs | 2 +- mix.lock | 6 --- test/scrivener/html_test.exs | 95 ++++++++++++++++++++---------------- 4 files changed, 57 insertions(+), 48 deletions(-) diff --git a/config/config.exs b/config/config.exs index 136603b..cc629cf 100644 --- a/config/config.exs +++ b/config/config.exs @@ -2,6 +2,8 @@ # and its dependencies with the aid of the Mix.Config module. use Mix.Config +config :phoenix, :json_library, Poison + # This configuration is loaded before any dependency and is restricted # to this project. If another project depends on this project, this # file won't be loaded nor affect the parent project. For this reason, diff --git a/mix.exs b/mix.exs index 2c29efa..82e9f16 100644 --- a/mix.exs +++ b/mix.exs @@ -49,7 +49,7 @@ defmodule ScrivenerHtml.Mixfile do defp deps do [ {:scrivener, "~> 1.2 or ~> 2.0"}, - {:phoenix_html, "~> 2.11"}, + {:phoenix_html, "~> 2.2"}, {:phoenix, "~> 1.0 and < 1.6.0", optional: true}, {:plug, "~> 1.1"}, {:ex_doc, "~> 0.19", only: :dev}, diff --git a/mix.lock b/mix.lock index 38002fb..78b7bec 100644 --- a/mix.lock +++ b/mix.lock @@ -1,22 +1,16 @@ %{ - "decimal": {:hex, :decimal, "1.1.2", "79a769d4657b2d537b51ef3c02d29ab7141d2b486b516c109642d453ee08e00c", [:mix], []}, "earmark": {:hex, :earmark, "1.4.13", "2c6ce9768fc9fdbf4046f457e207df6360ee6c91ee1ecb8e9a139f96a4289d91", [:mix], [{:earmark_parser, ">= 1.4.12", [hex: :earmark_parser, repo: "hexpm", optional: false]}], "hexpm", "a0cf3ed88ef2b1964df408889b5ecb886d1a048edde53497fc935ccd15af3403"}, "earmark_parser": {:hex, :earmark_parser, "1.4.12", "b245e875ec0a311a342320da0551da407d9d2b65d98f7a9597ae078615af3449", [:mix], [], "hexpm", "711e2cc4d64abb7d566d43f54b78f7dc129308a63bc103fbd88550d2174b3160"}, - "ecto": {:hex, :ecto, "1.1.8", "0f0348e678fa5a450c266d69816808f97fbd82ade32cf88d4b09bbe8f8c27545", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, optional: false]}, {:mariaex, "~> 0.5.0 or ~> 0.6.0", [hex: :mariaex, optional: true]}, {:poison, "~> 1.0 or ~> 2.0", [hex: :poison, optional: true]}, {:poolboy, "~> 1.4", [hex: :poolboy, optional: false]}, {:postgrex, "~> 0.11.0", [hex: :postgrex, optional: true]}, {:sbroker, "~> 0.7", [hex: :sbroker, optional: true]}]}, "ex_doc": {:hex, :ex_doc, "0.23.0", "a069bc9b0bf8efe323ecde8c0d62afc13d308b1fa3d228b65bca5cf8703a529d", [:mix], [{:earmark_parser, "~> 1.4.0", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm", "f5e2c4702468b2fd11b10d39416ddadd2fcdd173ba2a0285ebd92c39827a5a16"}, "makeup": {:hex, :makeup, "1.0.5", "d5a830bc42c9800ce07dd97fa94669dfb93d3bf5fcf6ea7a0c67b2e0e4a7f26c", [:mix], [{:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cfa158c02d3f5c0c665d0af11512fed3fba0144cf1aadee0f2ce17747fba2ca9"}, "makeup_elixir": {:hex, :makeup_elixir, "0.15.0", "98312c9f0d3730fde4049985a1105da5155bfe5c11e47bdc7406d88e01e4219b", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.1", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "75ffa34ab1056b7e24844c90bfc62aaf6f3a37a15faa76b07bc5eba27e4a8b4a"}, - "meck": {:hex, :meck, "0.8.4", "59ca1cd971372aa223138efcf9b29475bde299e1953046a0c727184790ab1520", [:rebar, :make], []}, "mime": {:hex, :mime, "1.5.0", "203ef35ef3389aae6d361918bf3f952fa17a09e8e43b5aa592b93eba05d0fb8d", [:mix], [], "hexpm", "55a94c0f552249fc1a3dd9cd2d3ab9de9d3c89b559c2bd01121f824834f24746"}, "nimble_parsec": {:hex, :nimble_parsec, "1.1.0", "3a6fca1550363552e54c216debb6a9e95bd8d32348938e13de5eda962c0d7f89", [:mix], [], "hexpm", "08eb32d66b706e913ff748f11694b17981c0b04a33ef470e33e11b3d3ac8f54b"}, - "pavlov": {:git, "https://github.com/sproutapp/pavlov.git", "7f3c0d7c75c8c2875e21b495511a291194bfc85a", []}, "phoenix": {:hex, :phoenix, "1.5.7", "2923bb3af924f184459fe4fa4b100bd25fa6468e69b2803dfae82698269aa5e0", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 2.13", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.1.2 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "774cd64417c5a3788414fdbb2be2eb9bcd0c048d9e6ad11a0c1fd67b7c0d0978"}, "phoenix_html": {:hex, :phoenix_html, "2.14.3", "51f720d0d543e4e157ff06b65de38e13303d5778a7919bcc696599e5934271b8", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "efd697a7fff35a13eeeb6b43db884705cba353a1a41d127d118fda5f90c8e80f"}, "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.0.0", "a1ae76717bb168cdeb10ec9d92d1480fec99e3080f011402c0a2d68d47395ffb", [:mix], [], "hexpm", "c52d948c4f261577b9c6fa804be91884b381a7f8f18450c5045975435350f771"}, "plug": {:hex, :plug, "1.11.0", "f17217525597628298998bc3baed9f8ea1fa3f1160aa9871aee6df47a6e4d38e", [:mix], [{:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "2d9c633f0499f9dc5c2fd069161af4e2e7756890b81adcbb2ceaa074e8308876"}, "plug_crypto": {:hex, :plug_crypto, "1.2.0", "1cb20793aa63a6c619dd18bb33d7a3aa94818e5fd39ad357051a67f26dfa2df6", [:mix], [], "hexpm", "a48b538ae8bf381ffac344520755f3007cc10bd8e90b240af98ea29b69683fc2"}, - "poison": {:hex, :poison, "2.2.0", "4763b69a8a77bd77d26f477d196428b741261a761257ff1cf92753a0d4d24a63", [:mix], [], "hexpm"}, - "poolboy": {:hex, :poolboy, "1.5.1", "6b46163901cfd0a1b43d692657ed9d7e599853b3b21b95ae5ae0a777cf9b6ca8", [:rebar], []}, "scrivener": {:hex, :scrivener, "2.7.0", "fa94cdea21fad0649921d8066b1833d18d296217bfdf4a5389a2f45ee857b773", [:mix], [], "hexpm", "30da36a427f2519cf75993271fb7c5aad1759682a70f90d880a85c3d743d2c57"}, "telemetry": {:hex, :telemetry, "0.4.2", "2808c992455e08d6177322f14d3bdb6b625fbcfd233a73505870d8738a2f4599", [:rebar3], [], "hexpm", "2d1419bd9dda6a206d7b5852179511722e2b18812310d304620c7bd92a13fcef"}, } diff --git a/test/scrivener/html_test.exs b/test/scrivener/html_test.exs index 480c910..938158d 100644 --- a/test/scrivener/html_test.exs +++ b/test/scrivener/html_test.exs @@ -318,7 +318,8 @@ defmodule Scrivener.HTMLTest do describe "Phoenix conn()" do test "handles no entries" do - use Phoenix.ConnTest + # import Plug.Conn + import Phoenix.ConnTest Application.put_env(:scrivener_html, :view_style, :bootstrap) Application.put_env(:scrivener_html, :routes_helper, MyApp.Router.Helpers) @@ -339,7 +340,7 @@ defmodule Scrivener.HTMLTest do "li", [[32, "class", 61, 34, "active", 34]], 62, - [60, "a", [[32, "class", 61, 34, "", 34]], 62, "1", 60, 47, "a", 62], + [60, "a", [[32, "class", 61, 34, [], 34]], 62, "1", 60, 47, "a", 62], 60, 47, "li", @@ -366,7 +367,8 @@ defmodule Scrivener.HTMLTest do end test "allows other url parameters" do - use Phoenix.ConnTest + # import Plug.Conn + import Phoenix.ConnTest Application.put_env(:scrivener_html, :view_style, :bootstrap) Application.put_env(:scrivener_html, :routes_helper, MyApp.Router.Helpers) @@ -387,7 +389,8 @@ defmodule Scrivener.HTMLTest do end describe "View Styles" do - use Phoenix.ConnTest + # import Plug.Conn + import Phoenix.ConnTest test "renders Semantic UI styling" do assert {:safe, @@ -428,7 +431,7 @@ defmodule Scrivener.HTMLTest do "li", [[32, "class", 61, 34, "current", 34]], 62, - [60, "span", [[32, "class", 61, 34, "", 34]], 62, "1", 60, 47, "span", 62], + [60, "span", [[32, "class", 61, 34, [], 34]], 62, "1", 60, 47, "span", 62], 60, 47, "li", @@ -437,9 +440,9 @@ defmodule Scrivener.HTMLTest do [ 60, "li", - [[32, "class", 61, 34, "", 34]], + [[32, "class", 61, 34, [], 34]], 62, - [60, "span", [[32, "class", 61, 34, "", 34]], 62, "2", 60, 47, "span", 62], + [60, "span", [[32, "class", 61, 34, [], 34]], 62, "2", 60, 47, "span", 62], 60, 47, "li", @@ -448,14 +451,14 @@ defmodule Scrivener.HTMLTest do [ 60, "li", - [[32, "class", 61, 34, "", 34]], + [[32, "class", 61, 34, [], 34]], 62, [ 60, "span", - [[32, "class", 61, 34, "", 34]], + [[32, "class", 61, 34, [], 34]], 62, - ">>", + [[[] | ">"] | ">"], 60, 47, "span", @@ -496,14 +499,14 @@ defmodule Scrivener.HTMLTest do [ 60, "li", - [[32, "class", 61, 34, "", 34]], + [[32, "class", 61, 34, [], 34]], 62, [ 60, "span", - [[32, "class", 61, 34, "", 34]], + [[32, "class", 61, 34, [], 34]], 62, - "<<", + [[[] | "<"] | "<"], 60, 47, "span", @@ -517,9 +520,9 @@ defmodule Scrivener.HTMLTest do [ 60, "li", - [[32, "class", 61, 34, "", 34]], + [[32, "class", 61, 34, [], 34]], 62, - [60, "span", [[32, "class", 61, 34, "", 34]], 62, "1", 60, 47, "span", 62], + [60, "span", [[32, "class", 61, 34, [], 34]], 62, "1", 60, 47, "span", 62], 60, 47, "li", @@ -528,9 +531,9 @@ defmodule Scrivener.HTMLTest do [ 60, "li", - [[32, "class", 61, 34, "", 34]], + [[32, "class", 61, 34, [], 34]], 62, - [60, "span", [[32, "class", 61, 34, "", 34]], 62, "2", 60, 47, "span", 62], + [60, "span", [[32, "class", 61, 34, [], 34]], 62, "2", 60, 47, "span", 62], 60, 47, "li", @@ -541,7 +544,7 @@ defmodule Scrivener.HTMLTest do "li", [[32, "class", 61, 34, "current", 34]], 62, - [60, "span", [[32, "class", 61, 34, "", 34]], 62, "3", 60, 47, "span", 62], + [60, "span", [[32, "class", 61, 34, [], 34]], 62, "3", 60, 47, "span", 62], 60, 47, "li", @@ -550,9 +553,9 @@ defmodule Scrivener.HTMLTest do [ 60, "li", - [[32, "class", 61, 34, "", 34]], + [[32, "class", 61, 34, [], 34]], 62, - [60, "span", [[32, "class", 61, 34, "", 34]], 62, "4", 60, 47, "span", 62], + [60, "span", [[32, "class", 61, 34, [], 34]], 62, "4", 60, 47, "span", 62], 60, 47, "li", @@ -561,9 +564,9 @@ defmodule Scrivener.HTMLTest do [ 60, "li", - [[32, "class", 61, 34, "", 34]], + [[32, "class", 61, 34, [], 34]], 62, - [60, "span", [[32, "class", 61, 34, "", 34]], 62, "5", 60, 47, "span", 62], + [60, "span", [[32, "class", 61, 34, [], 34]], 62, "5", 60, 47, "span", 62], 60, 47, "li", @@ -572,9 +575,9 @@ defmodule Scrivener.HTMLTest do [ 60, "li", - [[32, "class", 61, 34, "", 34]], + [[32, "class", 61, 34, [], 34]], 62, - [60, "span", [[32, "class", 61, 34, "", 34]], 62, "6", 60, 47, "span", 62], + [60, "span", [[32, "class", 61, 34, [], 34]], 62, "6", 60, 47, "span", 62], 60, 47, "li", @@ -583,9 +586,9 @@ defmodule Scrivener.HTMLTest do [ 60, "li", - [[32, "class", 61, 34, "", 34]], + [[32, "class", 61, 34, [], 34]], 62, - [60, "span", [[32, "class", 61, 34, "", 34]], 62, "7", 60, 47, "span", 62], + [60, "span", [[32, "class", 61, 34, [], 34]], 62, "7", 60, 47, "span", 62], 60, 47, "li", @@ -594,9 +597,9 @@ defmodule Scrivener.HTMLTest do [ 60, "li", - [[32, "class", 61, 34, "", 34]], + [[32, "class", 61, 34, [], 34]], 62, - [60, "span", [[32, "class", 61, 34, "", 34]], 62, "8", 60, 47, "span", 62], + [60, "span", [[32, "class", 61, 34, [], 34]], 62, "8", 60, 47, "span", 62], 60, 47, "li", @@ -607,7 +610,7 @@ defmodule Scrivener.HTMLTest do "li", [[32, "class", 61, 34, "ellipsis", 34]], 62, - [60, "span", [[32, "class", 61, 34, "", 34]], 62, "", 60, 47, "span", 62], + [60, "span", [[32, "class", 61, 34, [], 34]], 62, [], 60, 47, "span", 62], 60, 47, "li", @@ -616,9 +619,9 @@ defmodule Scrivener.HTMLTest do [ 60, "li", - [[32, "class", 61, 34, "", 34]], + [[32, "class", 61, 34, [], 34]], 62, - [60, "span", [[32, "class", 61, 34, "", 34]], 62, "10", 60, 47, "span", 62], + [60, "span", [[32, "class", 61, 34, [], 34]], 62, "10", 60, 47, "span", 62], 60, 47, "li", @@ -627,14 +630,14 @@ defmodule Scrivener.HTMLTest do [ 60, "li", - [[32, "class", 61, 34, "", 34]], + [[32, "class", 61, 34, [], 34]], 62, [ 60, "span", - [[32, "class", 61, 34, "", 34]], + [[32, "class", 61, 34, [], 34]], 62, - ">>", + [[[] | ">"] | ">"], 60, 47, "span", @@ -736,7 +739,7 @@ defmodule Scrivener.HTMLTest do "li", [[32, "class", 61, 34, "active", 34]], 62, - [60, "a", [[32, "class", 61, 34, "", 34]], 62, "1", 60, 47, "a", 62], + [60, "a", [[32, "class", 61, 34, [], 34]], 62, "1", 60, 47, "a", 62], 60, 47, "li", @@ -747,7 +750,7 @@ defmodule Scrivener.HTMLTest do "li", [[32, "class", 61, 34, "waves-effect", 34]], 62, - [60, "a", [[32, "class", 61, 34, "", 34]], 62, "2", 60, 47, "a", 62], + [60, "a", [[32, "class", 61, 34, [], 34]], 62, "2", 60, 47, "a", 62], 60, 47, "li", @@ -758,7 +761,17 @@ defmodule Scrivener.HTMLTest do "li", [[32, "class", 61, 34, "waves-effect", 34]], 62, - [60, "a", [[32, "class", 61, 34, "", 34]], 62, ">>", 60, 47, "a", 62], + [ + 60, + "a", + [[32, "class", 61, 34, [], 34]], + 62, + [[[] | ">"] | ">"], + 60, + 47, + "a", + 62 + ], 60, 47, "li", @@ -799,7 +812,7 @@ defmodule Scrivener.HTMLTest do [ 60, "li", - [[32, "class", 61, 34, "", 34]], + [[32, "class", 61, 34, [], 34]], 62, [ 60, @@ -820,7 +833,7 @@ defmodule Scrivener.HTMLTest do [ 60, "li", - [[32, "class", 61, 34, "", 34]], + [[32, "class", 61, 34, [], 34]], 62, [ 60, @@ -841,14 +854,14 @@ defmodule Scrivener.HTMLTest do [ 60, "li", - [[32, "class", 61, 34, "", 34]], + [[32, "class", 61, 34, [], 34]], 62, [ 60, "a", [[32, "class", 61, 34, "pagination-link", 34]], 62, - ">>", + [[[] | ">"] | ">"], 60, 47, "a",